[SCM] vlc/master: Fix upload
mati75-guest at users.alioth.debian.org
mati75-guest at users.alioth.debian.org
Wed Dec 11 14:15:32 UTC 2013
Bump Standards-Version to 3.9.5 (no changes needed).
Refresh ftbfs_freetype.patch from upstream version
Add patch fix FTBFS with freetype 2.5.1 (Closes: #731513)
Add myself to uploaders
Release vlc 2.1.1-1 to Debian unstable.
Remove obsolete conffiles.
Drop altivec patch (fixed upstream).
Merge tag 'upstream/2.1.1'
Imported Upstream version 2.1.1
Release 2.1.0-2 to Debian unstable.
Enable libva on kFreeBSD.
The libdvb plugin in Linux specific.
The libaccess_dv plugin was renamed to libdv1394.
Remove the libvaapi plugin from vlc if libva is disabled.
Drop link-binaries-with-c++.patch.
Fix build failure on powerpc by correcting the detection of compiler flags for altivec.
Disable Video4Linux2 on kFreeBSD due to a build failure.
Correct reason to disable the libvnc plugin.
Disable more plugins that we do not build.
Explicitly disable plugins that we do not build.
Update minimum version of build dependencies.
Switch to debhelper 9.
Sort configure flags.
The 3dn and mmxext plugins are gone.
Revert "Memcpy plugins are gone"
Fixed in 2.1.0
Correct minimum version of gnutls to 3.0.20.
Update changelog again
Add myself to Uploaders
Update debian/copyright
Bump to lua 5.2
Disable opencv by default
Add libidn11-dev to build depends
Fix configure warning
Disable building a static library.
Add missing Breaks & Replaces for the move of libavcodec_plugin.so from vlc to vlc-nox.
Refresh patch with quilt refresh -p ab --no-index --no-timestamps.
Run wrap-and-sort.
debian/rules: Terminate confflags list.
Update changelog
Add grammar patch from upstream
Update libvlc5 symbols
libvlccore5 is now libvlccore7
Update file lists for VLC 2.1.0
.hosts was removed in 2.1.0
Memcpy plugins are gone
Update new build dependencies
Update for removed and renamed modules
Remove static dependency on libproxy
Refresh patches
Remove un-needed patch
--with-tuning was removed in 2.1.0
Merge tag 'upstream/2.1.0'
Imported Upstream version 2.1.0
Run distclean after building the static libraries.
Release 2.0.8-1 to Debian unstable.
Drop fix-ftbfs-flac-1.3.patch (applied upstream).
Merge tag 'upstream/2.0.8'
Imported Upstream version 2.0.8
Release 2.0.7-4
Prepare changelog
Prevent m4 errors in dh_autoreconf
Backport patches from upstream to allow building with libdvbpsi 1.0.0
Remove Sam Hocevar from uploaders on his request
Release 2.0.7-3 to Debian unstable.
Drop unneeded build-dependencies.
refresh FLAC patch
use my correct email address
update debian/changelog
Fix FTBFS with FLAC 1.3, Closes: #712687
Release 2.0.7-1 to Debian unstable.
Merge tag 'upstream/2.0.7'
Imported Upstream version 2.0.7
Update watch file.
Release 2.0.6-1 to Debian unstable.
Drop backported man page patch.
Merge tag 'upstream/2.0.6'
Imported Upstream version 2.0.6
Release 2.0.5-2 to Debian unstable.
Add missing closing bracket.
Fix apport hook.
Combine link-vlc-cache-gen-with-c++.patch and link-vlc-with-c++.patch to link-binaries-with-c++.patch.
Backport man page update to correct title DVD syntax.
Unify conditionals.
Fix build failure on powerpcspe.
Sort variables.
Fix DEB_HOST_ARCH variable.
Override false positive hardening-no-fortify-functions lintian warnings.
Bump Standards-Version to 3.9.4 (no changes needed).
Use canonical VCS fields.
Release 2.0.5-1 to Debian unstable.
Merge tag 'upstream/2.0.5'
Imported Upstream version 2.0.5
Don't let libvlc-dev depend on libvlccore-dev.
Release 2.0.4-1 to Debian unstable.
Update debian/changelog.
Enable and build Opus plugin and add it to vlc-nox.
Enable and build sftp plugin and add it to vlc-nox.
Update debian/changelog.
Drop backported bp-fix-hang-caused-by-notify.patch.
Merge tag 'upstream/2.0.4'
Imported Upstream version 2.0.4
Release 2.0.3-3 to Debian unstable.
Cherry-pick fix for VLC hang caused by the notify plugin.
debian/vlc.postinst: Fix directory to symlink upgrade in postinst.
Revert "Enable and build sftp plugin and add it to vlc-nox."
Drop alternative dependency on transitional ttf-freefont.
Enable and build sftp plugin and add it to vlc-nox.
Release 2.0.3-2 to Debian unstable.
Add bug number to Lintian override.
Add Pre-Depends on dpkg (>= 1.15.6~) for xz compression.
Add version to vlc-nox dependency of vlc-plugin-sdl (consistent with other plug-ins).
debian/rules: Use xz compression for binary packages.
Release 2.0.3-1 to Debian unstable.
Merge tag 'upstream/2.0.3'
Imported Upstream version 2.0.3
Release 2.0.2-2 to Debian unstable.
ttf-freefont was renamed to fonts-freefont-ttf.
Drop libggi2-dev from build dependencies (not needed any more).
Add missing epoch to libqt4-dev build dependency.
Release 2.0.2-1 to Debian unstable.
Add libfbosd plugin to vlc-nox on Linux.
Add missing build dependency on libiso9660-dev.
Add libomxil to vlc-nox on Linux.
Switch to debhelper 8.
Disable NEON on armel.
Close Debian bugs.
Add libdirectfb plugin to vlc-nox.
crystalhd is only available on amd64 and i386.
update debian/changelog
Build depend on libcrystalhd-dev and enable the crystalhd plugin.
Add new symbols to libvlccore5.
Breaks and Replaces are needed for a file movement.
Release 2.0.2-1 to Debian unstable.
Use Replaces for smooth upgrade to 2.0.2, due to file changes
Revert "Release 2.0.2-1 to Debian unstable."
Release 2.0.2-1 to Debian unstable.
libcaca_plugin.so depends on X11
Add crystalhd plugin to VLC dist
Revert "Release 2.0.2-1 to Debian unstable."
Release 2.0.2-1 to Debian unstable.
Merge commit 'upstream/2.0.2'
Imported Upstream version 2.0.2
Release 2.0.1-4 to Debian unstable.
Add missing Breaks and Replaces for moving the documentation from vlc-data away from /usr/share/doc/vlc before converting the directory into a symlink.
Release 2.0.1-3 to Debian unstable.
Replace symlink by directory in /usr/share/doc/vlc-nox.
Release 2.0.1-2 to Debian unstable.
Really add a preinst to vlc to drop it's doc directory before unpacking a symlink to vlc-nox's over it.
Release 2.0.1-1 to Debian unstable.
Add libgtk2.0-dev back to build dependencies for the notify plugin.
Add missing libxinerama-dev build dependency for the Skins2 interface.
Drop patches that were backported and accepted by upstream.
Merge tag 'upstream/2.0.1'
Imported Upstream version 2.0.1
Drop deleted file.
Add --enable-dbus to configure flags.
Change build dependency from libpng12-dev to libpng-dev.
Add upstream bug link.
Release 2.0.0-6 to Debian unstable.
Link vlc with the C++ standard library.
Enable linsys only on Linux and exclude the plugins from non-Linux.
Drop --as-needed as it breaks the build fix for kfreebsd.
Release 2.0.0-5 to Debian unstable.
Enable hardened build flags through dpkg-buildflags.
Link vlc-cache-gen with the C++ standard library.
Rewrite v4l kfreebsd patch.
Release 2.0.0-4 to Debian unstable.
The dvb and hal plugins are gone.
Remove more automatically generated files.
Enable and install Open Sound System (OSS) plugin.
Sort configure flags.
Update configure flag from --enable-libv4l2 to --enable-v4l2.
Release 2.0.0-3 to Debian unstable.
Fix v4l2 build failure on kfreebsd.
Release 2.0.0-2 to Debian unstable.
Add missing CFLAGS_* variables to pass the "-maltivec" flag.
Backport patch from upstream to the fix build failures on kfreebsd.
Bump Standards-Version to 3.9.3, no changes needed.
Remove nasm and yasm form build dependencies (they are not used).
Import changes from daily-stable bzr repository and release 2.0.0-1 to Debian unstable.
Merge commit 'upstream/2.0.0'
Imported Upstream version 2.0.0
Fix Maintainer's name.
Change Build-Dependency from libupnp3-dev to unversioned libupnp-dev.
Release 1.1.13-1 to Debian unstable.
Add mailcap entry for Ogg Video
Remove config.h.in
Adding bp-xulrunner-npapi-mime.patch again.
Refresh osdmenu patch.
Drop upstream applied patch.
Drop backported patches.
Merge commit 'upstream/1.1.13'
Imported Upstream version 1.1.13
Switch source tarball back from xz to bz2.
Release 1.1.12-3 to Debian unstable.
Build depend on libv4l-dev on kfreebsd-any.
Fix build failure with Iceweasel/Firefox 8.0. Thanks to Mathieu Trudel-Lapierre for backporting the upstream patch.
Update debian/changelog.
v4l (version 1) is gone.
Explicitly enable v4l2 on kfreebsd.
Install v4l2 modules on kfreebsd-*.
Patch for NMU version 1.1.12-2.1
Release 1.1.12-2 to Debian unstable.
Apply patches from upstream's 1.1 maintenance branch.
Release 1.1.12-1 to Debian unstable.
Fix typo in vlc.desktop: Name[nn] -> GenericName[nn].
Drop compile file that is removed on clean.
Refresh 200_osdmenu_paths.patch.
Drop xulrunner-1.9.1.patch (accepted upstream).
Merge commit 'upstream/1.1.12'
Imported Upstream version 1.1.12
Switch source tarball from bz2 to xz.
Release 1.1.11-2 to Debian unstable.
Build with "--with-mozilla-pkg=mozilla-plugin" rather than "--with-mozilla-pkg=libxul". The plugin doesn't appear to be using XPCOM, and shouldn't be linking against Mozilla libs.
Add firefox-dev as alternative build dependency to xulrunner-dev for Ubuntu.
Build and install the libx264 plugin.
Use linux-any instead of hardcoded list of non-Linux architectures.
Release 1.1.11-1 to Debian unstable.
Revert "Use a strict build-dependency on liblivemedia >= 2011.06.16 as it uses an actual RFC4184-compliant RTP payload format for AC-3 audio."
Refresh patches.
Drop libschroedinger weaken patch (upstream weakened it to 1.0.6).
Drop backported patches.
Merge commit 'upstream/1.1.11'
Imported Upstream version 1.1.11
Call dh_autoreconf with --as-needed and drop 052_as-needed.patch.
Use a strict build-dependency on liblivemedia >= 2011.06.16 as it uses an actual RFC4184-compliant RTP payload format for AC-3 audio.
Release 1.1.10-1 to Debian unstable.
Mention potcast support in package description.
Add GNOME MIME types for Ogg Vorbis and Ogg Theora
update debian/changelog
Backport PulseAudio build fix.
update debian/changelog
Drop as-needed patch due to autoreconf run.
Remove autogenerated files (due to autoreconf run).
Refresh patches.
update debian/changelog
Reorder dh parameters (for debhelper 8).
Merge commit 'upstream/1.1.10'
Imported Upstream version 1.1.10
update debian/changelog
Weaken dependencies on libschroedinger
run autoreconf on the buildds
Release 1.1.9-1 to Debian unstable.
Remove compat/dummy.c (removed on clean).
Adjust the vlc lintian-overrides for the latest lintian version.
Refresh patches and drop backported VideoLAN-SA-1103.patch.
Merge commit 'upstream/1.1.9'
Imported Upstream version 1.1.9
Fix the changelog
Set policy to 3.9.2
Changelog for VLC 1.1.8-3
Fix heap corruption in MP4 demuxer
Changelog for VLC 1.1.8-2
Revert "build against libmatroska 1.1.0"
Require libschroedinger >= 1.0.10
Release 1.1.8-1 to Debian unstable.
Drop backported libmatroska1.1 patch.
Refresh xulrunner patch.
Merge commit 'upstream/1.1.8'
Imported Upstream version 1.1.8
Release 1.1.7-4 to Debian unstable.
v4l is gone from the kernel. Build only v4l2.
upload to unstable
Add myself to uploaders
build against libmatroska 1.1.0
Fix building against libmatroska 1.1, Closes: #614088
adjust debian/source/local-options to team guidelines
prepare new upload
Release 1.1.7-2 to Debian unstable.
Make vlc compatible with xulrunner 1.9.1.
Release 1.1.7-1 to Debian experimental.
Refresh patches.
Drop backported patch.
Merge commit 'upstream/1.1.7'
Imported Upstream version 1.1.7
Update debian/watch.
Release 1.1.6-1 to Debian experimental.
Mention CVE in changelog
Revert "Add backported notify GTK+ dependency patch."
Update debian/changelog.
Add backported notify GTK+ dependency patch.
Build depends on libgtk2.0-dev for notify module.
Add lirc build failure fix patch.
Rename .diff to .patch.
Update debian/changelog.
Drop backported patches.
Merge commit 'upstream/1.1.6'
Imported Upstream version 1.1.6
wrap-and-sort
Drop DM-Upload-Allowed.
Update my email address.
Tighten more build dependencies after reviewing configure.ac.
Tighten some build dependencies (Closes: #605638)
wrap-and-sort --sort-binary-packages
Release 1.1.5-3 to Debian experimental.
Apply upstream fix for KDE device actions.
Release 1.1.5-2 to Debian experimental.
Fixed wrong aspect ratio in transcoded image from webcam.
Fix KDE device action file locations.
Ignore .pc directory.
fix Breaks/Replaces for moving avcodec module around, Closes: #603912
Fix Replace/Break for moving avcodec module around
Release 1.1.5-1 to Debian experimental.
Update debian/changelog.
Add source local-options unapply-patches.
Add new symbol to libvlc5.
vlc: Add new libxscreensaver_plugin.so plugin.
Update debian/changelog.
Merge commit 'upstream/1.1.5'
Imported Upstream version 1.1.5
Update debian/changelog.
Recommend xdg-utils, because xdg-screensaver is required for disabling the screensaver.
Install all docs into /usr/share/doc/vlc-nox and link the vlc doc dir to it.
Fix path typo in NEWS file.
Changelog for VLC 1.1.4-1
Symlink corresponding FreeSans system font instead of linking to DejaVu.
WIP Changelog
Remove unneeded patch
Merge commit 'upstream/1.1.4'
Imported Upstream version 1.1.4
prepare new upload
adjust version number
Merge branch 'squeeze'
update debia/gbp.conf for new branch name
update for new branch name
update debian/changelog
Changelog for VLC 1.1.3-1+exp1
Bump version of vlc in vlc-nox's Replaces to reduce the diff to Ubuntu.
Add apport hook to include more vlc dependencies in bug reports and install it on Ubuntu.
add DM-Upload-Allowed field
Add Xb-Npp header to mozilla-plugin-vlc package.
wrap-and-sort
Merge branch 'sid' into experimental
Changelog for VLC 1.1.3-1
Refresh xulrunner patch.
Drop CVE-2010-2937.patch (included in new upstream release).
Merge commit 'upstream/1.1.3' into sid
Imported Upstream version 1.1.3
WIP Changelog
Revert "Add Xb-Npp header to mozilla-plugin-vlc package."
Drop 501_decrease_alsa_buffer.diff. The pulseaudio output module has a higher priority than the ALSA output plugin and should be used on pulseaudio systems.
WIP Changelog
Security: Fix insufficient input validation in TagLib plugin
Drop 102_dejavu_font.diff and depend on ttf-freefont instead of ttf-dejavu-core. ttf-freefont is very likely to be present on a Debian box, because cups depends on it.
Add Xb-Npp header to mozilla-plugin-vlc package.
502_xulrunner_191.diff: Shorten it and split it into two parts.
Changelog for VLC 1.1.2-1+exp1
Move libavcodec plugin from vlc-nox to vlc.
Changelog for VLC 1.1.2-1+exp1
Switch to dh7.
Merge branch 'sid' into experimental
Changelog for VLC 1.1.2-1
Enable meta in gbp.conf.
Bump Standards-Version to 3.9.1 (no changes required).
Sort debian/control.
Add proper Breaks and Replaces.
Wip Changelof
Fix location of icons in vlc.menu
Split the notify plugin to not depend on gtk
Re-enable the modplug module and require the fixed version
Merge commit 'upstream/1.1.2' into sid
Imported Upstream version 1.1.2
libva is (currently) Linux specific
Move xcb_apps SD to vlc
Also check for libxcb
Closes LP bugs
Fix target distro
Changelog for VLC 1.1.1-1+exp1
Merge branch 'sid' into experimental
Cosmetics
Typo
Changelog for VLC 1.1.1-1
Add comment about merging in README.source
Disable modplug as libmodplug module in sid is buggy
Add new symbols in libvlc5
Remove patches merged upstream
Imported Upstream version 1.1.1
Imported Upstream version 1.1.1
Prepare experimental upload
Activate VA-API
Depends on xulrunner-dev >= 1.9.2
Switch to experimental
Start new upload
Explicit the split of vlc-plugin-zvbi in debian/changelog
disable atmo module on non-Linux archs
fix regex such that the dc1394 module really isn't installed
don't try to install the libdc1394 module on kfreebsd
update debian/changelog
forcefully disable alsa on kFreeBSD
fix kfreebsd ftbfs in access file module (Closes: #588655)
alphabetize configure switches
also move udev to the list of linux specific features
update debian/changelog
remove 'suspicious' rule
enable dc1394 only for Linux, Closes: #588410
Changelog for VLC 1.1.0-2
Start changelog for 1.1.0-2
Set policy to 3.9.0 (no change needed)
Fix FTBFS on arm with patch cherry-picked from upstream
libdc1394 is linux specific.
Last changelog for VLC 1.1.0-1
Drop --sourcedir=debian/tmp from dh_install.
Final changelog for VLC 1.1.0-1
Changelog for VLC 1.1.0-1
Correct gbp.conf.
Add myself to Uploaders.
Fix debian/NEWS
Add DEP-3 to 502_xulrunner_191.diff.
Convert patch header to DEP-3 header.
Vcs-Browser link to summary page.
Update debian/changelog.
Move the luahttp's .hosts
Add some news
Move fluidsynth plugin into separate package.
Fix icon path
Don't advertise deprecated package
Sort binary packages in debian/control.
Enable libproxy.
Explicitly enable or disable features.
Comment disabled features.
Enable atmo, fluidsynth, kate, and mtp plugin.
Provide VBI teletext plugin
Remove unused Build-Depends libid3tag0-dev, libsysfs-dev, and libxv-dev.
Remove unused --enable-release configure flag.
Remove unused libhal-dev from Build-Depends (Closes: #580407).
Update the bug control file
Use dh_bugfiles
Update debian/changelog.
Cleanup debian/rules.
Remove unused bzr-builddeb config.
Merge branch 'experimental' of git+ssh://git.debian.org/git/pkg-multimedia/vlc into experimental
Sort Build-Depends and Depends.
Simplify debian/rules.
Remove unused ${shlibs:Depends}.
Use configure option instead of patching
Remove unneeded -V for dh_makeshlibs
Change installation of man pages.
Remove default values from git-buildpackage config.
Cleanup clean rule.
Remove file that is remove on clean.
Fully switch to dpkg-source 3.0 (quilt).
Update symbols files.
Remove comments.
Disable portaudio module.
Replace spaces by tabs.
Merge branch 'upstream' of git+ssh://git.debian.org/git/pkg-multimedia/vlc into upstream
Update debian/changelog.
Switch to dpkg-source 3.0 (quilt) format.
Refresh patches.
Merge commit 'upstream/1.1.0' into experimental
Imported Upstream version 1.1.0
Changelog for vlc 1.1.0~rc4-1
Merge commit 'upstream/1.1.0.rc4' into experimental
Imported Upstream version 1.1.0~rc4
Fix maintainer scripts
Install the optim only if present
Patch to allow compilation with xul 1.9.1
More .install fixing
Specify where to install solids files
Don't build the sqlite module.
Make sure we have useful build log
Add more build-dep
Revert "Remove vlc-plugin-ggi as the module has been removed upstream"
Revert "Remove vlc-plugin-svgalib as it has been removed upstream"
WIP Changelog
add lua5.1 to have luac
Prefer a recent libdvbpsi
Fix links
Upstream Makefile install icons at the good place.
Update the doc which get installed
Add a trigger to generate the modules' cache as root.
*.install: reflect new modules path and add new files
Update symbols files
Remove vlc-plugin-svgalib as it has been removed upstream
Remove vlc-plugin-ggi as the module has been removed upstream
Remove patches merged upstream
Refresh patch
Disable projectm
SONAME changes
Wip Changelog
Merge commit 'upstream/1.1.0.rc2' into experimental
Imported Upstream version 1.1.0~rc2
Back on experimental to package -rc
Changelog for vlc 1.0.6-1
Add another LP reference.
Fix malformed debian/NEWS.
WIP Changelog
Remove patches merged upstream
Document removal of RTMP
RTMP access module has been removed
Merge commit 'upstream/1.0.6' into sid
Imported Upstream version 1.0.6
Changelog for vlc 1.0.5-2
Fix crash in FTP url handling
Fix crash on malformed rtmp stream.
Update location of vlc.png
Install icons in all available sizes (LP: #521744).
Set urgency to medium as we fix RC bug
vlc-data Replaces very old vlc as well as vlc-nox
Start next upload
Fix symlinks
Install reportbug files also in vlc-data
Changelog for vlc 1.0.5-1
Refresh patches
Close some bugs
Bump Standards-Version to 3.8.4, no changes required.
WIP changelog for 1.0.5-1
Merge commit 'upstream/1.0.5' into sid
Imported Upstream version 1.0.5
Formatting improvements; thanks to Gerfried Fuchs for the patch (Closes: #566384).
Typo
Add misc:Depends to vlc-data's Depends
Add comments to overrides file
NEWS.Debian: Use version present in Changelog
Update for menu subpolicy, Closes: #564218
remove excessive replaces relationship
prepare new upload
Final changelog for 1.0.4-2
Cosmetics
Disable access_dv on non-Linux archs
Multiline the linux-specific configure args
Start changelog for vlc 1.0.4-2
Add patch taken from upstream to fix jack input with jack2
Fix Replaces/Conflicts version so that upgrade work
Move back hotkeys to vlc-nox
Report libavutil50 presence the correct way
Final debian/changelog for VLC 1.0.4-1
Don't put the hotkey module in 2 packages
close two bugs in debian/changelog
link plugin binary to /usr/lib/xulrunner-addons/plugins/
tighten dependency on vlc-plugin-pulse
enable and install the fb module on Linux systems. Closes: #556228
WIP changelog
Build-depend on a recent enough live555 to avoid comma vs. decimal point problem
Don't patch i18n'd strings else it'll break all the translations
split normal configure flags from feature configure flags
sort confflags in debian/rules
enable DV support (LP: #392115) Signed-off-by: Benjamin Drung <bdrung at ubuntu.com>
Merge branch 'sid' of git+ssh://git.debian.org/git/pkg-multimedia/vlc into sid
Fix typos, that are reported by lintian.
Remove version constraint
Refer to versioned license file.
Fix typo.
WIP changelog
Enable CDDB in the CDDA module (LP: #439131)
Mention other maintainers and that the binaries are GPL v3 as we link with LGPL v3 libraries
Recommend vlc-plugin-pulse for vlc, so that pulse can be used as default output. (cherry picked from commit d83e0153ff6240831e59e3a675607d96661412c2)
WIP changelog
Activate the global hotkey module
Add a vlc-plugin-svg package
Switch to xulrunner-dev
Start the changelog for 1.0.4-1
Merge branch 'upstream' into sid
Merge commit 'upstream/1.0.3' into sid
Imported Upstream version 1.0.4
libavutil50 seems to be troublesome
Final changelog for 1.0.3-1
libudev is only on linux arches
Properly refer to Ubuntu bugs
More stuffs for 1.0.3-1
Activate the new udev SD module
Add the upnp access module
Don't overwrite presonal builder prefs
Start the changelog for vlc 1.0.3-1
Imported Upstream version 1.0.3
Imported Upstream version 1.0.3
decrease alsa buffer size
No longer need to build an extra libvlccore without altivec
readd dropped LP reference
fixed xtophe's email adress
Changelog for vlc 1.0.2-1
Update libvlccore symbol file
Remove uneeded build-deps
Remove libass API patch
Merge commit 'upstream/1.0.2' into sid
Imported Upstream version 1.0.2
WIP Changelog
Fix Hurd install
Fix kfreebsd FTBFS and simplified
Typo
Last bit of changelog for vlc 1.0.1-2
No need to distribute generated files
Some more stuff for 1.0.1-2
Disable some modules (kate, mtp, fluidsynth)
Add a README.source about quilt
Changelog for vlc 1.0.1-2
No need of qt4-dev-tools
Set policy to 3.8.3 (no change needed)
Revert "WIP changelog"
WIP changelog
Don't try to install v4l2 modules on kfreebsd
Allow building against libass 0.9.7
Fix typo in debian/changelog
add a launchpad reference
Changelog for vlc 1.0.1-1
Remove patches applied upstream
Protect against future renaming of libdvbpsi development package
Depends on libdvbpsi5-dev
Really build altivec-free libvlccore
Merge commit 'upstream/1.0.1' into sid
Imported Upstream version 1.0.1
add versioned build dependency on libschroedinger-dev
update debian/changelog with ubuntu bugs
VLC 1.0.0-1 changelog
Upstream make distcheck has been fixed. No need to save Changelog
Fix make distclean
Refresh patches
New standard version. No change needed
No need for dh_desktop
WIP changelog
Delete a symbols who was present by mistake.
Force at least libvlc 1.0.0 becasue of tha soname change of libvlccore
Don't install the alsa and OSS access module on kfreeBSD
Let GCC manage the addressing in the i420_mmx module
Update symbols file
Merge commit 'upstream/1.0.0' into sid
Imported Upstream version 1.0.0
Delete unused patches
Back on the sid branch
Merge commit 'debian/1.0.0.rc2-1' into sid
Changelog for vlc 0.9.9a-3
Make sure unpatch is last in the clean target
Disable-maintener mode
Patch to support libmpc new API
Changelog for vlc 1.0.0~rc2-1
Relax a bit depedancy of libvlccore2 on vlc-data
Don't duplicate "Section: video" where uneeded
Add new symbols which appeared between rc1 and rc2
Merge commit 'upstream/1.0.0.rc2' into experimental
Imported Upstream version 1.0.0~rc2
Merge commit 'origin/sid' into experimental
Changelog for 1.0.0~rc1-1
Disable the logging facility in the javascript of moz plugin
more thing in 0.9.9a-3
Changelog for 0.9.9a-3
Reword the command line to get full logs
Remove duplicate "extended Settings" entry in context menu
Version the depedency of libvlcore2 on vlc-data
Point out in NEWS the modules renamed or splited
SONAME change for libvlccore
this is the experimental branch
Add links to NEWS and co in vlc-nox
Reword the command line to get full logs
vlc-nox.install: Add and remove modules added/removed upstream
vlc.install: add drawable and screen was renamed x11_screen
Use vlc-wrapper manpage from upstream
Fix static libs compile
Cosmetics
Add new symbols for libvlc2
Remove vlc-plugin-esd and vlc-plugin-arts as they have been removed by upstream
Refresh patches
Delete patches which were picked from upstream
Changelog for 0.9.9a-3
Merge commit 'upstream/1.0.0.rc1' into experimental
Imported Upstream version 1.0.0~rc1
Fix typo
Build a version of libvlccore without altivec
Use all the procs on i386 and amd64
Better check commad line
Remove unexistant config options
Fix the clean target
Fix building as root.
Cache the configure test results as we're running configure several times
disable more optimization with DEB_BUILD_OPTIONS=noopt
Correct typo in 0.9.9a-2 changelog entry
Decrease urgency
Changelog for 0.9.9a-2
Fix share/http/{old}/.hosts
update debian/changelog
Merge commit 'upstream/0.9.9a' into sid
Imported Upstream version 0.9.9a
Changelog for 0.9.9-1
Move the caca module to vlc-nox
Remove some Replaces/Conflicts against version not in etch
Fix some typo
Revert "Use dh_bugfiles"
Update symbol files
Merge commit 'upstream/0.9.9' into sid
Imported Upstream version 0.9.9
Use dh_bugfiles
section changes
Move vlc to the video section and vlc-dbg to the debug one
remove duplicate .gbp.conf, port differences to debian/gbp.conf
add config file for git-buildpackage
fix some typos in patches documentation
whitespace cleanup in debian/rules
Changelog for 0.9.8a-3
Prune doc/fortunes.txt from personnal attack (closes: #401560, #518300)
Set policy to 3.8.1
Add lintian overrides.
We can use debhelper v7 without trouble
VLC is GPV v2 or later. So point to v2 of the GPL
Add comments to the patches
Delete unused patches
Fix cross-compilation
Fix build on non-Linux arch
fix typo in '--enable-maintainer-mode', Closes: #517155
Add a note in NEWS about running as root and vlc-wrapper (Closes: #507872)
Document recent changes
Move http/.hosts to /etc (Closes: #501791)
Fix for 2 builds in a row
Ignore file generated by dpkg-buildpackage
Reflect change to git in Vcs fields
Depends on debhelper >7
Improve some short descriptions
Disable the DV access module until it's ported to the new API
Add a conf file for git-buildpackage
Merge branch 'experimental' into sid
git-debimport vlc_0.8.6.h-5.diff.gz
git-debimport vlc_0.9.8a-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.9.8a.orig.tar.gz
git-debimport vlc_0.9.6-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.9.6.orig.tar.gz
git-debimport vlc_0.9.4-2.diff.gz
git-debimport vlc_0.9.4-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.9.4.orig.tar.gz
git-debimport vlc_0.9.2-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.9.2.orig.tar.gz
git-debimport vlc_0.8.6.h-4.diff.gz
git-debimport vlc_0.8.6.h-3.diff.gz
git-debimport vlc_0.8.6.i-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.8.6.h-4.1.diff.gz
git-debimport vlc_0.8.6.h-4+lenny1.diff.gz
git-debimport vlc_0.8.6.h-2.diff.gz
git-debimport vlc_0.8.6.h-1+lenny1.diff.gz
git-debimport vlc_0.8.6.i.orig.tar.gz
git-debimport vlc_0.8.6.h-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.8.6.h.orig.tar.gz
git-debimport vlc_0.8.6.e-2.3.diff.gz
git-debimport vlc_0.8.6.e-2.2.diff.gz
git-debimport vlc_0.8.6.e-2.1.diff.gz
git-debimport vlc_0.8.6.e-2.diff.gz
git-debimport vlc_0.8.6.e-1.1.diff.gz
git-debimport vlc_0.8.6.e.orig.tar.gz
git-debimport vlc_0.8.6.e-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.8.6.c-6+lenny5.diff.gz
git-debimport vlc_0.8.6.c-6+lenny4.diff.gz
git-debimport vlc_0.8.6.c-6+lenny3.diff.gz
git-debimport vlc_0.8.6.c-6+lenny1.diff.gz
git-debimport vlc_0.8.6.c-6.diff.gz
git-debimport vlc_0.8.6.c-5.diff.gz
git-debimport vlc_0.8.6.c-4.1.diff.gz
git-debimport vlc_0.8.6.c-4.1~lenny2.diff.gz
git-debimport vlc_0.8.6.c-4.1~lenny1.diff.gz
git-debimport vlc_0.8.6.c-4.diff.gz
git-debimport vlc_0.8.6.c-3.diff.gz
git-debimport vlc_0.8.6.c-2.diff.gz
git-debimport vlc_0.8.6.c-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.8.6.c.orig.tar.gz
git-debimport vlc_0.8.6.a.debian-6.diff.gz
git-debimport vlc_0.8.6.a.debian-5.diff.gz
git-debimport vlc_0.8.6.a.debian-4.diff.gz
git-debimport vlc_0.8.6.a.debian-3.diff.gz
git-debimport vlc_0.8.6.a.debian-2.diff.gz
git-debimport vlc_0.8.6.a.debian.orig.tar.gz
git-debimport vlc_0.8.6.a.debian-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.8.6-svn20061012.debian-5etch1.diff.gz
git-debimport vlc_0.8.6-svn20061012.debian-4.diff.gz
git-debimport vlc_0.8.6-svn20061012.debian-3.diff.gz
git-debimport vlc_0.8.6-svn20061012.debian-2.diff.gz
git-debimport vlc_0.8.6-svn20061012.debian-1.2.diff.gz
git-debimport vlc_0.8.6-svn20061012.debian-1.1.diff.gz
git-debimport vlc_0.8.6-svn20061012.debian-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.8.6-svn20061012.debian.orig.tar.gz
git-debimport vlc_0.8.6-svn20061008.debian-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.8.6-svn20061008.debian.orig.tar.gz
git-debimport vlc_0.8.6-svn20061001.debian-4.diff.gz
git-debimport vlc_0.8.6-svn20061001.debian-2.diff.gz
git-debimport vlc_0.8.6-svn20061001.debian-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.8.6-svn20061001.debian.orig.tar.gz
git-debimport vlc_0.8.6-svn20060925.debian-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.8.6-svn20060925.debian.orig.tar.gz
git-debimport vlc_0.8.6-svn20060918.debian-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.8.6-svn20060918.debian.orig.tar.gz
git-debimport vlc_0.8.6-svn20060911.0.8.5-1-svn.debian-5.diff.gz
git-debimport vlc_0.8.6-svn20060911.0.8.5-1-svn.debian-4.diff.gz
git-debimport vlc_0.8.6-svn20060911.0.8.5-1-svn.debian-3.diff.gz
git-debimport vlc_0.8.6-svn20060911.0.8.5-1-svn.debian-2.diff.gz
git-debimport vlc_0.8.6-svn20060911.0.8.5-1-svn.debian-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.8.6-svn20060911.0.8.5-1-svn.debian.orig.tar.gz
git-debimport vlc_0.8.6-svn20060910.0.8.5-1-svn.debian.orig.tar.gz
git-debimport vlc_0.8.6-svn20060910.0.8.5-1-svn.debian-1.diff.gz
Merge branch 'upstream'
git-debimport vlc_0.8.6-svn20060823.debian-3.diff.gz
git-debimport vlc_0.8.6-svn20060823.debian-2.diff.gz
git-debimport vlc_0.8.6-svn20060823.debian-1.diff.gz
git-debimport vlc_0.8.6-svn20060823.debian.orig.tar.gz
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3cef1bf178786927315f5033587b0926821b4b1b
X-Git-Newrev: e78b690d24caa2e9a5f55dc88e14da2e43d39f29
The following commit has been merged in the master branch:
commit e78b690d24caa2e9a5f55dc88e14da2e43d39f29
Merge: 301a633fe567f7f4b9ac785d8761446d0cbd6bb8 3cef1bf178786927315f5033587b0926821b4b1b
Author: Mateusz Åukasik <mati75 at linuxmint.pl>
Date: Wed Dec 11 15:13:42 2013 +0100
Fix upload
diff --combined ChangeLog
index 08758b6,de56664..c17663a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,1235 -1,3 +1,1238 @@@
++<<<<<<< HEAD
+commit a4c487694e5a0dc1bc0a5748cd04417452d05dd5
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Mon Dec 9 01:05:14 2013 +0100
+
+ Contribs: update libav and FFmpeg sha1
+
+commit 87b457f182e5fb4d2519ce12c62d4df8297e9882
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Sat Dec 7 10:41:39 2013 +0100
+
+ fluidsynth: fix linking on osx
+
+ (manual backport of 62f25ef1c0180f307a50837e12e5fab358e29275)
+
+ Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
+
+commit 16cfc9fdd6880cf99ee041a043eac568fc4ce90c
+Author: Rafaël Carré <funman at videolan.org>
+Date: Sat Dec 7 22:55:32 2013 +0100
+
+ contrib: speex: fix git hash
+
+ Use the revision just before libspeexdsp split
+
+ (cherry picked from commit 7d72f09c93805b1046343d04e5c8e23c8ecb1590)
+
+commit 5aebac3078b586fcd72ba17b01e934a45431370c
+Author: Michał Trzebiatowski <hippie_1968 at hotmail.com>
+Date: Sun Dec 8 19:37:35 2013 +0100
+
+ l10n: NSIS Polish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 6cd1fbf556bbb823982ca540ab1c4357577b4cd3
+Author: Michał Trzebiatowski <hippie_1968 at hotmail.com>
+Date: Sun Dec 8 19:35:35 2013 +0100
+
+ l10n: Polish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 06e72d17cb79a27e722524813d4ca2b28b15aec7
+Author: Christoph Miebach <christoph.miebach at web.de>
+Date: Sun Dec 8 12:10:31 2013 +0100
+
+ NEWS: Typos fixed
+
+commit 35c5354c363d30119edccb0c0d5d9d26b68fd753
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sun Dec 8 00:05:10 2013 +0100
+
+ NSIS: fix polish translation
+
+commit 96b97f38d3ef6a9c0dc8a70d54bab4217426aaff
+Author: Pierre Ynard <linkfanel at yahoo.fr>
+Date: Sat Dec 7 18:23:51 2013 +0100
+
+ youtube.lua: handle relative reference in javascript URL
+
+ (cherry picked from commit 87fcede4b4839ff99dbc52b71664d28c02eb381e)
+ Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>
+
+commit ffed71d77e83ec96ca48e5acbca86826849474c1
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat Dec 7 17:23:19 2013 +0100
+
+ Update NEWS for translations
+
+commit 99bd1da31a2b5fd03af28eb6c0bf8ba39d0c5400
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat Dec 7 17:21:57 2013 +0100
+
+ Update PO files
+
+commit e5f0508871792f65b3eff4fabf27f9cdf7ec5fd7
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat Dec 7 16:48:32 2013 +0100
+
+ Contribs: update fribidi to 0.19.6
+
+ (cherry picked from commit 5d73f3bef8bab3826e6b421f4aee2270cbdb1526)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit d4ef08d3a5327f07b0734e132d8d613bcf0369df
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat Dec 7 16:37:34 2013 +0100
+
+ Contribs: update live555
+
+ (cherry picked from commit ebc939efe12cd3eec0a09537058ae4cae31fcd3e)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit d8229faab669c4576fcc74a43b78ae3ae15f4a22
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat Dec 7 16:30:04 2013 +0100
+
+ Contribs: update GnuTLS to 3.1.17
+
+ (cherry picked from commit 708998c0e707c32b6c757f447318ab7dfd281067)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 922a854f4d1fffe236454c6a93d61f20ec5e8a41
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat Dec 7 16:19:22 2013 +0100
+
+ Contrib: upgrade Opus to 1.1
+
+ (cherry picked from commit 0d4a258136f34f59202c94129388f027ca560de1)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 5280d37fe2edcfc3402ef339457e3f959ff4a9db
+Author: Thomas De Rocker <thomasderocker at hotmail.com>
+Date: Sat Dec 7 16:46:37 2013 +0100
+
+ l10n: NSIS Dutch update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit a7170eee8648f9f02d7de22fe9203b83c599651d
+Author: Michał Trzebiatowski <hippie_1968 at hotmail.com>
+Date: Sat Dec 7 16:44:50 2013 +0100
+
+ l10n: NSIS Polish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 1f70a1d67dbf8ca616d40e1260a58f5a1058f60b
+Author: Christoph Miebach <christoph.miebach at web.de>
+Date: Sat Dec 7 16:37:59 2013 +0100
+
+ l10n: NSIS German update
+
+commit 440d8843dc8f3c797b7c3d4c6fe03f7506380962
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 15:50:32 2013 +0100
+
+ l10n: Thai update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 765ccdb381dd2270ad25c3c7de2f56b71e562a12
+Author: Umidjon Almasov <u.almasov at gmail.com>
+Date: Sat Dec 7 15:28:35 2013 +0100
+
+ l10n: Uzbek update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit ab767856ed2fc3af001f6a10babc39893fc7fcc4
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 15:20:16 2013 +0100
+
+ l10n: Tamil update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit aba2eb8fb65486011cc00eef3c86f0a02de52bda
+Author: A. Regnander <anton_r_3 at hotmail.com>
+Date: Sat Dec 7 15:13:13 2013 +0100
+
+ l10n: Swedish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 99b420ab5591ea53a33d070674201ca6dbdf1446
+Author: Martin Srebotnjak <miles at filmsi.net>
+Date: Sat Dec 7 15:10:16 2013 +0100
+
+ l10n: Slovenian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit cff4da6e30f98afd0835def1c6ad1b867477830b
+Author: Pasindu Kavinda <pkavinda at gmail.com>
+Date: Sat Dec 7 15:07:43 2013 +0100
+
+ l10n: Sinhala update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit f1c6dbb283d05b42ef5c8632821636ce5006ee2c
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 15:05:07 2013 +0100
+
+ l10n: Romanian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 4cc524cdc7493ed74b3318b604fe0047f1601e1a
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 14:12:44 2013 +0100
+
+ l10n: Polish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 9d5748fd048db734799f15596cd6ca0d16ae7660
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 14:10:05 2013 +0100
+
+ l10n: Occitan update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit ad2d7e9003f05e67b4133875f57b3d915ea252d6
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 13:56:33 2013 +0100
+
+ l10n: Lithuanian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 9c3beabcdf96dbe059e12e002fd4ae650f30b828
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 13:51:32 2013 +0100
+
+ l10n: Kannada update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 7c404fcf2559669b48bc5acd309c3630c97f6fcc
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 13:47:39 2013 +0100
+
+ l10n: Khmer update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 7b82e50fc9a444c740524c3672c9a4106b729179
+Author: Lorenzo Facca <lorenzo.facca at ovi.com>
+Date: Sat Dec 7 13:40:23 2013 +0100
+
+ l10n: Italian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 0d1f6456cf69ca0ff5ee437ef1664979f1c2d104
+Author: Sveinn à Felli <sveinki at nett.is>
+Date: Sat Dec 7 13:36:22 2013 +0100
+
+ l10n: Icelandic update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit b1a51b91fc5f4126dedc4e71f3c980f44b510ea2
+Author: Firdaus Simbolon <dausbajing at hotmail.co.id>
+Date: Sat Dec 7 13:35:25 2013 +0100
+
+ l10n: Indonesian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit e3348787e4822ff5923c61fd1c043e6498cad0ca
+Author: Gabor Kelemen <kelemeng at gnome dot hu>
+Date: Sat Dec 7 13:33:04 2013 +0100
+
+ l10n: Hungarian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 7cea8423a397aa6684828c79ca63207777e6305b
+Author: Michael Bauer <fios at akerbeltz.org>
+Date: Sat Dec 7 13:29:42 2013 +0100
+
+ l10n: Scottish Gaelic update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 6a974c59fd3dc97bd2f4cc693272ece39c544ec0
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 13:27:25 2013 +0100
+
+ l10n: French update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 7be4f0e11831b212bedae7ea865fec1e3f5f9020
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 13:23:35 2013 +0100
+
+ l10n: Persian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 4f6fa226d66edfeeb54572ce3fb7736d954c8239
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 13:21:33 2013 +0100
+
+ l10n: Basque update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 1bb6f7e64ba49cbebd9e5892d8322455e9afdaca
+Author: Ivar Smolin <okul at linux.ee>
+Date: Sat Dec 7 13:18:51 2013 +0100
+
+ l10n: Estonian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit db7f5f0a01c2289bfa2045c5d8b21bf849e68a12
+Author: David González <pico.dev at gmail.com>
+Date: Sat Dec 7 13:16:39 2013 +0100
+
+ l10n: Spanish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 6dd3fb3013ee4f5761ceb010b0b607f332d37909
+Author: Aputsiaĸ Niels Janussen <aj at isit.gl>
+Date: Sat Dec 7 13:07:26 2013 +0100
+
+ l10n: Danish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit a689301996538d6df7639ecadfc462d375ad7dc1
+Author: Aled Powell <aled at aledpowell.com>
+Date: Sat Dec 7 13:06:17 2013 +0100
+
+ l10n: Welsh update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 156eff0edfa343db4a0c68af7e0c718d3429a507
+Author: Tomáš Chvátal <tomas.chvatal at gmail.com>
+Date: Sat Dec 7 13:02:14 2013 +0100
+
+ l10n: Czech update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 4643e3785f46d535ddfc80e0b05d5c2ccfc178f8
+Author: Adnan Memija <sream_92 at live.com>
+Date: Sat Dec 7 12:57:06 2013 +0100
+
+ l10n: Bosnian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 91bac1eeb1d945dd19b4b972442b0b791815a095
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 12:54:31 2013 +0100
+
+ l10n: Bulgarian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit f84715094b4cd136598b5361091ca916881b663f
+Author: Dominko Aždajić <domazd at mail.ru>
+Date: Sat Dec 7 11:11:25 2013 +0100
+
+ l10n: Croatian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 5b976ed762e50c9e00d7c4e0ffbce653b8e0e346
+Author: Rémi Denis-Courmont <remi at remlab.net>
+Date: Fri Dec 6 15:09:01 2013 +0200
+
+ input: do not misinterpret attachment MRLs as file paths, fixes #10046
+
+ (cherry picked from commit e26b44bb61231f54f33700e17345475f06ca17f9)
+
+commit f2304f902add67a45a08988f4d4a5d3ff303b6fb
+Author: Rémi Denis-Courmont <remi at remlab.net>
+Date: Fri Dec 6 14:49:13 2013 +0200
+
+ input: off-by-three
+
+ (cherry picked from commit dab63843107615358e1dfba2211cfe1deb7967d4)
+
+commit 4eb6d91e94f720bf2dd22dcfee171e4ff4b790df
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Mon Dec 2 17:32:07 2013 +0100
+
+ Freetype: fix compilation with 2.5.1
+
+ Close #10019
+
+ (cherry picked from commit c5b2b0a284ba6b544646f3a205aa1a2e1117d431)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 9ebead9dfbdcac2da31bc856cec51c058f5ddca8
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Thu Dec 5 19:02:15 2013 +0100
+
+ Fix make dist
+
+commit ad561f706559e069b5ca2c5dbe1b78c708010bbd
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Thu Dec 5 18:49:11 2013 +0100
+
+ Update NEWS
+
+commit 2d955118db5445ae16e0ddffa1f2bee1d832b1d5
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Thu Dec 5 18:34:23 2013 +0100
+
+ mac packages: remove obsolete Delete Preferences.app
+
+ This application is incompatible with Mavericks, and it is superseded by the mechanisms provided
+ within the UI itself.
+
+ Also update the readme to reflect this change.
+
+ (cherry picked from commit 49419d7370436845191ba750ce762791a6dda0f7)
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 2147391ece792013d828d5d080e912b428e3af92
+Author: Andy Tather <andy at andytather.co.uk>
+Date: Thu Dec 5 18:33:26 2013 +0100
+
+ DirectSound: fix SPDIF
+
+ Close #9522
+
+ (cherry picked from commit 4f3bc33fee31bea49fd17306cc5201bb3eb2968a)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 2052b46a2dbeba97a2da1fe1b36060c173fa31ce
+Author: Andy Tather <andy at andytather.co.uk>
+Date: Thu Dec 5 18:32:38 2013 +0100
+
+ Waveout: Fix SPDIF output
+
+ Ref #9522
+
+ (cherry picked from commit 4fcfd8479f462ca964bdb061b55b0d4cdfb055b0)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 22dc2227f09e8f4c939013ff726d5d23968acd28
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Fri Nov 29 16:10:37 2013 +0100
+
+ nsis: simplify OS detection
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit f5f857545892f9e32b06e690447fead7d12493b8
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Fri Nov 29 12:56:43 2013 +0100
+
+ nsis: request admin execution level
+
+ The current state of our NSIS installer doesn't support per-user
+ installation and needs a major rework to do so, therefore the user
+ is required to have admin privileges to install VLC.
+
+ Still, RequestExecutionLevel was set to 'user' to be able to drop
+ privileges when launching vlc.exe at the end of the installation but
+ this was improved since (90496f23c2481bbaea21a586bc22631850751221) and
+ confirmed by the accesschk tool.
+
+ However requesting user execution level makes the unpacking occurs
+ twice: once with the user level and once after elevation.
+
+ Requesting admin permissions fixes the unpacking issue while still being
+ safe when launching VLC after the installation on XP and above.
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit 4e5135b3f335cc0e2dc8aa1ca238a72a91f36c20
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Thu Nov 28 13:45:31 2013 +0100
+
+ nsis: kill VLC before copying/updating any file
+
+ During silent installations (/S) the installer will automatically kill
+ (without warning) any running instance of VLC before copying files.
+
+ Silent updates should now work using the flags /S /update.
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit 8eb52019f5519e7e9b0f29fdbdecdf402b810b9e
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Thu Nov 28 13:45:02 2013 +0100
+
+ nsis: compile the nsProcess plugin
+
+ The plugin is a NSIS helper used to find and kill a running process. It
+ is licensed under the same terms as NSIS (zlib/libpng).
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit 0c18e4e628bb6c44a7e01da7f0e1eb76999c7071
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Wed Nov 20 16:54:55 2013 +0100
+
+ nsis: remove unused string
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit 6a10370dcb263665a2fde7ab99db20d93bc5c8a4
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Wed Nov 20 15:36:20 2013 +0100
+
+ nsis: remove dead uninstaller code
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit 45b4a74730e4512945d2cce90a07e3e59f31a402
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Wed Nov 20 15:30:26 2013 +0100
+
+ nsis: make new strings translatable
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit 74897938043f29ca01ed27504c30922d51b6fa6c
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Wed Nov 20 15:28:24 2013 +0100
+
+ nsis: sync wording with the uninstaller section
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit fb9a28f2bf30a0726d001c2d6430ca41a0730a75
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Mon Dec 2 18:06:46 2013 +0100
+
+ audio unit: fix init order
+
+ (cherry picked from commit d470a924f428a5d6ac40d56142f7d14919512471)
+
+commit f54e75a4d84809b954ec920a1aa74db215cc0bad
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Mon Dec 2 17:14:18 2013 +0100
+
+ audiounit: fix crash
+
+ (cherry picked from commit e426d8e52529904227d19b932b228b6c04c71acf)
+
+commit 1fd9c04bcb1ace7e6d583be9dc053798767a276f
+Author: Rémi Denis-Courmont <remi at remlab.net>
+Date: Mon Dec 2 18:04:19 2013 +0200
+
+ deinterlace: fix segmentation fault (fixes #9916)
+
+ (cherry picked from commit 9594f247286f36a45b81ba7cbd7273858e9f07ed)
+
+commit 50b8aa096e3e8065a78eadcdc9e2f4212e0f64dd
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sat Nov 30 20:05:58 2013 +0100
+
+ contrib: fix compilation of libraries for iOS which deploy cmake
+
+ (cherry picked from commit 215c6ac6f278860fdb4abc8fdc99226a7c7f895a)
+
+commit 6232a2199bb2fbf8eaed03cd0011da8688d52c1a
+Author: Maxim Bublis <b at codemonkey.ru>
+Date: Wed Nov 20 13:52:59 2013 +0400
+
+ Fixed warning on incompatible pointer types
+
+ Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
+ (cherry picked from commit bcd00e3be19095558de9d76f2d9aac38bfbd7c94)
+
+commit 7cc64bcacaa6b07b21aea0ae08a28f8ef13f1144
+Author: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Fri Nov 29 10:28:14 2013 +0100
+
+ Qt: fix profiles with vcodec=copy (fix #9342, fix #9485)
+
+ (cherry picked from commit 7ca3f99c1efc986f99dcae91f942bd81f5084e8f)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 6430d7d3dcceda96f5144182f3b97cdd7ef819eb
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Fri Nov 29 12:18:33 2013 +0100
+
+ Contribs: update live555 for security issues
+
+ (cherry picked from commit 537acc94690be49b2858ca90c46bc5fa1a7d2795)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 9138901bc8e0efb2caac1dad17e5b67cde59a923
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Thu Nov 28 18:19:16 2013 +0100
+
+ Update NEWS
+
+commit 527786397c63977b232ebef6828bdc21066cae03
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Thu Nov 28 18:12:01 2013 +0100
+
+ audiounit_ios: merge playback performance improvements from the Mac auhal module
+
+ (cherry picked from commit cb475372d0643ef60e05c8c3ee0cbddc120cf315)
+
+commit 18af443ebc9e5dd6db679120060b82b732957e43
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Wed Aug 21 19:42:41 2013 +0200
+
+ auhal: limit scope of mutex
+
+ This should suffice as the variable is only modified on this thread.
+ Avoids deadlock in refs #9141
+
+ (cherry picked from commit b2823701b6123b5cb1f862dec7f5a62a9d77d17f)
+ Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
+
+commit ec71474ff2affbdd2b15c204657994db56132dba
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Mon Nov 25 19:48:40 2013 +0100
+
+ auhal: fix crash on error paths for stream format change
+
+ ref #9957
+
+ (cherry picked from commit eb72c5a30544b2c12f16200b11b79e5774849db3)
+ Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
+
+commit e4633a2c3ce5a75cc27155a57f67d9c2022ca61f
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Wed Nov 27 16:29:50 2013 +0100
+
+ auhal: implement pause by output silence instead of stopping output
+
+ Stopping and restarting the audio unit or device might take a
+ considerable amount of time. This leads to flushes, and
+ the user notice a delay for resuming audio.
+
+ Auhal does not have a better API for pause, so lets only play silence
+ for now. This fixes resume delays with analog mode, and might improve
+ delays for digital mode (through they are still occuring from
+ time to time here).
+
+ close #9536
+
+ (cherry picked from commit 16fce2346d08569348a74a1ff0ea133d0015656b)
+ Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
+
+commit 06631f06f0c78b8ee12e93f6f36c75e0e0334c7e
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Tue Nov 26 19:40:09 2013 +0100
+
+ auhal: do not stop and restart audio unit on flush
+
+ This is a manual revert of 878169fe, which is not needed anymore.
+ Additionally, it fixes blayback with devices which are not fast
+ enough for starting up.
+
+ close #9886
+
+ (cherry picked from commit 1f46c35a5aa44fd1c32b49c65500e37d795f1a91)
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 55fe270c8a53e0e97e4f0f7c54f9223955bc9e27
+Author: Rafaël Carré <funman at videolan.org>
+Date: Mon Nov 18 13:39:27 2013 +0100
+
+ UAC: offsetof only needs to know the field name
+
+ Don't specify the (variable) size
+
+ (cherry picked from commit ffff393ec1421aa7ff00cb5fb024d6fbee931fd4)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 50757f6ad12da09746b12ee0008139b853ff5e68
+Author: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Mon Nov 25 13:41:58 2013 +0100
+
+ Qt: InputManager: don't enforce lower bound after a seek
+
+ Should fix problems like #2243.
+ After a seek, the updated position could be the keyframe position
+ choosen by demux, and then lower than A.
+
+ (cherry picked from commit 9baab2bdeb1667061b98399b407b7434f0dbb36e)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 1f6dcc728faf40cac1f41d1846af5e3279de5e02
+Author: Rémi Duraffort <ivoire at videolan.org>
+Date: Mon Nov 25 19:33:11 2013 +0100
+
+ freetype: fix potential memory leak (cid #1048945)
+
+ (cherry picked from commit 687a362c7648d6a4372b3205d099b5d2e879ef7f)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 366019d8cca6749af98467c0fc3c9610df624f8c
+Author: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Mon Nov 25 18:13:09 2013 +0100
+
+ demux: asf: enforce root object boundary (fix #9441)
+
+ Seems some encoder reuses previous memory area for junk sections.
+
+ (cherry picked from commit 2ca8c9db8064dcb8b9c683ec9b160464f6f3580e)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit eedd67057b6808f4d182abb35ad441fc4c47ba3d
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Mon Nov 25 17:38:01 2013 +0100
+
+ macosx: fix issue which caused automatic video resizing even if disabled
+
+ close #9864
+
+ (cherry picked from commit b82bc83428aa33f2b5af2b4201f0926d2ebfe4ba)
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 7c87233f87d06ac329e55a3800ff5e07056a8ce4
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Mon Nov 25 17:36:27 2013 +0100
+
+ macosx: fix crash when closing video window without decorations
+
+ (cherry picked from commit ee3e5d56ec9816c3728706b3618686790fb0892d)
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit ae82a0b8f9f3118b710dccc7dab9b650f3f1a981
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sun Nov 24 20:56:53 2013 +0100
+
+ macosx: fix subtitles opening for the applescript bindings
+
+ (cherry picked from commit e374892046ecc55f510e0595e472a5251ac957e4)
+
+commit 628a8e751a15ac3becbaa7f15646c0d2a01ebcce
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sun Nov 24 20:56:36 2013 +0100
+
+ macosx: fix drag & drop / double-clicks in Finder to open subtitles files (close #9953)
+
+ (cherry picked from commit 2604049f04c78e0b586d04f780f01d728feb0618)
+
+commit 36c6ddd848ee43bb58bf67dbbbcc8648d44d1475
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sun Nov 24 20:35:05 2013 +0100
+
+ darwinvlc: fix automatic language selection (close #9914)
+
+ (cherry picked from commit c6e4493dcdab713bc70d0efb2154d08dce57cde1)
+
+commit bc60abcfc2d344b9aafce156127bf84cb207db80
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sun Nov 24 20:22:11 2013 +0100
+
+ macosx: show 'pause iTunes' option in a more accessible place since it is being asked for a lot (close #9954)
+
+ (cherry picked from commit 325764ecd99ca4131cffbfcc6b594f7bc42a2de8)
+
+commit e4417b49627c3ffe96d8d9b9efa29091986ca5b6
+Author: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Fri Nov 22 17:11:25 2013 +0100
+
+ demux: asf: reject DRM'ed files
+
+ Keep #8241 open ???
+
+ (cherry picked from commit 23445cd543c69113f4f82bce7362d6fc20cc0bfa)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 66fbea9be4fc842a77291021c96f8c581ced826d
+Author: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Fri Nov 22 13:33:04 2013 +0100
+
+ demux: asf: preroll to seek time from index keyframes (fix #7890)
+
+ (cherry picked from commit 58c8f9f3cef168df4adfe5e1ca14cc745f4ba7fc)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit c116087d48daf80f37646e84077e55e53c4b4c87
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Fri Nov 22 22:26:49 2013 +0100
+
+ Update NEWS
+
+commit e01dd3cbe127c7fc5703eaef83f0f0a44793365d
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Fri Nov 22 21:36:32 2013 +0100
+
+ Update NEWS
+
+commit cc6e30124319a7c59adab28ac442e4fc143d5054
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Fri Nov 22 18:49:42 2013 +0100
+
+ auhal: use own thread for notification loop
+ (cherry picked from commit 626174f3b9d86559db9c66ede56abd15a3d7ea5e)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit d0cb844ec7a5c0eee607e9897421bde408352bc2
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Fri Nov 22 18:40:11 2013 +0100
+
+ auhal: ignore changed default device in digital mode
+
+ This fixes nonfunctional playback when more than one audio device
+ is installed.
+
+ close #9924
+ (cherry picked from commit 2f5891bd44f9a5bffcb4d8a2bd918d0787f53c6f)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 22f80f041ce576696f9ca31621cec9753effd69a
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Fri Nov 22 18:39:23 2013 +0100
+
+ auhal: fix comments
+ (cherry picked from commit 8b6eec54693d35f8f1b7dfa3f659c0b92ac97944)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 03612f91083033ecb0be6c218a673457288859b8
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Thu Nov 21 11:00:38 2013 +0100
+
+ macosx: fix preferences reset if unknown version was found
+ (cherry picked from commit a87c668eaf2788a454f22a18b5dbd66f8750cd9d)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 066ed4232f258dbea6cff88df048aa88d6a565a8
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Thu Nov 21 10:59:02 2013 +0100
+
+ macosx: fix selection of playlist item for very first start
+ (cherry picked from commit dd4fe6748489ff37ac0847a5baf9db6db21e3419)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 9a315ff20df7a0f96d92f99783aafce48a7e9593
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Thu Nov 21 01:58:56 2013 +0100
+
+ macosx: correctly reset interface preferences when requested
+ (cherry picked from commit f88d16b248d051d1366d4097df97ee00a1129997)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 5add3e9ddd94d97de25fd2c9c57c708ccb251c54
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Wed Nov 20 19:35:50 2013 +0100
+
+ macosx: change alignment of dropzone-box yet again
+
+ (not cherry-picked from commit 6ea4d015ffcad76ae5d0262d668ec92ff6e42136)
+
+commit 286c2d93dad465ceabcaa4b8d24474d360d5b04c
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Tue Nov 19 21:13:13 2013 +0100
+
+ macosx: refinements of minimized view behaviour
+
+ - Fix wrong playlist resize
+ - Minimize view state is now retained from start up to stop of video.
+ Using the playlist button will result in the playlist to show up, but it
+ will be always hidden when video finally stops.
+ - Minimize view state is exited when the user uses alt to go back to normal view.
+
+ close #9722
+ (cherry picked from commit 655dacc5e1cd7c9f1d347a7344ccb8d3734a7353)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 0278721d2b19162362c4b0275dbc9c2897e31a45
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Mon Nov 18 18:26:27 2013 +0100
+
+ Do not put the extensions twice
+
+ (cherry picked from commit 5dee34ad0318ec7daf8f1024d52a687b7b45b4b2)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 3649f9e93b644796fbcf562a71fc2dca6b2d9357
+Author: Rafaël Carré <funman at videolan.org>
+Date: Mon Nov 18 20:00:48 2013 +0100
+
+ lpcm bd: fix decoding of 16 bits with channels padding
+
+ swab prototype is not the same as memcpy (src and dst are swapped)
+
+ (cherry picked from commit 7dcd1665a2d127a8573e29832fce1b1d88836643)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 4479d65110b00ecb36b8637d6d3721e0536cd6c8
+Author: Pierre Ynard <linkfanel at yahoo.fr>
+Date: Tue Nov 19 01:57:01 2013 +0100
+
+ vimeo.lua: rewrite due to website changes
+
+ The config is not available within the page anymore, we have to call an
+ API URL to fetch it
+
+ (cherry picked from commit d7e042e81aac6854cfe06aab11137e2385bec470)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit fc50621f0bcc4e1bfda47f00126bced78132151e
+Author: Pierre Ynard <linkfanel at yahoo.fr>
+Date: Mon Nov 18 22:27:06 2013 +0100
+
+ dailymotion.lua: fix page parsing
+
+ (cherry picked from commit 2fe62d4008bef9698641a5453dea70db80a8803f)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit b89c7bd8b0e6a0a638e3955ac7ba37d923161258
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Tue Nov 19 16:55:17 2013 +0100
+
+ extras/ios: enable gnutls
+
+ (cherry picked from commit f95987341838fb563e6b1b68ee80588b44b31e63)
+
+commit 2f0a7f2cc5ade49e1fe79fbdfebbc0c822c8f785
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Mon Nov 18 19:47:31 2013 +0100
+
+ Qt: correctly update the art URL
+
+ (cherry picked from commit 7fc3ea2fb9c699966a58b4b4392a4f0a1fe0aeff)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 13bd019795c5f439af868ec914e0080d9fbcc827
+Author: Rafaël Carré <funman at videolan.org>
+Date: Mon Nov 18 19:26:39 2013 +0100
+
+ LPCM: fix 20/24-bit decoding
+
+ Fixes: #9907
+ (cherry picked from commit 68ca8d0b779ee20580230289d890b5b6b671abe0)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit edae24720de0999722731711263becda9f832536
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Sun Nov 17 18:21:37 2013 +0100
+
+ macosx: unify functionality of fwd/bwd buttons in video window
+
+ Behaviour is now the same as the buttons in main window
+
+ close #9512
+ (cherry picked from commit 941cff445097b422455c333af47230b8dfe93283)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 78cb619963134753cbfa655d135e811db2166d03
+Author: Rafaël Carré <funman at videolan.org>
+Date: Fri Nov 15 15:25:48 2013 +0100
+
+ Revert "flac packetizer: use the largest possible frame size"
+
+ This reverts commit 03e0644c82bf1dea96f8ade8829c2e1f360bd1ee.
+
+ Decoder needs single frames
+
+ Closes #9863
+
+ (cherry picked from commit a5a87c3c662a3f733d1b7a49b8cf5c5f595aed41)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit eb3a5c57f829ada48afceb9fdc6238049f748a23
+Author: Denis Charmet <typx at dinauz.org>
+Date: Sun Nov 17 16:15:23 2013 +0100
+
+ Increase dpb size for HEVC
+
+ (cherry picked from commit 89f67375ed4d791d34f2b4d25162e684c109d338)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 28f171e9d1ae871b7f0f42cc1ca4889978a1897b
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Fri Nov 15 18:04:25 2013 +0100
+
+ NEWS: mention video filter fix
+
+commit ee5ba3c10e7142edba14388899c6d795bc4f0493
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Thu Nov 14 13:14:07 2013 +0100
+
+ macosx: remove unneeded free
+ (cherry picked from commit 09e1913c5390c6f971094fb4af78a89486fd1d25)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit d0aeca74e3fb5802cefc39dd09cb52f061d7213a
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Thu Nov 14 13:11:29 2013 +0100
+
+ macosx: fix use after free for video effects string
+
+ This bug resulted in failure of setting more than one video effect
+ filter on mavericks.
+
+ close #9849
+ (cherry picked from commit 31b1205fd622eef0be3379f602cf83807c3c2124)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit aa5d0d556fc8f0e77cd21e057159e757fcd1fe42
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Tue Nov 12 01:19:44 2013 +0100
+
+ On the road to 2.1.2
+
+commit 89db9aaf53cdf86aefc76088b171f13307a81a7b
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Mon Nov 11 19:14:48 2013 +0100
+
+ Update NEWS for translations
+
+commit 448e5a7e43bc39c5d5066ab988ff4dd9852f5502
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Mon Nov 11 19:14:19 2013 +0100
+
+ Update PO before release
+
+commit 89c9520d219b2c9c295f3c82a091a5e18bcc60df
+Author: Kaya Zeren <kayazeren at gmail.com>
+Date: Mon Nov 11 18:50:09 2013 +0100
+
+ l10n: Turkish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 08906043ec26785d64c0709c5332a163170307c5
+Author: Martin Srebotnjak <miles at filmsi.net>
+Date: Mon Nov 11 18:49:09 2013 +0100
+
+ l10n: Slovenian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 406925af8c546951b8b34fe05aa08945feddeda3
+Author: Sveinn à Felli <sveinki at nett.is>
+Date: Mon Nov 11 18:43:25 2013 +0100
+
+ l10n: Icelandic update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit cc200e038995c153685c249a44115dce3dbe8fbe
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Fri Nov 8 11:04:29 2013 +0100
+
+ Contribs: forgotten file in previous commit (3.1.16)
+
+ (cherry picked from commit 96152a1e85a7fd3f65176ede31c7ade4f8bd6407)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 4b4f0ddf289bb3833b1bb0bf39138aa7849d8f2b
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Mon Nov 11 08:32:23 2013 +0100
+
+ gnutls: fix build by initalizing LDFLAGS
+
+commit e82c2e080d2939528d582930086648d0f1a233da
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Sun Nov 10 15:25:01 2013 +0100
+
+ macosx: fix float-on-top behaviour with fullscreen
+
+ The issues were mostly noticable if you select both float-on-top
+ and fullscreen in video prefs.
+ (cherry picked from commit 627b5d8edcf2910b6abb0176cacaff87e622bff3)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 5ac4325f5ad4c07c36c47830b36c4c8582a55e4d
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sun Nov 10 13:56:03 2013 +0100
+
+ Update NEWS
+
+commit 1f405a8de88b0ce7dc4e94f2bd49827b54f0eadc
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sun Nov 10 13:24:02 2013 +0100
+
+ gnutls: link against CoreFoundation and the Security frameworks as it is required by the keychain certificate lookup patch
+
+ (cherry picked from commit c2b866499d6b43450c97905be29081a93316cb8c)
+
+ Conflicts:
+ modules/misc/Modules.am
+
+commit 07fb21d2a60b9379db2a10cbfe9a0f8f252f9ec1
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sun Nov 10 13:23:17 2013 +0100
+
+ contrib/gnutls: add patch adding keychain root certificate lookups on OS X (not supported on iOS)
+
+ (cherry picked from commit a06e7f27acef85631f7c748f568993de7f5023a1)
+
+commit e8065d407d82af62fd2fd84ce48952787ce9a10a
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Sun Nov 10 11:11:39 2013 +0100
+
+ macosx: fix typo and set path for open dialog correctly
+ (cherry picked from commit e7353f4b55b81c270e5433e41e64f627fbd7012c)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 1e0870a0dabc25c3b7aec6d87d437cf7c06db92a
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Sat Nov 9 17:26:46 2013 +0100
+
+ macosx: fix float-on-top-behaviour if setting is changed while in fullscreen
+ (cherry picked from commit 9dda04b93dfe657465cbdd3e36e9b3d2c9e16f02)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 7d89a358ee2117d6f6ece9fdccd7a3f4e0318503
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Sat Nov 9 17:22:00 2013 +0100
+
+ macosx: reset float-on-top when native fullscreen has already finished
+
+ This fixes issues where video window just disappears when exiting fullscreen,
+ only on Mavericks.
+
+ close #9814
+ (cherry picked from commit e062d7c8b5480d7794b2d009a3dcf2631792a97a)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 55c1afb29e9ee951f5c4647affb1fa860765d3fd
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Sat Nov 9 15:55:00 2013 +0100
+
+ Switch linking order of libcompat for modules
+
+ This precedes libcompat before the system libraries to be able to use
+ 10.7 compiled binaries on 10.6.
+
+ close #9527
+ (cherry picked from commit c664aa35a787a541545321a6ea041b03eaf95e16)
+
+ Conflicts:
+ modules/common.am
+
+commit 424907ba4a3912dbea63ac94ce51c67f2317653f
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sun Nov 10 11:33:53 2013 +0100
+
+ Update NEWS
+
+commit e954ae16feb3451129e8b575eaa9cd70cdcb6f6b
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sun Nov 10 01:12:54 2013 +0100
+
+ bin/darwinvlc: fix l10n preferences lookup code
+
+ (cherry picked from commit a24db0a78bd552ae26f8e3aab3a3dff8f41e7cbb)
+
+commit 02e1b85ea9084bb018c25cb808f05a26842fefd8
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sat Nov 9 18:28:50 2013 +0100
+
+ macosx: add GUI setting/getter for --language
+
+ (cherry picked from commit ffff39acd6827446091f26b86929af875d2c4ac4)
+
+commit 185b49c809bff25c74548414280380feee5e09bd
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sat Nov 9 18:07:19 2013 +0100
+
+ extras/package: add darwinvlc.c to xcodeproj
+
+ (cherry picked from commit 4dbe3de4b46651591d98c05319168f6333faa8ff)
+
+commit ecb2727972d445f1ebe49063efacec17e1c0c66c
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sat Nov 9 18:03:46 2013 +0100
+
+ bin: re-implement --language for OS X
+
+ (cherry picked from commit bd184a14413e098e273734bf8bc1f615e967fea5)
+
+commit 231bf658007d8d6a130ae2f7072c5da11b1b2670
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sat Nov 9 16:05:34 2013 +0100
+
+ bin: derive a special Darwin version from vlc.c
+
+ (cherry picked from commit a868dc7fe18182818471ea6c02770223f7a43d5b)
+
+commit 209ac4ee8d898577a72a7828971acd8ab3524804
+Author: Tristan Matthews <le.businessman at gmail.com>
+Date: Mon Nov 4 19:27:14 2013 -0500
+
+ avcodec: ensure valid buffer size for avcodec_fill_audio_frame
+
+ avcodec_fill_audio_frame will reject input buffers that are too small,
+ therefore we cannot call it directly with the input buffer p_aout_buf.
+
+ Signed-off-by: Ilkka Ollakka <ileoo at videolan.org>
+ (cherry picked from commit 64d26fe44e29a6457f09e2dcf0597d4e7da2816f)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 4502edc3466b0b2dc806571f895c8c3a346bf112
+Author: Ilkka Ollakka <ileoo at videolan.org>
+Date: Sun Nov 3 12:30:22 2013 +0200
+
+ avcodec: give right buffer size not the smallest one
+
+ (cherry picked from commit 541705d141d17699726ba0c6bbc7d43e2b76b0f4)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 5fc25faa5296428ab1edacabd4f4e4e1d72f4d1f
+Author: Ilkka Ollakka <ileoo at videolan.org>
+Date: Sun Nov 3 10:43:40 2013 +0200
+
+ avcodec: check i_samples_delay before rewinding date
+
+ (cherry picked from commit af4893152f8cbaf8ceee85d13dc7fa295e8df9da)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit db85a68711a50f2cdb5e337345aacd3db1022e46
+Author: Ilkka Ollakka <ileoo at videolan.org>
+Date: Sat Nov 9 18:11:48 2013 +0200
+
+ canvas: handle sar{0,1} and assume it to be 1:1
+
+ (cherry picked from commit 82d842bf0df8b605703ea761749a24fcd6407e14)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit a9556e4ce07961991c486369068ee745fe84f593
+Author: Ilkka Ollakka <ileoo at videolan.org>
+Date: Sat Nov 9 18:12:41 2013 +0200
+
+ transcode: set video chroma before trying to query video filters
+
+ (cherry picked from commit eb39fc67fa7701a6653e693866647d421c786353)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
commit 4208d104b93c9ccca318bc4f27cdf176ec2b8956
Author: Jean-Baptiste Kempf <jb at videolan.org>
Date: Thu Nov 7 18:38:13 2013 +0100
@@@ -20980,29 -19748,3 +20983,32 @@@ Date: Tue Jan 1 18:23:00 2013 +010
vaapi: Use vaDeriveImage instead of vaGetImage if available
Signed-off-by: Rafaël Carré <funman at videolan.org>
++<<<<<<< HEAD
+
+commit 10d7463d9b9f664f7ccffd77da583db4304653d0
+Author: Rafaël Carré <funman at videolan.org>
+Date: Tue Jan 1 18:04:54 2013 +0100
+
+ oldrc: fix segfault
+
+commit d750f80cdbdb70723d3dba4cd7ce747c70f5f457
+Author: Nil Geiswiller <ngeiswei at googlemail.com>
+Date: Sat Dec 29 00:13:40 2012 +0100
+
+ Add Mute shortcut to nvlc
+
+ I added the shortcut 'm' in nvlc for toggle mute. The volume status is
+ replaced my 'Mute' when enabled.
+
+ I also remapped the shortcut of metadata box from 'm' to 'M', I think
+ it follows the principle of least surprise.
+
+ Signed-off-by: Rafaël Carré <funman at videolan.org>
+
+commit 7939c3e5258149392e14f410497a2d437f21a26b
+Author: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Tue Jan 1 15:16:27 2013 +0100
+
+ Qt: Compressor/Spatializer: missing signal routing
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined Makefile.am
index 15b4609,0d169cd..e58119a
--- a/Makefile.am
+++ b/Makefile.am
@@@ -540,6 -540,13 +540,16 @@@ EXTRA_DIST +=
extras/package/macosx/configure.sh \
extras/package/macosx/dmg_setup.scpt \
extras/package/macosx/vlc.xcodeproj/project.pbxproj \
++<<<<<<< HEAD
++=======
+ extras/package/macosx/Delete_Preferences.app/Contents/Info.plist \
+ extras/package/macosx/Delete_Preferences.app/Contents/PkgInfo \
+ extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet \
+ extras/package/macosx/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \
+ extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \
+ extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \
+ extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
extras/package/macosx/eyetvplugin/Info.plist \
extras/package/macosx/eyetvplugin/eyetvplugin.c \
diff --combined NEWS
index b4e60eb,c542e27..d23c7ad
--- a/NEWS
+++ b/NEWS
@@@ -1,50 -1,3 +1,53 @@@
++<<<<<<< HEAD
+Changes between 2.1.1 and 2.1.2:
+--------------------------------
+
+Audio output:
+ * Fix digital playback on OS X when more than one audio device is installed
+ * Fix digital playback (SPDIF/HDMI) on Windows
+ * Fix stuttering or silent playback when using sound enhancers or external
+ audio devices on OS X
+ * Improve responsiveness on OS X when playback starts or is being paused
+ * Improve responsiveness, silent playback intervals and reliability on iOS
+
+Demuxers:
+ * Fix Vimeo and DailyMotion parsing
+ * Various WMV playback improvements and fixes
+
+Decoders:
+ * Fix LPCM 20/24-bit decoding and 16 bits with channel padding
+ * Fix playback of some HEVC samples
+
+Video filters:
+ * Fix crash on deinterlace selection
+
+Qt interface:
+ * Fix some streaming profiles when copy existed
+ * Improve A-B loop control
+ * Fix album art update when changing media
+
+Mac OS X interface:
+ * Add a language option in the interface
+ * Option to control VLC's iTunes pausing behavior is more easy to find
+ * Improved UI resetting when requested in the preferences
+ * Fix issue which prevented to enable more than one video filter on Mavericks
+ * Fix an issue which could prevent automatic UI language settings from working
+ * Fix opening subtitles files through drag & drop or double-clicking
+ * Fix crash when closing window without decorations
+ * Fix issue where extra video window was resized even if this was disabled
+
+Win32 installer:
+ * Kill running VLC process on uninstall/update
+
+Translations:
+ * Update of Basque, Bosnian, Bulgarian, Croatian, Czech, Danish, Estonian,
+ French, Hungarian, Icelandic, Indonesian, Italian, Kannada, Khmer,
+ Lithuanian, Occitan, Persian, Polish, Romanian, Scottish Gaelic, Sinhala,
+ Slovenian, Spanish, Swedish, Tamil, Thai, Uzbek, Welsh translations
+
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
Changes between 2.1.0 and 2.1.1:
--------------------------------
@@@ -105,7 -58,7 +108,11 @@@ Mac OS X interface
Translations:
* Update of Arabic, Basque, Belarusian, Czech, Danish, Dutch, French,
++<<<<<<< HEAD
+ Galician, Gujarati, Hindi, Hungarian, Icelandic, Italian, Japanese, Korean,
++=======
+ Galician, Gujarati, Hindi, hungarian, Icelandic, Italian, Japanese, Korean,
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
Lithuanian, Marathi, Modern Greek, Norwegian Bokmål, Occitan, Persian,
Polish, Portuguese, Punjabi, Romanian, Sinhala, Slovak, Slovenian, Spanish,
Swedish, Telugu, Thai, Traditional Chinese, Turkish, Ukrainian, Uzbek
diff --combined bin/darwinvlc.c
index 375d3d8,dd407a6..37befbd
--- a/bin/darwinvlc.c
+++ b/bin/darwinvlc.c
@@@ -2,7 -2,7 +2,11 @@@
* darwinvlc.c: the darwin-specific VLC player
*****************************************************************************
* Copyright (C) 1998-2013 the VideoLAN team
++<<<<<<< HEAD
+ * $Id: 9bac3caad86ca7455c20d81fa453aa2b418dce9f $
++=======
+ * $Id: 33bb4f3e5f9a92afd924ed9ab33d3cdc4517d44c $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Vincent Seguin <seguin at via.ecp.fr>
* Samuel Hocevar <sam at zoy.org>
@@@ -185,11 -185,9 +189,17 @@@ int main( int i_argc, const char *ppsz_
lang = (char *)malloc(maxSize);
CFStringGetCString(language, lang, maxSize - 1, kCFStringEncodingUTF8);
}
++<<<<<<< HEAD
+ if (strncmp( lang, "auto", 4 )) {
+ char tmp[11];
+ snprintf(tmp, 11, "LANG=%s", lang);
+ putenv(tmp);
+ }
++=======
+ char tmp[11];
+ snprintf(tmp, 11, "LANG=%s", lang);
+ putenv(tmp);
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
CFRelease(language);
}
}
diff --combined configure.ac
index 02fb8aa,58821eb..c6213ef
--- a/configure.ac
+++ b/configure.ac
@@@ -2,10 -2,10 +2,17 @@@ dnl Autoconf settings for vl
AC_COPYRIGHT([Copyright 2002-2013 VLC authors and VideoLAN])
++<<<<<<< HEAD
+AC_INIT(vlc, 2.1.2)
+VERSION_MAJOR=2
+VERSION_MINOR=1
+VERSION_REVISION=2
++=======
+ AC_INIT(vlc, 2.1.1)
+ VERSION_MAJOR=2
+ VERSION_MINOR=1
+ VERSION_REVISION=1
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
VERSION_EXTRA=0
VERSION_DEV=
diff --combined contrib/bootstrap
index 5e5f935,e5c7022..bb82a98
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@@ -146,24 -146,6 +146,27 @@@ add_make_enabled(
done
}
++<<<<<<< HEAD
+check_ios_sdk()
+{
+ if test -z "$SDKROOT"
+ then
+ SDKROOT=`xcode-select -print-path`/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}${SDK_VERSION}.sdk
+ echo "SDKROOT not specified, assuming $SDKROOT"
+ else
+ SDKROOT="$SDKROOT"
+ fi
+
+ if [ ! -d "${SDKROOT}" ]
+ then
+ echo "*** ${SDKROOT} does not exist, please install required SDK, or set SDKROOT manually. ***"
+ exit 1
+ fi
+ add_make "IOS_SDK=${SDKROOT}"
+}
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
check_macosx_sdk()
{
[ -z "${OSX_VERSION}" ] && echo "OSX_VERSION not specified, assuming 10.7" && OSX_VERSION=10.7
@@@ -218,7 -200,6 +221,10 @@@ case "${OS}" i
check_macosx_sdk
add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
else
++<<<<<<< HEAD
+ check_ios_sdk
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
fi
;;
diff --combined contrib/src/ffmpeg/rules.mak
index be66501,3a5f081..9bd74c9
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@@ -1,9 -1,9 +1,16 @@@
# FFmpeg
++<<<<<<< HEAD
+#HASH=9aa053ceded5550b2e538578af383fd89d82364c
+#FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz
+
+HASH=b6a971994187e87fcc8811108e144f15c1652728
++=======
+ #HASH=cdb46f15fff4996aaf120a32d1ffb9fb4cbbc68d
+ #FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz
+
+ HASH=d1c229cdbc07ef8eb703d68d1c5b509baee85245
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(HASH);sf=tgz
FFMPEGCONF = \
diff --combined contrib/src/fribidi/SHA512SUMS
index 0a4a114,d4c5869..3b212c2
--- a/contrib/src/fribidi/SHA512SUMS
+++ b/contrib/src/fribidi/SHA512SUMS
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+0661cf8e0985edfd5bf02c8de32432bf2faacadcaf35aef4e039a28f802a0468288e76b60231ebe7b54f909bd4d3ecc31a1fc94e83d434ae16dd21de6089629e fribidi-0.19.6.tar.bz2
++=======
+ 0a1216d3ff23f76dd90a1fa5b1eadd1276cfedc07bd636e345df23911d2e23bc3780a5ba2e32f2025b517f7137135fb3de6d337f872932466efe480ece364e43 fribidi-0.19.5.tar.bz2
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined contrib/src/fribidi/fribidi.patch
index 9ccc94b,1300259..f35bdbf
--- a/contrib/src/fribidi/fribidi.patch
+++ b/contrib/src/fribidi/fribidi.patch
@@@ -86,3 -86,17 +86,20 @@@ diff -u fribidi.orig/configure.ac fribi
Version: @VERSION@
Libs: -L${libdir} -lfribidi
Cflags: -I${includedir}/@PACKAGE@
++<<<<<<< HEAD
++=======
+ --- fribidi.orig/lib/fribidi-common.h 2008-02-04 21:30:46.000000000 +0000
+ +++ fribidi/lib/fribidi-common.h 2008-02-04 21:32:25.000000000 +0000
+ @@ -53,11 +53,7 @@
+
+ /* FRIBIDI_ENTRY is a macro used to declare library entry points. */
+ #ifndef FRIBIDI_ENTRY
+ -# if (defined(WIN32)) || (defined(_WIN32_WCE))
+ -# define FRIBIDI_ENTRY __declspec(dllimport)
+ -# else /* !WIN32 */
+ # define FRIBIDI_ENTRY /* empty */
+ -# endif /* !WIN32 */
+ #endif /* !FRIBIDI_ENTRY */
+
+ #if FRIBIDI_USE_GLIB+0
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined contrib/src/fribidi/rules.mak
index 30d1080,507441c..4c13cf8
--- a/contrib/src/fribidi/rules.mak
+++ b/contrib/src/fribidi/rules.mak
@@@ -1,5 -1,5 +1,9 @@@
# FRIBIDI
++<<<<<<< HEAD
+FRIBIDI_VERSION := 0.19.6
++=======
+ FRIBIDI_VERSION := 0.19.5
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
FRIBIDI_URL := http://fribidi.org/download/fribidi-$(FRIBIDI_VERSION).tar.bz2
PKGS += fribidi
diff --combined contrib/src/gnutls/SHA512SUMS
index 67b664a,72a6ed1..b7e2164
--- a/contrib/src/gnutls/SHA512SUMS
+++ b/contrib/src/gnutls/SHA512SUMS
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+ab6ab90966d1be767320f7c0aaea89cfd574391f82c4d602e8d73fec5f3b6bdee6032ea127f3d5fefd5db035ccabfb1ce34db0fdb87b0f451bd9d6f842195593 gnutls-3.1.17.tar.xz
++=======
+ dfd1fa108877994c7b2c7c127aea9267c8d78145c0902fbe4b19131fb77bb454e96e3b65af66b8e98596d601cfb07abb8966e5882533002bed9ccc51b11d7d3f gnutls-3.1.16.tar.xz
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined contrib/src/gnutls/rules.mak
index b7f1bed,b587686..516638b
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@@ -1,6 -1,6 +1,10 @@@
# GnuTLS
++<<<<<<< HEAD
+GNUTLS_VERSION := 3.1.17
++=======
+ GNUTLS_VERSION := 3.1.16
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-$(GNUTLS_VERSION).tar.xz
PKGS += gnutls
diff --combined contrib/src/live555/SHA512SUMS
index 606224a,23c5bea..6805079
--- a/contrib/src/live555/SHA512SUMS
+++ b/contrib/src/live555/SHA512SUMS
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+2694573c6f39e01f61c5d4c1764e74d0c8abfec47fceac9967acf035b6e7ef90ebfa3619c410d0bb742864bff49b14e443a43399a42d1085fbe8c1041aa4a6ae live.2013.12.05.tar.gz
++=======
+ d3506851058c79eac35a0682d3fb344da1d4f22456d7df2b775ca693d361124ea4f62973ae936596e25e26bc3e7a11ae6028975a2f9e86aececf6e1735db604c live.2012.12.18.tar.gz
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined contrib/src/live555/rules.mak
index 08b44ca,840f808..32659fa
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@@ -1,7 -1,7 +1,11 @@@
# live555
#LIVEDOTCOM_URL := http://live555.com/liveMedia/public/live555-latest.tar.gz
++<<<<<<< HEAD
+LIVE555_FILE := live.2013.12.05.tar.gz
++=======
+ LIVE555_FILE := live.2012.12.18.tar.gz
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
LIVEDOTCOM_URL := http://download.videolan.org/pub/contrib/live555/$(LIVE555_FILE)
PKGS += live555
diff --combined contrib/src/main.mak
index 9562165,4e568ec..7b05dd2
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@@ -397,9 -397,6 +397,12 @@@ ifdef HAVE_DARWIN_O
echo "set(CMAKE_LD_FLAGS $(LDFLAGS))" >> $@
ifdef HAVE_IOS
echo "set(CMAKE_AR ar CACHE FILEPATH "Archiver")" >> $@
++<<<<<<< HEAD
+ echo "set(CMAKE_OSX_SYSROOT $(IOS_SDK))" >> $@
+else
+ echo "set(CMAKE_OSX_SYSROOT $(MACOSX_SDK))" >> $@
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
endif
endif
ifdef HAVE_CROSS_COMPILE
diff --combined contrib/src/opus/SHA512SUMS
index ec92aed,8321732..3c4fbf4
--- a/contrib/src/opus/SHA512SUMS
+++ b/contrib/src/opus/SHA512SUMS
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+b603efe66d65ef38dbcd0d2bbf213a1d15fa456aee00eca73e99abe4ec78668ed82e661ca7a69e9af4e0bc39e1aa76c4151b7f9840ff621ddcfd69f596cf2ba9 opus-1.1.tar.gz
++=======
+ c31957a36200bfb0e2486ae54bd5139934d0a52ae4c1eabfd68a1bc47d244fc5c23612d85bde44e378011fee37a1eebb8af7579dac8be2b975cff956ff44990b opus-1.0.3.tar.gz
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined contrib/src/opus/rules.mak
index d783648,2f8a535..b5e006a
--- a/contrib/src/opus/rules.mak
+++ b/contrib/src/opus/rules.mak
@@@ -1,6 -1,6 +1,10 @@@
# opus
++<<<<<<< HEAD
+OPUS_VERSION := 1.1
++=======
+ OPUS_VERSION := 1.0.3
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
OPUS_URL := http://downloads.xiph.org/releases/opus/opus-$(OPUS_VERSION).tar.gz
diff --combined contrib/src/speex/rules.mak
index b13133f,974eac2..fa9d35f
--- a/contrib/src/speex/rules.mak
+++ b/contrib/src/speex/rules.mak
@@@ -3,9 -3,7 +3,13 @@@
#SPEEX_VERSION := 1.2rc1
#SPEEX_URL := http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
SPEEX_VERSION := git
++<<<<<<< HEAD
+SPEEX_HASH := a6d05eb
+#SPEEX_HASH := HEAD
+SPEEX_GITURL := http://git.xiph.org/?p=speex.git;a=snapshot;h=$(SPEEX_HASH);sf=tgz
++=======
+ SPEEX_GITURL := http://git.xiph.org/?p=speex.git;a=snapshot;h=HEAD;sf=tgz
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
PKGS += speex
ifeq ($(call need_pkg,"speex >= 1.0.5"),)
diff --combined debian/changelog
index fc73cbf,df850c1..2779705
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,7 +1,13 @@@
++<<<<<<< HEAD
+vlc (2.1.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release. (Closes: #731513)
++=======
+ vlc (2.1.1-2) UNRELEASED; urgency=medium
+
+ * Add ftbfs_freetype.patch to fix FTBFS with freetype 2.5.1.
+ (Closes: #731513)
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
* Bump Standards-Version to 3.9.5 (no changes needed).
-- Mateusz Åukasik <mati75 at linuxmint.pl> Fri, 06 Dec 2013 21:14:20 +0100
diff --combined debian/patches/series
index 420def5,da829bf..6dcd9df
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,2 +1,5 @@@
pnap-grammar.patch
++<<<<<<< HEAD
++=======
+ ftbfs_freetype.patch
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined doc/ChangeLog-2013
index 08758b6,9b9e430..396a4e1
--- a/doc/ChangeLog-2013
+++ b/doc/ChangeLog-2013
@@@ -1,1005 -1,3 +1,1008 @@@
++<<<<<<< HEAD
+commit a4c487694e5a0dc1bc0a5748cd04417452d05dd5
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Mon Dec 9 01:05:14 2013 +0100
+
+ Contribs: update libav and FFmpeg sha1
+
+commit 87b457f182e5fb4d2519ce12c62d4df8297e9882
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Sat Dec 7 10:41:39 2013 +0100
+
+ fluidsynth: fix linking on osx
+
+ (manual backport of 62f25ef1c0180f307a50837e12e5fab358e29275)
+
+ Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
+
+commit 16cfc9fdd6880cf99ee041a043eac568fc4ce90c
+Author: Rafaël Carré <funman at videolan.org>
+Date: Sat Dec 7 22:55:32 2013 +0100
+
+ contrib: speex: fix git hash
+
+ Use the revision just before libspeexdsp split
+
+ (cherry picked from commit 7d72f09c93805b1046343d04e5c8e23c8ecb1590)
+
+commit 5aebac3078b586fcd72ba17b01e934a45431370c
+Author: Michał Trzebiatowski <hippie_1968 at hotmail.com>
+Date: Sun Dec 8 19:37:35 2013 +0100
+
+ l10n: NSIS Polish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 6cd1fbf556bbb823982ca540ab1c4357577b4cd3
+Author: Michał Trzebiatowski <hippie_1968 at hotmail.com>
+Date: Sun Dec 8 19:35:35 2013 +0100
+
+ l10n: Polish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 06e72d17cb79a27e722524813d4ca2b28b15aec7
+Author: Christoph Miebach <christoph.miebach at web.de>
+Date: Sun Dec 8 12:10:31 2013 +0100
+
+ NEWS: Typos fixed
+
+commit 35c5354c363d30119edccb0c0d5d9d26b68fd753
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sun Dec 8 00:05:10 2013 +0100
+
+ NSIS: fix polish translation
+
+commit 96b97f38d3ef6a9c0dc8a70d54bab4217426aaff
+Author: Pierre Ynard <linkfanel at yahoo.fr>
+Date: Sat Dec 7 18:23:51 2013 +0100
+
+ youtube.lua: handle relative reference in javascript URL
+
+ (cherry picked from commit 87fcede4b4839ff99dbc52b71664d28c02eb381e)
+ Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>
+
+commit ffed71d77e83ec96ca48e5acbca86826849474c1
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat Dec 7 17:23:19 2013 +0100
+
+ Update NEWS for translations
+
+commit 99bd1da31a2b5fd03af28eb6c0bf8ba39d0c5400
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat Dec 7 17:21:57 2013 +0100
+
+ Update PO files
+
+commit e5f0508871792f65b3eff4fabf27f9cdf7ec5fd7
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat Dec 7 16:48:32 2013 +0100
+
+ Contribs: update fribidi to 0.19.6
+
+ (cherry picked from commit 5d73f3bef8bab3826e6b421f4aee2270cbdb1526)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit d4ef08d3a5327f07b0734e132d8d613bcf0369df
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat Dec 7 16:37:34 2013 +0100
+
+ Contribs: update live555
+
+ (cherry picked from commit ebc939efe12cd3eec0a09537058ae4cae31fcd3e)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit d8229faab669c4576fcc74a43b78ae3ae15f4a22
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat Dec 7 16:30:04 2013 +0100
+
+ Contribs: update GnuTLS to 3.1.17
+
+ (cherry picked from commit 708998c0e707c32b6c757f447318ab7dfd281067)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 922a854f4d1fffe236454c6a93d61f20ec5e8a41
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat Dec 7 16:19:22 2013 +0100
+
+ Contrib: upgrade Opus to 1.1
+
+ (cherry picked from commit 0d4a258136f34f59202c94129388f027ca560de1)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 5280d37fe2edcfc3402ef339457e3f959ff4a9db
+Author: Thomas De Rocker <thomasderocker at hotmail.com>
+Date: Sat Dec 7 16:46:37 2013 +0100
+
+ l10n: NSIS Dutch update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit a7170eee8648f9f02d7de22fe9203b83c599651d
+Author: Michał Trzebiatowski <hippie_1968 at hotmail.com>
+Date: Sat Dec 7 16:44:50 2013 +0100
+
+ l10n: NSIS Polish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 1f70a1d67dbf8ca616d40e1260a58f5a1058f60b
+Author: Christoph Miebach <christoph.miebach at web.de>
+Date: Sat Dec 7 16:37:59 2013 +0100
+
+ l10n: NSIS German update
+
+commit 440d8843dc8f3c797b7c3d4c6fe03f7506380962
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 15:50:32 2013 +0100
+
+ l10n: Thai update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 765ccdb381dd2270ad25c3c7de2f56b71e562a12
+Author: Umidjon Almasov <u.almasov at gmail.com>
+Date: Sat Dec 7 15:28:35 2013 +0100
+
+ l10n: Uzbek update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit ab767856ed2fc3af001f6a10babc39893fc7fcc4
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 15:20:16 2013 +0100
+
+ l10n: Tamil update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit aba2eb8fb65486011cc00eef3c86f0a02de52bda
+Author: A. Regnander <anton_r_3 at hotmail.com>
+Date: Sat Dec 7 15:13:13 2013 +0100
+
+ l10n: Swedish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 99b420ab5591ea53a33d070674201ca6dbdf1446
+Author: Martin Srebotnjak <miles at filmsi.net>
+Date: Sat Dec 7 15:10:16 2013 +0100
+
+ l10n: Slovenian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit cff4da6e30f98afd0835def1c6ad1b867477830b
+Author: Pasindu Kavinda <pkavinda at gmail.com>
+Date: Sat Dec 7 15:07:43 2013 +0100
+
+ l10n: Sinhala update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit f1c6dbb283d05b42ef5c8632821636ce5006ee2c
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 15:05:07 2013 +0100
+
+ l10n: Romanian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 4cc524cdc7493ed74b3318b604fe0047f1601e1a
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 14:12:44 2013 +0100
+
+ l10n: Polish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 9d5748fd048db734799f15596cd6ca0d16ae7660
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 14:10:05 2013 +0100
+
+ l10n: Occitan update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit ad2d7e9003f05e67b4133875f57b3d915ea252d6
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 13:56:33 2013 +0100
+
+ l10n: Lithuanian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 9c3beabcdf96dbe059e12e002fd4ae650f30b828
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 13:51:32 2013 +0100
+
+ l10n: Kannada update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 7c404fcf2559669b48bc5acd309c3630c97f6fcc
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 13:47:39 2013 +0100
+
+ l10n: Khmer update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 7b82e50fc9a444c740524c3672c9a4106b729179
+Author: Lorenzo Facca <lorenzo.facca at ovi.com>
+Date: Sat Dec 7 13:40:23 2013 +0100
+
+ l10n: Italian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 0d1f6456cf69ca0ff5ee437ef1664979f1c2d104
+Author: Sveinn à Felli <sveinki at nett.is>
+Date: Sat Dec 7 13:36:22 2013 +0100
+
+ l10n: Icelandic update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit b1a51b91fc5f4126dedc4e71f3c980f44b510ea2
+Author: Firdaus Simbolon <dausbajing at hotmail.co.id>
+Date: Sat Dec 7 13:35:25 2013 +0100
+
+ l10n: Indonesian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit e3348787e4822ff5923c61fd1c043e6498cad0ca
+Author: Gabor Kelemen <kelemeng at gnome dot hu>
+Date: Sat Dec 7 13:33:04 2013 +0100
+
+ l10n: Hungarian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 7cea8423a397aa6684828c79ca63207777e6305b
+Author: Michael Bauer <fios at akerbeltz.org>
+Date: Sat Dec 7 13:29:42 2013 +0100
+
+ l10n: Scottish Gaelic update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 6a974c59fd3dc97bd2f4cc693272ece39c544ec0
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 13:27:25 2013 +0100
+
+ l10n: French update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 7be4f0e11831b212bedae7ea865fec1e3f5f9020
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 13:23:35 2013 +0100
+
+ l10n: Persian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 4f6fa226d66edfeeb54572ce3fb7736d954c8239
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 13:21:33 2013 +0100
+
+ l10n: Basque update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 1bb6f7e64ba49cbebd9e5892d8322455e9afdaca
+Author: Ivar Smolin <okul at linux.ee>
+Date: Sat Dec 7 13:18:51 2013 +0100
+
+ l10n: Estonian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit db7f5f0a01c2289bfa2045c5d8b21bf849e68a12
+Author: David González <pico.dev at gmail.com>
+Date: Sat Dec 7 13:16:39 2013 +0100
+
+ l10n: Spanish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 6dd3fb3013ee4f5761ceb010b0b607f332d37909
+Author: Aputsiaĸ Niels Janussen <aj at isit.gl>
+Date: Sat Dec 7 13:07:26 2013 +0100
+
+ l10n: Danish update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit a689301996538d6df7639ecadfc462d375ad7dc1
+Author: Aled Powell <aled at aledpowell.com>
+Date: Sat Dec 7 13:06:17 2013 +0100
+
+ l10n: Welsh update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 156eff0edfa343db4a0c68af7e0c718d3429a507
+Author: Tomáš Chvátal <tomas.chvatal at gmail.com>
+Date: Sat Dec 7 13:02:14 2013 +0100
+
+ l10n: Czech update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 4643e3785f46d535ddfc80e0b05d5c2ccfc178f8
+Author: Adnan Memija <sream_92 at live.com>
+Date: Sat Dec 7 12:57:06 2013 +0100
+
+ l10n: Bosnian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 91bac1eeb1d945dd19b4b972442b0b791815a095
+Author: VideoLAN <videolan at videolan.org>
+Date: Sat Dec 7 12:54:31 2013 +0100
+
+ l10n: Bulgarian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit f84715094b4cd136598b5361091ca916881b663f
+Author: Dominko Aždajić <domazd at mail.ru>
+Date: Sat Dec 7 11:11:25 2013 +0100
+
+ l10n: Croatian update
+
+ Signed-off-by: Christoph Miebach <christoph.miebach at web.de>
+
+commit 5b976ed762e50c9e00d7c4e0ffbce653b8e0e346
+Author: Rémi Denis-Courmont <remi at remlab.net>
+Date: Fri Dec 6 15:09:01 2013 +0200
+
+ input: do not misinterpret attachment MRLs as file paths, fixes #10046
+
+ (cherry picked from commit e26b44bb61231f54f33700e17345475f06ca17f9)
+
+commit f2304f902add67a45a08988f4d4a5d3ff303b6fb
+Author: Rémi Denis-Courmont <remi at remlab.net>
+Date: Fri Dec 6 14:49:13 2013 +0200
+
+ input: off-by-three
+
+ (cherry picked from commit dab63843107615358e1dfba2211cfe1deb7967d4)
+
+commit 4eb6d91e94f720bf2dd22dcfee171e4ff4b790df
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Mon Dec 2 17:32:07 2013 +0100
+
+ Freetype: fix compilation with 2.5.1
+
+ Close #10019
+
+ (cherry picked from commit c5b2b0a284ba6b544646f3a205aa1a2e1117d431)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 9ebead9dfbdcac2da31bc856cec51c058f5ddca8
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Thu Dec 5 19:02:15 2013 +0100
+
+ Fix make dist
+
+commit ad561f706559e069b5ca2c5dbe1b78c708010bbd
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Thu Dec 5 18:49:11 2013 +0100
+
+ Update NEWS
+
+commit 2d955118db5445ae16e0ddffa1f2bee1d832b1d5
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Thu Dec 5 18:34:23 2013 +0100
+
+ mac packages: remove obsolete Delete Preferences.app
+
+ This application is incompatible with Mavericks, and it is superseded by the mechanisms provided
+ within the UI itself.
+
+ Also update the readme to reflect this change.
+
+ (cherry picked from commit 49419d7370436845191ba750ce762791a6dda0f7)
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 2147391ece792013d828d5d080e912b428e3af92
+Author: Andy Tather <andy at andytather.co.uk>
+Date: Thu Dec 5 18:33:26 2013 +0100
+
+ DirectSound: fix SPDIF
+
+ Close #9522
+
+ (cherry picked from commit 4f3bc33fee31bea49fd17306cc5201bb3eb2968a)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 2052b46a2dbeba97a2da1fe1b36060c173fa31ce
+Author: Andy Tather <andy at andytather.co.uk>
+Date: Thu Dec 5 18:32:38 2013 +0100
+
+ Waveout: Fix SPDIF output
+
+ Ref #9522
+
+ (cherry picked from commit 4fcfd8479f462ca964bdb061b55b0d4cdfb055b0)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 22dc2227f09e8f4c939013ff726d5d23968acd28
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Fri Nov 29 16:10:37 2013 +0100
+
+ nsis: simplify OS detection
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit f5f857545892f9e32b06e690447fead7d12493b8
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Fri Nov 29 12:56:43 2013 +0100
+
+ nsis: request admin execution level
+
+ The current state of our NSIS installer doesn't support per-user
+ installation and needs a major rework to do so, therefore the user
+ is required to have admin privileges to install VLC.
+
+ Still, RequestExecutionLevel was set to 'user' to be able to drop
+ privileges when launching vlc.exe at the end of the installation but
+ this was improved since (90496f23c2481bbaea21a586bc22631850751221) and
+ confirmed by the accesschk tool.
+
+ However requesting user execution level makes the unpacking occurs
+ twice: once with the user level and once after elevation.
+
+ Requesting admin permissions fixes the unpacking issue while still being
+ safe when launching VLC after the installation on XP and above.
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit 4e5135b3f335cc0e2dc8aa1ca238a72a91f36c20
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Thu Nov 28 13:45:31 2013 +0100
+
+ nsis: kill VLC before copying/updating any file
+
+ During silent installations (/S) the installer will automatically kill
+ (without warning) any running instance of VLC before copying files.
+
+ Silent updates should now work using the flags /S /update.
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit 8eb52019f5519e7e9b0f29fdbdecdf402b810b9e
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Thu Nov 28 13:45:02 2013 +0100
+
+ nsis: compile the nsProcess plugin
+
+ The plugin is a NSIS helper used to find and kill a running process. It
+ is licensed under the same terms as NSIS (zlib/libpng).
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit 0c18e4e628bb6c44a7e01da7f0e1eb76999c7071
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Wed Nov 20 16:54:55 2013 +0100
+
+ nsis: remove unused string
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit 6a10370dcb263665a2fde7ab99db20d93bc5c8a4
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Wed Nov 20 15:36:20 2013 +0100
+
+ nsis: remove dead uninstaller code
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit 45b4a74730e4512945d2cce90a07e3e59f31a402
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Wed Nov 20 15:30:26 2013 +0100
+
+ nsis: make new strings translatable
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit 74897938043f29ca01ed27504c30922d51b6fa6c
+Author: Ludovic Fauvet <etix at videolan.org>
+Date: Wed Nov 20 15:28:24 2013 +0100
+
+ nsis: sync wording with the uninstaller section
+
+ Signed-off-by: Ludovic Fauvet <etix at videolan.org>
+
+commit fb9a28f2bf30a0726d001c2d6430ca41a0730a75
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Mon Dec 2 18:06:46 2013 +0100
+
+ audio unit: fix init order
+
+ (cherry picked from commit d470a924f428a5d6ac40d56142f7d14919512471)
+
+commit f54e75a4d84809b954ec920a1aa74db215cc0bad
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Mon Dec 2 17:14:18 2013 +0100
+
+ audiounit: fix crash
+
+ (cherry picked from commit e426d8e52529904227d19b932b228b6c04c71acf)
+
+commit 1fd9c04bcb1ace7e6d583be9dc053798767a276f
+Author: Rémi Denis-Courmont <remi at remlab.net>
+Date: Mon Dec 2 18:04:19 2013 +0200
+
+ deinterlace: fix segmentation fault (fixes #9916)
+
+ (cherry picked from commit 9594f247286f36a45b81ba7cbd7273858e9f07ed)
+
+commit 50b8aa096e3e8065a78eadcdc9e2f4212e0f64dd
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sat Nov 30 20:05:58 2013 +0100
+
+ contrib: fix compilation of libraries for iOS which deploy cmake
+
+ (cherry picked from commit 215c6ac6f278860fdb4abc8fdc99226a7c7f895a)
+
+commit 6232a2199bb2fbf8eaed03cd0011da8688d52c1a
+Author: Maxim Bublis <b at codemonkey.ru>
+Date: Wed Nov 20 13:52:59 2013 +0400
+
+ Fixed warning on incompatible pointer types
+
+ Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
+ (cherry picked from commit bcd00e3be19095558de9d76f2d9aac38bfbd7c94)
+
+commit 7cc64bcacaa6b07b21aea0ae08a28f8ef13f1144
+Author: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Fri Nov 29 10:28:14 2013 +0100
+
+ Qt: fix profiles with vcodec=copy (fix #9342, fix #9485)
+
+ (cherry picked from commit 7ca3f99c1efc986f99dcae91f942bd81f5084e8f)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 6430d7d3dcceda96f5144182f3b97cdd7ef819eb
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Fri Nov 29 12:18:33 2013 +0100
+
+ Contribs: update live555 for security issues
+
+ (cherry picked from commit 537acc94690be49b2858ca90c46bc5fa1a7d2795)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 9138901bc8e0efb2caac1dad17e5b67cde59a923
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Thu Nov 28 18:19:16 2013 +0100
+
+ Update NEWS
+
+commit 527786397c63977b232ebef6828bdc21066cae03
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Thu Nov 28 18:12:01 2013 +0100
+
+ audiounit_ios: merge playback performance improvements from the Mac auhal module
+
+ (cherry picked from commit cb475372d0643ef60e05c8c3ee0cbddc120cf315)
+
+commit 18af443ebc9e5dd6db679120060b82b732957e43
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Wed Aug 21 19:42:41 2013 +0200
+
+ auhal: limit scope of mutex
+
+ This should suffice as the variable is only modified on this thread.
+ Avoids deadlock in refs #9141
+
+ (cherry picked from commit b2823701b6123b5cb1f862dec7f5a62a9d77d17f)
+ Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
+
+commit ec71474ff2affbdd2b15c204657994db56132dba
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Mon Nov 25 19:48:40 2013 +0100
+
+ auhal: fix crash on error paths for stream format change
+
+ ref #9957
+
+ (cherry picked from commit eb72c5a30544b2c12f16200b11b79e5774849db3)
+ Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
+
+commit e4633a2c3ce5a75cc27155a57f67d9c2022ca61f
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Wed Nov 27 16:29:50 2013 +0100
+
+ auhal: implement pause by output silence instead of stopping output
+
+ Stopping and restarting the audio unit or device might take a
+ considerable amount of time. This leads to flushes, and
+ the user notice a delay for resuming audio.
+
+ Auhal does not have a better API for pause, so lets only play silence
+ for now. This fixes resume delays with analog mode, and might improve
+ delays for digital mode (through they are still occuring from
+ time to time here).
+
+ close #9536
+
+ (cherry picked from commit 16fce2346d08569348a74a1ff0ea133d0015656b)
+ Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
+
+commit 06631f06f0c78b8ee12e93f6f36c75e0e0334c7e
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Tue Nov 26 19:40:09 2013 +0100
+
+ auhal: do not stop and restart audio unit on flush
+
+ This is a manual revert of 878169fe, which is not needed anymore.
+ Additionally, it fixes blayback with devices which are not fast
+ enough for starting up.
+
+ close #9886
+
+ (cherry picked from commit 1f46c35a5aa44fd1c32b49c65500e37d795f1a91)
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 55fe270c8a53e0e97e4f0f7c54f9223955bc9e27
+Author: Rafaël Carré <funman at videolan.org>
+Date: Mon Nov 18 13:39:27 2013 +0100
+
+ UAC: offsetof only needs to know the field name
+
+ Don't specify the (variable) size
+
+ (cherry picked from commit ffff393ec1421aa7ff00cb5fb024d6fbee931fd4)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 50757f6ad12da09746b12ee0008139b853ff5e68
+Author: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Mon Nov 25 13:41:58 2013 +0100
+
+ Qt: InputManager: don't enforce lower bound after a seek
+
+ Should fix problems like #2243.
+ After a seek, the updated position could be the keyframe position
+ choosen by demux, and then lower than A.
+
+ (cherry picked from commit 9baab2bdeb1667061b98399b407b7434f0dbb36e)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 1f6dcc728faf40cac1f41d1846af5e3279de5e02
+Author: Rémi Duraffort <ivoire at videolan.org>
+Date: Mon Nov 25 19:33:11 2013 +0100
+
+ freetype: fix potential memory leak (cid #1048945)
+
+ (cherry picked from commit 687a362c7648d6a4372b3205d099b5d2e879ef7f)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 366019d8cca6749af98467c0fc3c9610df624f8c
+Author: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Mon Nov 25 18:13:09 2013 +0100
+
+ demux: asf: enforce root object boundary (fix #9441)
+
+ Seems some encoder reuses previous memory area for junk sections.
+
+ (cherry picked from commit 2ca8c9db8064dcb8b9c683ec9b160464f6f3580e)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit eedd67057b6808f4d182abb35ad441fc4c47ba3d
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Mon Nov 25 17:38:01 2013 +0100
+
+ macosx: fix issue which caused automatic video resizing even if disabled
+
+ close #9864
+
+ (cherry picked from commit b82bc83428aa33f2b5af2b4201f0926d2ebfe4ba)
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 7c87233f87d06ac329e55a3800ff5e07056a8ce4
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Mon Nov 25 17:36:27 2013 +0100
+
+ macosx: fix crash when closing video window without decorations
+
+ (cherry picked from commit ee3e5d56ec9816c3728706b3618686790fb0892d)
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit ae82a0b8f9f3118b710dccc7dab9b650f3f1a981
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sun Nov 24 20:56:53 2013 +0100
+
+ macosx: fix subtitles opening for the applescript bindings
+
+ (cherry picked from commit e374892046ecc55f510e0595e472a5251ac957e4)
+
+commit 628a8e751a15ac3becbaa7f15646c0d2a01ebcce
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sun Nov 24 20:56:36 2013 +0100
+
+ macosx: fix drag & drop / double-clicks in Finder to open subtitles files (close #9953)
+
+ (cherry picked from commit 2604049f04c78e0b586d04f780f01d728feb0618)
+
+commit 36c6ddd848ee43bb58bf67dbbbcc8648d44d1475
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sun Nov 24 20:35:05 2013 +0100
+
+ darwinvlc: fix automatic language selection (close #9914)
+
+ (cherry picked from commit c6e4493dcdab713bc70d0efb2154d08dce57cde1)
+
+commit bc60abcfc2d344b9aafce156127bf84cb207db80
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Sun Nov 24 20:22:11 2013 +0100
+
+ macosx: show 'pause iTunes' option in a more accessible place since it is being asked for a lot (close #9954)
+
+ (cherry picked from commit 325764ecd99ca4131cffbfcc6b594f7bc42a2de8)
+
+commit e4417b49627c3ffe96d8d9b9efa29091986ca5b6
+Author: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Fri Nov 22 17:11:25 2013 +0100
+
+ demux: asf: reject DRM'ed files
+
+ Keep #8241 open ???
+
+ (cherry picked from commit 23445cd543c69113f4f82bce7362d6fc20cc0bfa)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 66fbea9be4fc842a77291021c96f8c581ced826d
+Author: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Fri Nov 22 13:33:04 2013 +0100
+
+ demux: asf: preroll to seek time from index keyframes (fix #7890)
+
+ (cherry picked from commit 58c8f9f3cef168df4adfe5e1ca14cc745f4ba7fc)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit c116087d48daf80f37646e84077e55e53c4b4c87
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Fri Nov 22 22:26:49 2013 +0100
+
+ Update NEWS
+
+commit e01dd3cbe127c7fc5703eaef83f0f0a44793365d
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Fri Nov 22 21:36:32 2013 +0100
+
+ Update NEWS
+
+commit cc6e30124319a7c59adab28ac442e4fc143d5054
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Fri Nov 22 18:49:42 2013 +0100
+
+ auhal: use own thread for notification loop
+ (cherry picked from commit 626174f3b9d86559db9c66ede56abd15a3d7ea5e)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit d0cb844ec7a5c0eee607e9897421bde408352bc2
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Fri Nov 22 18:40:11 2013 +0100
+
+ auhal: ignore changed default device in digital mode
+
+ This fixes nonfunctional playback when more than one audio device
+ is installed.
+
+ close #9924
+ (cherry picked from commit 2f5891bd44f9a5bffcb4d8a2bd918d0787f53c6f)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 22f80f041ce576696f9ca31621cec9753effd69a
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Fri Nov 22 18:39:23 2013 +0100
+
+ auhal: fix comments
+ (cherry picked from commit 8b6eec54693d35f8f1b7dfa3f659c0b92ac97944)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 03612f91083033ecb0be6c218a673457288859b8
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Thu Nov 21 11:00:38 2013 +0100
+
+ macosx: fix preferences reset if unknown version was found
+ (cherry picked from commit a87c668eaf2788a454f22a18b5dbd66f8750cd9d)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 066ed4232f258dbea6cff88df048aa88d6a565a8
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Thu Nov 21 10:59:02 2013 +0100
+
+ macosx: fix selection of playlist item for very first start
+ (cherry picked from commit dd4fe6748489ff37ac0847a5baf9db6db21e3419)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 9a315ff20df7a0f96d92f99783aafce48a7e9593
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Thu Nov 21 01:58:56 2013 +0100
+
+ macosx: correctly reset interface preferences when requested
+ (cherry picked from commit f88d16b248d051d1366d4097df97ee00a1129997)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 5add3e9ddd94d97de25fd2c9c57c708ccb251c54
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Wed Nov 20 19:35:50 2013 +0100
+
+ macosx: change alignment of dropzone-box yet again
+
+ (not cherry-picked from commit 6ea4d015ffcad76ae5d0262d668ec92ff6e42136)
+
+commit 286c2d93dad465ceabcaa4b8d24474d360d5b04c
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Tue Nov 19 21:13:13 2013 +0100
+
+ macosx: refinements of minimized view behaviour
+
+ - Fix wrong playlist resize
+ - Minimize view state is now retained from start up to stop of video.
+ Using the playlist button will result in the playlist to show up, but it
+ will be always hidden when video finally stops.
+ - Minimize view state is exited when the user uses alt to go back to normal view.
+
+ close #9722
+ (cherry picked from commit 655dacc5e1cd7c9f1d347a7344ccb8d3734a7353)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 0278721d2b19162362c4b0275dbc9c2897e31a45
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Mon Nov 18 18:26:27 2013 +0100
+
+ Do not put the extensions twice
+
+ (cherry picked from commit 5dee34ad0318ec7daf8f1024d52a687b7b45b4b2)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 3649f9e93b644796fbcf562a71fc2dca6b2d9357
+Author: Rafaël Carré <funman at videolan.org>
+Date: Mon Nov 18 20:00:48 2013 +0100
+
+ lpcm bd: fix decoding of 16 bits with channels padding
+
+ swab prototype is not the same as memcpy (src and dst are swapped)
+
+ (cherry picked from commit 7dcd1665a2d127a8573e29832fce1b1d88836643)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 4479d65110b00ecb36b8637d6d3721e0536cd6c8
+Author: Pierre Ynard <linkfanel at yahoo.fr>
+Date: Tue Nov 19 01:57:01 2013 +0100
+
+ vimeo.lua: rewrite due to website changes
+
+ The config is not available within the page anymore, we have to call an
+ API URL to fetch it
+
+ (cherry picked from commit d7e042e81aac6854cfe06aab11137e2385bec470)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit fc50621f0bcc4e1bfda47f00126bced78132151e
+Author: Pierre Ynard <linkfanel at yahoo.fr>
+Date: Mon Nov 18 22:27:06 2013 +0100
+
+ dailymotion.lua: fix page parsing
+
+ (cherry picked from commit 2fe62d4008bef9698641a5453dea70db80a8803f)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit b89c7bd8b0e6a0a638e3955ac7ba37d923161258
+Author: Felix Paul Kühne <fkuehne at videolan.org>
+Date: Tue Nov 19 16:55:17 2013 +0100
+
+ extras/ios: enable gnutls
+
+ (cherry picked from commit f95987341838fb563e6b1b68ee80588b44b31e63)
+
+commit 2f0a7f2cc5ade49e1fe79fbdfebbc0c822c8f785
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Mon Nov 18 19:47:31 2013 +0100
+
+ Qt: correctly update the art URL
+
+ (cherry picked from commit 7fc3ea2fb9c699966a58b4b4392a4f0a1fe0aeff)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 13bd019795c5f439af868ec914e0080d9fbcc827
+Author: Rafaël Carré <funman at videolan.org>
+Date: Mon Nov 18 19:26:39 2013 +0100
+
+ LPCM: fix 20/24-bit decoding
+
+ Fixes: #9907
+ (cherry picked from commit 68ca8d0b779ee20580230289d890b5b6b671abe0)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit edae24720de0999722731711263becda9f832536
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Sun Nov 17 18:21:37 2013 +0100
+
+ macosx: unify functionality of fwd/bwd buttons in video window
+
+ Behaviour is now the same as the buttons in main window
+
+ close #9512
+ (cherry picked from commit 941cff445097b422455c333af47230b8dfe93283)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit 78cb619963134753cbfa655d135e811db2166d03
+Author: Rafaël Carré <funman at videolan.org>
+Date: Fri Nov 15 15:25:48 2013 +0100
+
+ Revert "flac packetizer: use the largest possible frame size"
+
+ This reverts commit 03e0644c82bf1dea96f8ade8829c2e1f360bd1ee.
+
+ Decoder needs single frames
+
+ Closes #9863
+
+ (cherry picked from commit a5a87c3c662a3f733d1b7a49b8cf5c5f595aed41)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit eb3a5c57f829ada48afceb9fdc6238049f748a23
+Author: Denis Charmet <typx at dinauz.org>
+Date: Sun Nov 17 16:15:23 2013 +0100
+
+ Increase dpb size for HEVC
+
+ (cherry picked from commit 89f67375ed4d791d34f2b4d25162e684c109d338)
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+commit 28f171e9d1ae871b7f0f42cc1ca4889978a1897b
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Fri Nov 15 18:04:25 2013 +0100
+
+ NEWS: mention video filter fix
+
+commit ee5ba3c10e7142edba14388899c6d795bc4f0493
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Thu Nov 14 13:14:07 2013 +0100
+
+ macosx: remove unneeded free
+ (cherry picked from commit 09e1913c5390c6f971094fb4af78a89486fd1d25)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit d0aeca74e3fb5802cefc39dd09cb52f061d7213a
+Author: David Fuhrmann <david.fuhrmann at googlemail.com>
+Date: Thu Nov 14 13:11:29 2013 +0100
+
+ macosx: fix use after free for video effects string
+
+ This bug resulted in failure of setting more than one video effect
+ filter on mavericks.
+
+ close #9849
+ (cherry picked from commit 31b1205fd622eef0be3379f602cf83807c3c2124)
+
+ Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>
+
+commit aa5d0d556fc8f0e77cd21e057159e757fcd1fe42
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Tue Nov 12 01:19:44 2013 +0100
+
+ On the road to 2.1.2
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
commit 89db9aaf53cdf86aefc76088b171f13307a81a7b
Author: Jean-Baptiste Kempf <jb at videolan.org>
Date: Mon Nov 11 19:14:48 2013 +0100
@@@ -20972,37 -19970,3 +20975,40 @@@ Author: Rafaël Carré <funman at videolan
Date: Tue Jan 1 20:18:09 2013 +0100
Happy new year 2013
++<<<<<<< HEAD
+
+commit 10af2bf60149ab5ae08cb82d4fadfbb7b65897c4
+Author: Timo Rothenpieler <timo at rothenpieler.org>
+Date: Tue Jan 1 18:23:00 2013 +0100
+
+ vaapi: Use vaDeriveImage instead of vaGetImage if available
+
+ Signed-off-by: Rafaël Carré <funman at videolan.org>
+
+commit 10d7463d9b9f664f7ccffd77da583db4304653d0
+Author: Rafaël Carré <funman at videolan.org>
+Date: Tue Jan 1 18:04:54 2013 +0100
+
+ oldrc: fix segfault
+
+commit d750f80cdbdb70723d3dba4cd7ce747c70f5f457
+Author: Nil Geiswiller <ngeiswei at googlemail.com>
+Date: Sat Dec 29 00:13:40 2012 +0100
+
+ Add Mute shortcut to nvlc
+
+ I added the shortcut 'm' in nvlc for toggle mute. The volume status is
+ replaced my 'Mute' when enabled.
+
+ I also remapped the shortcut of metadata box from 'm' to 'M', I think
+ it follows the principle of least surprise.
+
+ Signed-off-by: Rafaël Carré <funman at videolan.org>
+
+commit 7939c3e5258149392e14f410497a2d437f21a26b
+Author: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Tue Jan 1 15:16:27 2013 +0100
+
+ Qt: Compressor/Spatializer: missing signal routing
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined extras/package/ios/build.sh
index 949f53d,e9a818a..25aedc8
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@@ -131,8 -131,6 +131,11 @@@ export CXX="xcrun clang++
export LD="xcrun ld"
export STRIP="xcrun strip"
++<<<<<<< HEAD
+export PLATFORM=$PLATFORM
+export SDK_VERSION=$SDK_VERSION
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if [ "$PLATFORM" = "OS" ]; then
export CFLAGS="-isysroot ${SDKROOT} -arch ${ARCH} -mcpu=cortex-a8 -miphoneos-version-min=${SDK_MIN} ${OPTIM}"
@@@ -201,7 -199,7 +204,11 @@@ f
--disable-samplerate \
--disable-goom \
--disable-vncserver \
++<<<<<<< HEAD
+ --enable-gnutls \
++=======
+ --disable-gnutls \
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
--disable-orc \
--disable-schroedinger \
--disable-libmpeg2 \
diff --combined extras/package/macosx/README.MacOSX.rtf
index 5ea1a4c,6d1ee30..724463b
--- a/extras/package/macosx/README.MacOSX.rtf
+++ b/extras/package/macosx/README.MacOSX.rtf
@@@ -1,5 -1,5 +1,10 @@@
++<<<<<<< HEAD
+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 Courier;}
++=======
+ {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf320
+ {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 Courier;}
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
{\colortbl;\red255\green255\blue255;}
\paperw12240\paperh15840\vieww16720\viewh13620\viewkind0
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
@@@ -159,10 -159,10 +164,18 @@@ An editable wiki is available at \ul ht
\b \cf0 \ul 14. VLC does not start anymore or does strange things \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
++<<<<<<< HEAD
+\b0 \cf0 \ulnone Delete your preferences and try again. You can use the button "Reset All" in the Preferences window to do that. If VLC does not start anymore or you want to do it by hand, first execute the following command in Terminal: "defaults delete org.videolan.vlc". Then delete all files and folders starting with "org.videolan.vlc" in ~/Library/Preferences (your personal preferences-folder inside the library of your HOME). If this does not help, see 13.\
++=======
+ \b0 \cf0 \ulnone Delete your preferences and try again. You can use the script "Delete Preferences.app" on the disk-image to do that. If you want to do it by hand, delete "org.videolan.vlc.plist" and a folder called "org.videolan.vlc" in ~/Library/Preferences (your personal preferences-folder inside the library of your HOME). If this does not help, see 13.\
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
\
\
For additional information and support, please see: \ul http://www.videolan.org/support\ulnone \
-- \
Derk-Jan Hartman & Felix Paul K\'fchne for the VideoLAN team.\
- }
++<<<<<<< HEAD
+ }
++=======
++}
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined extras/package/macosx/Resources/English.lproj/MainMenu.xib
index 9c133df,5c064c7..d9bce77
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
@@@ -2,9 -2,9 +2,15 @@@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
++<<<<<<< HEAD
+ <string key="IBDocument.SystemVersion">12F45</string>
+ <string key="IBDocument.InterfaceBuilderVersion">851</string>
+ <string key="IBDocument.AppKitVersion">1187.40</string>
++=======
+ <string key="IBDocument.SystemVersion">12F37</string>
+ <string key="IBDocument.InterfaceBuilderVersion">851</string>
+ <string key="IBDocument.AppKitVersion">1187.39</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool>
@@@ -21,13 -21,12 +27,22 @@@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
++<<<<<<< HEAD
+ <integer value="2461"/>
+ <integer value="2730"/>
+ <integer value="4850"/>
+ <integer value="21"/>
+ <integer value="29"/>
+ <integer value="5260"/>
+ <integer value="4722"/>
++=======
+ <integer value="4850"/>
+ <integer value="2730"/>
+ <integer value="2461"/>
+ <integer value="29"/>
+ <integer value="5260"/>
+ <integer value="21"/>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@@ -4586,13 -4585,13 +4601,21 @@@ LCAuLi4</string
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="256817023">
++<<<<<<< HEAD
+ <reference key="NSNextResponder"/>
++=======
+ <nil key="NSNextResponder"/>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSBox" id="83235998">
<reference key="NSNextResponder" ref="256817023"/>
++<<<<<<< HEAD
+ <int key="NSvFlags">45</int>
++=======
+ <int key="NSvFlags">42</int>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSView" id="457727486">
@@@ -4736,7 -4735,6 +4759,10 @@@
</object>
</object>
<string key="NSFrameSize">{402, 252}</string>
++<<<<<<< HEAD
+ <reference key="NSSuperview"/>
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<object class="CIDarkenBlendMode" key="NSViewCompositeFilter">
<bool key="CIEnabled">YES</bool>
</object>
diff --combined extras/package/macosx/Resources/English.lproj/Preferences.xib
index 56ae556,0080c53..90983b2
--- a/extras/package/macosx/Resources/English.lproj/Preferences.xib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.xib
@@@ -12,8 -12,8 +12,13 @@@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
++<<<<<<< HEAD
+ <integer value="2265"/>
+ <integer value="2562"/>
++=======
+ <integer value="2562"/>
+ <integer value="2265"/>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<integer value="2311"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
@@@ -515,17 -515,17 +520,31 @@@
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
++<<<<<<< HEAD
+ <object class="NSPopUpButton" id="979338837">
+ <reference key="NSNextResponder" ref="1006472879"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{260, 199}, {293, 26}}</string>
+ <reference key="NSSuperview" ref="1006472879"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSPopUpButtonCell" key="NSCell" id="47988377">
+ <int key="NSCellFlags">-2076180416</int>
+ <int key="NSCellFlags2">2048</int>
+ <reference key="NSSupport" ref="96267115"/>
+ <reference key="NSControlView" ref="979338837"/>
++=======
+ <object class="NSPopUpButton" id="222815804">
+ <reference key="NSNextResponder" ref="1006472879"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{260, 477}, {293, 26}}</string>
+ <reference key="NSSuperview" ref="1006472879"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSPopUpButtonCell" key="NSCell" id="532774506">
+ <int key="NSCellFlags">-2076180416</int>
+ <int key="NSCellFlags2">2048</int>
+ <reference key="NSSupport" ref="96267115"/>
+ <reference key="NSControlView" ref="222815804"/>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<int key="NSButtonFlags">109199360</int>
<int key="NSButtonFlags2">1</int>
<object class="NSFont" key="NSAlternateImage" id="104387842">
@@@ -541,61 -541,6 +560,64 @@@
<int key="NSPeriodicInterval">75</int>
<nil key="NSMenuItem"/>
<bool key="NSMenuItemRespectAlignment">YES</bool>
++<<<<<<< HEAD
+ <object class="NSMenu" key="NSMenu" id="632050075">
+ <object class="NSMutableString" key="NSTitle">
+ <characters key="NS.bytes">OtherViews</characters>
+ </object>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <int key="NSSelectedIndex">-1</int>
+ <int key="NSPreferredEdge">3</int>
+ <bool key="NSUsesItemFromMenu">YES</bool>
+ <bool key="NSAltersState">YES</bool>
+ <int key="NSArrowPosition">1</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSTextField" id="417355483">
+ <reference key="NSNextResponder" ref="1006472879"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{17, 205}, {241, 17}}</string>
+ <reference key="NSSuperview" ref="1006472879"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="289059696">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">272629760</int>
+ <string key="NSContents">Pause iTunes</string>
+ <reference key="NSSupport" ref="96267115"/>
+ <reference key="NSControlView" ref="417355483"/>
+ <reference key="NSBackgroundColor" ref="535468639"/>
+ <reference key="NSTextColor" ref="499525791"/>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSPopUpButton" id="222815804">
+ <reference key="NSNextResponder" ref="1006472879"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{260, 500}, {293, 26}}</string>
+ <reference key="NSSuperview" ref="1006472879"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSPopUpButtonCell" key="NSCell" id="532774506">
+ <int key="NSCellFlags">-2076180416</int>
+ <int key="NSCellFlags2">2048</int>
+ <reference key="NSSupport" ref="96267115"/>
+ <reference key="NSControlView" ref="222815804"/>
+ <int key="NSButtonFlags">109199360</int>
+ <int key="NSButtonFlags2">1</int>
+ <reference key="NSAlternateImage" ref="104387842"/>
+ <string key="NSAlternateContents"/>
+ <object class="NSMutableString" key="NSKeyEquivalent">
+ <characters key="NS.bytes"/>
+ </object>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ <nil key="NSMenuItem"/>
+ <bool key="NSMenuItemRespectAlignment">YES</bool>
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<object class="NSMenu" key="NSMenu" id="419585955">
<object class="NSMutableString" key="NSTitle">
<characters key="NS.bytes">OtherViews</characters>
@@@ -694,7 -639,7 +716,11 @@@
<object class="NSMatrix" id="189193142">
<reference key="NSNextResponder" ref="1006472879"/>
<int key="NSvFlags">268</int>
++<<<<<<< HEAD
+ <string key="NSFrame">{{262, 476}, {288, 18}}</string>
++=======
+ <string key="NSFrame">{{262, 453}, {288, 18}}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<reference key="NSSuperview" ref="1006472879"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@@ -800,7 -745,7 +826,11 @@@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAA
<object class="NSTextField" id="91636812">
<reference key="NSNextResponder" ref="1006472879"/>
<int key="NSvFlags">256</int>
++<<<<<<< HEAD
+ <string key="NSFrame">{{17, 506}, {241, 17}}</string>
++=======
+ <string key="NSFrame">{{17, 483}, {241, 17}}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<reference key="NSSuperview" ref="1006472879"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="868079086">
@@@ -817,7 -762,7 +847,11 @@@
<object class="NSTextField" id="878046419">
<reference key="NSNextResponder" ref="1006472879"/>
<int key="NSvFlags">256</int>
++<<<<<<< HEAD
+ <string key="NSFrame">{{17, 477}, {114, 17}}</string>
++=======
+ <string key="NSFrame">{{17, 454}, {114, 17}}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<reference key="NSSuperview" ref="1006472879"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="735985578">
@@@ -1016,7 -961,7 +1050,11 @@@
<object class="NSButton" id="89380742">
<reference key="NSNextResponder" ref="1006472879"/>
<int key="NSvFlags">256</int>
++<<<<<<< HEAD
+ <string key="NSFrame">{{18, 419}, {534, 18}}</string>
++=======
+ <string key="NSFrame">{{18, 396}, {534, 18}}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<reference key="NSSuperview" ref="1006472879"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="692113832">
@@@ -1039,7 -984,7 +1077,11 @@@
<object class="NSButton" id="847215559">
<reference key="NSNextResponder" ref="1006472879"/>
<int key="NSvFlags">256</int>
++<<<<<<< HEAD
+ <string key="NSFrame">{{18, 447}, {352, 18}}</string>
++=======
+ <string key="NSFrame">{{18, 424}, {352, 18}}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<reference key="NSSuperview" ref="1006472879"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="116125620">
@@@ -1062,7 -1007,7 +1104,11 @@@
<object class="NSButton" id="339525332">
<reference key="NSNextResponder" ref="1006472879"/>
<int key="NSvFlags">256</int>
++<<<<<<< HEAD
+ <string key="NSFrame">{{18, 392}, {534, 18}}</string>
++=======
+ <string key="NSFrame">{{18, 369}, {534, 18}}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<reference key="NSSuperview" ref="1006472879"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="299796287">
@@@ -1085,7 -1030,7 +1131,11 @@@
<object class="NSButton" id="394303792">
<reference key="NSNextResponder" ref="1006472879"/>
<int key="NSvFlags">256</int>
++<<<<<<< HEAD
+ <string key="NSFrame">{{18, 365}, {534, 18}}</string>
++=======
+ <string key="NSFrame">{{18, 342}, {534, 18}}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<reference key="NSSuperview" ref="1006472879"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="894868854">
@@@ -1108,7 -1053,7 +1158,11 @@@
<object class="NSButton" id="991426321">
<reference key="NSNextResponder" ref="1006472879"/>
<int key="NSvFlags">256</int>
++<<<<<<< HEAD
+ <string key="NSFrame">{{18, 312}, {534, 18}}</string>
++=======
+ <string key="NSFrame">{{18, 289}, {534, 18}}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<reference key="NSSuperview" ref="1006472879"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="778050649">
@@@ -1131,7 -1076,7 +1185,11 @@@
<object class="NSButton" id="492678965">
<reference key="NSNextResponder" ref="1006472879"/>
<int key="NSvFlags">256</int>
++<<<<<<< HEAD
+ <string key="NSFrame">{{18, 338}, {534, 18}}</string>
++=======
+ <string key="NSFrame">{{18, 315}, {534, 18}}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<reference key="NSSuperview" ref="1006472879"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="388733438">
@@@ -1154,7 -1099,7 +1212,11 @@@
<object class="NSButton" id="11476711">
<reference key="NSNextResponder" ref="1006472879"/>
<int key="NSvFlags">256</int>
++<<<<<<< HEAD
+ <string key="NSFrame">{{18, 229}, {534, 18}}</string>
++=======
+ <string key="NSFrame">{{18, 206}, {534, 18}}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<reference key="NSSuperview" ref="1006472879"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="77005746">
@@@ -1177,7 -1122,7 +1239,11 @@@
<object class="NSButton" id="739265565">
<reference key="NSNextResponder" ref="1006472879"/>
<int key="NSvFlags">256</int>
++<<<<<<< HEAD
+ <string key="NSFrame">{{18, 257}, {534, 18}}</string>
++=======
+ <string key="NSFrame">{{18, 234}, {534, 18}}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<reference key="NSSuperview" ref="1006472879"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="117524322">
@@@ -1200,7 -1145,7 +1266,11 @@@
<object class="NSButton" id="466212214">
<reference key="NSNextResponder" ref="1006472879"/>
<int key="NSvFlags">256</int>
++<<<<<<< HEAD
+ <string key="NSFrame">{{18, 284}, {534, 18}}</string>
++=======
+ <string key="NSFrame">{{18, 261}, {534, 18}}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<reference key="NSSuperview" ref="1006472879"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1052320542">
@@@ -1221,7 -1166,7 +1291,11 @@@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</object>
++<<<<<<< HEAD
+ <string key="NSFrameSize">{570, 544}</string>
++=======
+ <string key="NSFrameSize">{570, 521}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<reference key="NSSuperview"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
@@@ -7660,30 -7605,6 +7734,33 @@@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAA
</object>
<int key="connectionID">3909</int>
</object>
++<<<<<<< HEAD
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">interfaceSettingChanged:</string>
+ <reference key="source" ref="150917409"/>
+ <reference key="destination" ref="979338837"/>
+ </object>
+ <int key="connectionID">3915</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">o_intf_pauseitunes_lbl</string>
+ <reference key="source" ref="150917409"/>
+ <reference key="destination" ref="417355483"/>
+ </object>
+ <int key="connectionID">3917</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">o_intf_pauseitunes_pop</string>
+ <reference key="source" ref="150917409"/>
+ <reference key="destination" ref="979338837"/>
+ </object>
+ <int key="connectionID">3918</int>
+ </object>
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@@ -7861,14 -7782,12 +7938,23 @@@
<reference ref="339525332"/>
<reference ref="847215559"/>
<reference ref="89380742"/>
++<<<<<<< HEAD
+ <reference ref="878046419"/>
+ <reference ref="91636812"/>
+ <reference ref="189193142"/>
+ <reference ref="222815804"/>
+ <reference ref="417355483"/>
+ <reference ref="979338837"/>
+ <reference ref="698552329"/>
+ <reference ref="117885045"/>
++=======
+ <reference ref="698552329"/>
+ <reference ref="878046419"/>
+ <reference ref="91636812"/>
+ <reference ref="189193142"/>
+ <reference ref="117885045"/>
+ <reference ref="222815804"/>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
</object>
<reference key="parent" ref="0"/>
<string key="objectName">Interface</string>
@@@ -10906,43 -10825,6 +10992,46 @@@
</object>
<reference key="parent" ref="532774506"/>
</object>
++<<<<<<< HEAD
+ <object class="IBObjectRecord">
+ <int key="objectID">3910</int>
+ <reference key="object" ref="417355483"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="289059696"/>
+ </object>
+ <reference key="parent" ref="1006472879"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">3911</int>
+ <reference key="object" ref="979338837"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="47988377"/>
+ </object>
+ <reference key="parent" ref="1006472879"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">3912</int>
+ <reference key="object" ref="47988377"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="632050075"/>
+ </object>
+ <reference key="parent" ref="979338837"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">3913</int>
+ <reference key="object" ref="632050075"/>
+ <reference key="parent" ref="47988377"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">3914</int>
+ <reference key="object" ref="289059696"/>
+ <reference key="parent" ref="417355483"/>
+ </object>
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@@ -11707,17 -11589,6 +11796,20 @@@
<string>3902.IBEditorWindowLastContentRect</string>
<string>3902.IBPluginDependency</string>
<string>3902.ImportedFromIB2</string>
++<<<<<<< HEAD
+ <string>3910.IBPluginDependency</string>
+ <string>3910.IBViewBoundsToFrameTransform</string>
+ <string>3910.ImportedFromIB2</string>
+ <string>3911.IBPluginDependency</string>
+ <string>3911.IBViewBoundsToFrameTransform</string>
+ <string>3911.ImportedFromIB2</string>
+ <string>3912.IBPluginDependency</string>
+ <string>3913.IBEditorWindowLastContentRect</string>
+ <string>3913.IBPluginDependency</string>
+ <string>3913.ImportedFromIB2</string>
+ <string>3914.IBPluginDependency</string>
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@@ -11767,7 -11638,7 +11859,11 @@@
<bytes key="NSTransformStruct">P4AAAL+AAABDSAAAwiwAAA</bytes>
</object>
<boolean value="YES"/>
++<<<<<<< HEAD
+ <string>{{231, 212}, {570, 544}}</string>
++=======
+ <string>{{474, 235}, {570, 521}}</string>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform"/>
<boolean value="YES"/>
@@@ -12666,34 -12537,19 +12762,45 @@@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
++<<<<<<< HEAD
+ <bytes key="NSTransformStruct">P4AAAL+AAABBiAAAxAwAAA</bytes>
++=======
+ <bytes key="NSTransformStruct">P4AAAL+AAABBiAAAw/kAAA</bytes>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
++<<<<<<< HEAD
+ <bytes key="NSTransformStruct">P4AAAL+AAABDggAAxAzAAA</bytes>
+ </object>
+ <boolean value="YES"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{403, 697}, {293, 4}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="YES"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBiAAAxAwAAA</bytes>
+ </object>
+ <boolean value="YES"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDggAAxAzAAA</bytes>
++=======
+ <bytes key="NSTransformStruct">P4AAAL+AAABDggAAw/qAAA</bytes>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{403, 697}, {293, 4}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
++<<<<<<< HEAD
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@@ -12712,7 -12568,7 +12819,11 @@@
</object>
</object>
<nil key="sourceID"/>
++<<<<<<< HEAD
+ <int key="maxID">3918</int>
++=======
+ <int key="maxID">3909</int>
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@@ -14289,8 -14145,6 +14400,11 @@@
<string>o_intf_mediakeys_ckb</string>
<string>o_intf_nativefullscreen_ckb</string>
<string>o_intf_network_box</string>
++<<<<<<< HEAD
+ <string>o_intf_pauseitunes_lbl</string>
+ <string>o_intf_pauseitunes_pop</string>
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<string>o_intf_pauseminimized_ckb</string>
<string>o_intf_style_bright_bcell</string>
<string>o_intf_style_dark_bcell</string>
@@@ -14516,8 -14370,6 +14630,11 @@@
<string>id</string>
<string>id</string>
<string>id</string>
++<<<<<<< HEAD
+ <string>id</string>
+ <string>id</string>
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@@ -14596,8 -14448,6 +14713,11 @@@
<string>o_intf_mediakeys_ckb</string>
<string>o_intf_nativefullscreen_ckb</string>
<string>o_intf_network_box</string>
++<<<<<<< HEAD
+ <string>o_intf_pauseitunes_lbl</string>
+ <string>o_intf_pauseitunes_pop</string>
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<string>o_intf_pauseminimized_ckb</string>
<string>o_intf_style_bright_bcell</string>
<string>o_intf_style_dark_bcell</string>
@@@ -14965,14 -14815,6 +15085,17 @@@
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
++<<<<<<< HEAD
+ <string key="name">o_intf_pauseitunes_lbl</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">o_intf_pauseitunes_pop</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
<string key="name">o_intf_pauseminimized_ckb</string>
<string key="candidateClassName">id</string>
</object>
diff --combined extras/package/macosx/package.mak
index 53c341c,b604ab9..39879a2
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@@ -64,6 -64,7 +64,10 @@@ package-macosx: VLC.ap
mkdir -p "$(top_builddir)/vlc-$(VERSION)/Goodies/"
cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"
cd $(srcdir); cp AUTHORS COPYING README THANKS NEWS $(abs_top_builddir)/vlc-$(VERSION)/Goodies/
++<<<<<<< HEAD
++=======
+ cp -R $(srcdir)/extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf
$(LN_S) -f /Applications $(top_builddir)/vlc-$(VERSION)/
rm -f "$(top_builddir)/vlc-$(VERSION)-rw.dmg"
@@@ -84,6 -85,7 +88,10 @@@ package-macosx-zip: VLC.ap
mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/
cp -R $(top_builddir)/VLC.app $(top_builddir)/vlc-$(VERSION)/VLC.app
cd $(srcdir); cp -R AUTHORS COPYING README THANKS NEWS $(abs_top_builddir)/vlc-$(VERSION)/Goodies/
++<<<<<<< HEAD
++=======
+ cp -R $(srcdir)/extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf
zip -r -y -9 $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION)
rm -rf "$(top_builddir)/vlc-$(VERSION)"
diff --combined extras/package/win32/NSIS/UAC/uac.cpp
index 5f25f4f,b35c47a..2fcb57f
--- a/extras/package/win32/NSIS/UAC/uac.cpp
+++ b/extras/package/win32/NSIS/UAC/uac.cpp
@@@ -360,7 -360,7 +360,11 @@@ DWORD SyncVars(HWND hwndNSIS
if (!g.UseIPC)return NO_ERROR;
g.NSISStrLen=NSIS::StrSize;
TRACEF("SyncVars: g.NSISStrLen=%d\n",g.NSISStrLen);ASSERT(g.NSISStrLen>10);
++<<<<<<< HEAD
+ DWORD cbStruct=FIELD_OFFSET(IPC_SYNCVAR,buf);
++=======
+ DWORD cbStruct=FIELD_OFFSET(IPC_SYNCVAR,buf[g.NSISStrLen+1]);
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
pSV=(IPC_SYNCVAR*)MemAlloc(cbStruct);
if (!pSV)
goto die_GLE;
@@@ -503,7 -503,7 +507,11 @@@ void HandleExecExport(bool CreateProc,b
cch+=lstrlen(pSIParams->text)+1;
cch+=lstrlen(pSIWorkDir->text)+1;
if (pSIVerb)cch+=lstrlen(pSIVerb->text)+1;
++<<<<<<< HEAD
+ cbStruct=FIELD_OFFSET( IPC_SHEXEC, buf );
++=======
+ cbStruct=FIELD_OFFSET( IPC_SHEXEC, buf[cch*sizeof(TCHAR)] );
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
pISE=(IPC_SHEXEC*)NSIS::MemAlloc(cbStruct);
if (!pISE)ec=GetLastError();
if (!ec)
diff --combined extras/package/win32/NSIS/languages/basque.nsh
index 3ca5bcf,73c516b..e1f6f6e
--- a/extras/package/win32/NSIS/languages/basque.nsh
+++ b/extras/package/win32/NSIS/languages/basque.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"VLC multimedia irakurgailuaren aurreko ezarpenen hobespenak eta katxe agiriak kentzen ditu"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "VLC multimedia irakurgailua jadanik ezarrita dago. $\nAurreko bertsioa \
+ kentzea nahi duzu $(^Name) ezarri aurretik ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Kendu"
StrCpy $Name_Section92 "Ezabatu hobespenak eta katxea"
diff --combined extras/package/win32/NSIS/languages/bengali.nsh
index 7c2cefd,2defa3e..b1ee35a
--- a/extras/package/win32/NSIS/languages/bengali.nsh
+++ b/extras/package/win32/NSIS/languages/bengali.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"পূরà§à¦¬à¦¬à¦°à§à¦¤à§€ ইনà§à¦¸à¦Ÿà¦²à§‡à¦¶à¦¨ থেকে à¦à¦¿à¦à¦²à¦¸à¦¿ মিডিয়া পà§à¦²à§‡à§Ÿà¦¾à¦° পছনà§à¦¦à¦¸à¦®à§‚হ à¦à¦¬à¦‚ কà§à¦¯à¦¾à¦¶ ফাইল মà§à¦›à§‡ দেয়"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "à¦à¦¿à¦à¦²à¦¸à¦¿ মিডিয়া পà§à¦²à§‡à§Ÿà¦¾à¦° ইতিপূরà§à¦¬à§‡à¦‡ ইনà§à¦¸à¦Ÿà¦² করা হয়েছে। $\nআপনি কি $(^Name) ইনà§à¦¸à¦Ÿà¦² করার পূরà§à¦¬à§‡ \
+ পূরà§à¦¬à¦¬à¦°à§à¦¤à§€ সংসà§à¦•à¦°à¦¨ মà§à¦›à§‡ ফেলতে চান ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "আনইনà§à¦¸à¦Ÿà¦²"
StrCpy $Name_Section92 "পছনà§à¦¦ à¦à¦¬à¦‚ কà§à¦¯à¦¾à¦¶ মà§à¦›à§‡ ফেলà§à¦¨"
diff --combined extras/package/win32/NSIS/languages/brazilian_portuguese.nsh
index 3ea16fd,60da0eb..8a68d6b
--- a/extras/package/win32/NSIS/languages/brazilian_portuguese.nsh
+++ b/extras/package/win32/NSIS/languages/brazilian_portuguese.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Exclui os arquivos de preferências e temporários do VLC, deixados pelas instalações anteriores"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "O reprodutor de mídias VLC já está instalado. $\nDeseja remover \
+ a versão anterior antes de instalar a $(^Name) ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Desinstalar"
StrCpy $Name_Section92 "Excluir arquivos de preferências e temporários"
diff --combined extras/package/win32/NSIS/languages/bulgarian.nsh
index 5ad7bd2,2ef581f..ef79323
--- a/extras/package/win32/NSIS/languages/bulgarian.nsh
+++ b/extras/package/win32/NSIS/languages/bulgarian.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Èçòðèâàíå íà ôàéëîâåòå ñ íàñòðîéêèòå è êåøà íà VLC media player îñòàíàëè îò ïðåäèøíèòå èíñòàëàöèè"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "Âå÷å èìà èíñòàëèðàí VLC media player. $\nÆåëàåòå ëè äà èçòðèåòå \
+ ïðåäèøíàòà âåðñèÿ ïðåäè äà èíñòàëèðàòå $(^Name) ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Äåèíñòàëèðàíå"
StrCpy $Name_Section92 "Èçòðèâàíå íà íàñòðîéêèòå è êåøà"
diff --combined extras/package/win32/NSIS/languages/catalan.nsh
index 091979b,da289bb..bbfd403
--- a/extras/package/win32/NSIS/languages/catalan.nsh
+++ b/extras/package/win32/NSIS/languages/catalan.nsh
@@@ -30,6 -30,9 +30,12 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Elimina les preferncies del VLC i els fitxers de la mem˜ria cau deixats en instalálacions anteriors"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "El reproductor VLC s'ha instalálat.$\nVoleu eliminar la versi— anterior instalálada prviament $(^Name) ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Desinstalála"
StrCpy $Name_Section92 "Elimina les preferncies i la mem˜ria cau"
diff --combined extras/package/win32/NSIS/languages/danish.nsh
index c703e66,5efedbf..6dd0744
--- a/extras/package/win32/NSIS/languages/danish.nsh
+++ b/extras/package/win32/NSIS/languages/danish.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Sletter VLC Media Player præferencer og cache filer, levn fra tidligere installationer"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "VLC Media Player er allerede blevet installeret. $\nVil du fjerne \
+ den tidligere version, før du installerer $(^Name) ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Afinstaller"
StrCpy $Name_Section92 "Slet præferencer og cache"
diff --combined extras/package/win32/NSIS/languages/declaration.nsh
index ef5fbc2,be1fbc7..9038eff
--- a/extras/package/win32/NSIS/languages/declaration.nsh
+++ b/extras/package/win32/NSIS/languages/declaration.nsh
@@@ -22,6 -22,8 +22,11 @@@ Var Desc_Section0
Var Desc_Section07
Var Desc_Section08
++<<<<<<< HEAD
++=======
+ Var Message_AlreadyInstalled
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
Var Name_Section91
Var Name_Section92
Var Desc_Section91
@@@ -46,20 -48,3 +51,23 @@@ Var Action_OnArrivalMusicFile
Var Action_OnArrivalDVDAudio
Var License_NextText
++<<<<<<< HEAD
+
+Var Detail_CheckProcesses
+Var MessageBox_VLCRunning
+Var MessageBox_VLCUnableToClose
+Var MessageBox_InstallAborted
+
+Var Reinstall_Headline
+Var Reinstall_HeadlineInstall
+Var Reinstall_HeadlineMaintenance
+Var Reinstall_MessageOlder
+Var Reinstall_MessageNewer
+Var Reinstall_MessageSame
+Var Reinstall_OptionUpgrade
+Var Reinstall_OptionDowngrade
+Var Reinstall_OptionComponents
+Var Reinstall_OptionAdvanced
+Var Reinstall_OptionUninstall
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined extras/package/win32/NSIS/languages/dutch.nsh
index e01d9cb,d3a3f70..0d32c3b
--- a/extras/package/win32/NSIS/languages/dutch.nsh
+++ b/extras/package/win32/NSIS/languages/dutch.nsh
@@@ -1,7 -1,6 +1,10 @@@
StrCpy $Name_Section01 "Media Player (vereist)"
StrCpy $Name_Section02a "Startmenu-snelkoppeling"
StrCpy $Name_Section02b "Bureaublad-snelkoppeling"
++<<<<<<< HEAD
+StrCpy $Name_Section34 "Web-plugins"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section03 "Mozilla-plugin"
StrCpy $Name_Section04 "ActiveX-plugin"
StrCpy $Name_Section05 "Schijven afspelen"
@@@ -25,17 -24,21 +28,33 @@@ StrCpy $Desc_Section04
StrCpy $Desc_Section05 \
"Dvd- en cd-afspeelregistratie"
StrCpy $Desc_Section06 \
++<<<<<<< HEAD
+ "Stelt VLC Media Player als standaardtoepassing in voor het opgegeven bestandstype"
++=======
+ "Stelt VLC Media Player als de standaardtoepassing in voor de opgegeven bestandstypen"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Desc_Section07 \
"Contextmenu-ingangen toevoegen ('Afspelen met VLC Media Player',...)"
StrCpy $Desc_Section08 \
"Verwijdert voorkeuren en bufferbestanden die van vorige installaties van VLC Media Player overgebleven zijn"
++<<<<<<< HEAD
+StrCpy $Name_Section91 "Verwijderen"
+StrCpy $Name_Section92 "Voorkeuren en buffers wissen"
+
+StrCpy $Desc_Section91 \
+"VLC Media Player en al zijn componenten verwijderen"
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "VLC Media Player is al geïnstalleerd. $\nWilt u de vorige versie \
+ verwijderen voordat u $(^Name) installeert ?"
+
+ StrCpy $Name_Section91 "Deïnstalleren"
+ StrCpy $Name_Section92 "Voorkeuren en buffers wissen"
+
+ StrCpy $Desc_Section91 \
+ "VLC Media Player en al zijn componenten deïnstalleren"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Desc_Section92 \
"Verwijdert de voorkeuren en bufferbestanden van VLC Media Player"
@@@ -58,20 -61,3 +77,23 @@@ StrCpy $Action_OnArrivalMusicFiles "Aud
StrCpy $Action_OnArrivalDVDAudio "Audio-dvd afspelen"
StrCpy $License_NextText "U bent zich nu bewust van uw rechten. Klik op Volgende om door te gaan."
++<<<<<<< HEAD
+
+StrCpy $Detail_CheckProcesses "Processen controleren..."
+StrCpy $MessageBox_VLCRunning "VLC lijkt actief te zijn en zal nu afgesloten worden."
+StrCpy $MessageBox_VLCUnableToClose "Deze installer kon VLC niet afsluiten. Gelieve dit manueel te doen."
+StrCpy $MessageBox_InstallAborted "Installatie afgebroken!"
+
+StrCpy $Reinstall_Headline "Reeds geïnstalleerd"
+StrCpy $Reinstall_HeadlineInstall "Kies hoe u VLC wilt installeren."
+StrCpy $Reinstall_HeadlineMaintenance "Kies de uit te voeren onderhoudsoptie."
+StrCpy $Reinstall_MessageOlder "Er is een oudere versie van VLC op uw systeem geïnstalleerd. Selecteer de handeling die u wilt uitvoeren en klik op Volgende om verder te gaan."
+StrCpy $Reinstall_MessageNewer "Er is al een nieuwere versie van VLC geïnstalleerd! Het is niet aanbevolen om naar een oudere versie te downgraden. Selecteer de handeling die u wilt uitvoeren en klik op Volgende om verder te gaan."
+StrCpy $Reinstall_MessageSame "VLC ${VERSION} is al geïnstalleerd. Selecteer de handeling die u wilt uitvoeren en klik op Volgende om verder te gaan."
+StrCpy $Reinstall_OptionUpgrade "VLC bijwerken en vorige instellingen behouden (aanbevolen)"
+StrCpy $Reinstall_OptionDowngrade "VLC downgraden en vorige instellingen behouden (aanbevolen)"
+StrCpy $Reinstall_OptionComponents "Componenten toevoegen/verwijderen/herinstalleren"
+StrCpy $Reinstall_OptionAdvanced "Instellingen wijzigen (geavanceerd)"
- StrCpy $Reinstall_OptionUninstall "VLC verwijderen"
++StrCpy $Reinstall_OptionUninstall "VLC verwijderen"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined extras/package/win32/NSIS/languages/english.nsh
index f42b1dd,2f1b896..b9e2427
--- a/extras/package/win32/NSIS/languages/english.nsh
+++ b/extras/package/win32/NSIS/languages/english.nsh
@@@ -31,6 -31,10 +31,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Deletes VLC media player preferences and cache files leftover from previous installations"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "VLC media player has already been installed. $\nDo you want to remove \
+ the previous version before installing $(^Name) ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Uninstall"
StrCpy $Name_Section92 "Delete preferences and cache"
@@@ -58,20 -62,3 +65,23 @@@ StrCpy $Action_OnArrivalMusicFiles "Pla
StrCpy $Action_OnArrivalDVDAudio "Play audio DVD"
StrCpy $License_NextText "You are now aware of your rights. Click Next to continue."
++<<<<<<< HEAD
+
+StrCpy $Detail_CheckProcesses "Checking processes..."
+StrCpy $MessageBox_VLCRunning "VLC appears to be running and will now be closed."
+StrCpy $MessageBox_VLCUnableToClose "This installer was unable to close VLC, please do it manually."
+StrCpy $MessageBox_InstallAborted "Installation aborted!"
+
+StrCpy $Reinstall_Headline "Already Installed"
+StrCpy $Reinstall_HeadlineInstall "Choose how you want to install VLC."
+StrCpy $Reinstall_HeadlineMaintenance "Choose the maintenance option to perform."
+StrCpy $Reinstall_MessageOlder "An older version of VLC is installed on your system. Select the operation you want to perform and click Next to continue."
+StrCpy $Reinstall_MessageNewer "A newer version of VLC is already installed! It is not recommended that you downgrade to an older version. Select the operation you want to perform and click Next to continue."
+StrCpy $Reinstall_MessageSame "VLC ${VERSION} is already installed. Select the operation you want to perform and click Next to continue."
+StrCpy $Reinstall_OptionUpgrade "Upgrade VLC using previous settings (recommended)"
+StrCpy $Reinstall_OptionDowngrade "Downgrade VLC using previous settings (recommended)"
+StrCpy $Reinstall_OptionComponents "Add/Remove/Reinstall components"
+StrCpy $Reinstall_OptionAdvanced "Change settings (advanced)"
+StrCpy $Reinstall_OptionUninstall "Uninstall VLC"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined extras/package/win32/NSIS/languages/estonian.nsh
index 6d4b492,f0ce191..48a8edb
--- a/extras/package/win32/NSIS/languages/estonian.nsh
+++ b/extras/package/win32/NSIS/languages/estonian.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Kustutab VLC meediaesitaja eelistused ja puhverfailid eelmisest paigaldusest"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "VLC meediaesitaja on juba paigaldatud. $\nKas soovid eelmise \
+ versiooni eemaldada enne $(^Name) paigaldamist?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Eemalda"
StrCpy $Name_Section92 "Kustuta eelistused ja puhver"
diff --combined extras/package/win32/NSIS/languages/finnish.nsh
index 0cd7c3d,97595d7..24a8ace
--- a/extras/package/win32/NSIS/languages/finnish.nsh
+++ b/extras/package/win32/NSIS/languages/finnish.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Poistaa VLC-mediasoittimen asetukset ja välimuistit joita on jäänyt vanhoista asennuksista"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "VLC-mediasoitin on jo asennettu. $\nHaluatko poistaa \
+ edellisen version ennen kuin asennat ohjelman $(^Name) ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Poista asennus"
StrCpy $Name_Section92 "Poista asetukset ja välimuisti"
diff --combined extras/package/win32/NSIS/languages/french.nsh
index 1f1d8f2,9958330..4251023
--- a/extras/package/win32/NSIS/languages/french.nsh
+++ b/extras/package/win32/NSIS/languages/french.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Efface les préférences de VLC et les fichiers cache laissés par une précédente installation"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "Le lecteur multimédia VLC est déjà installé. $\nSouhaitez-vous désinstaller \
+ l'ancienne version avant d'installer $(^Name) ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Désinstaller"
StrCpy $Name_Section92 "Effacer les préférences et les fichiers cache"
diff --combined extras/package/win32/NSIS/languages/galician.nsh
index f2e7be3,10dfc22..832084d
--- a/extras/package/win32/NSIS/languages/galician.nsh
+++ b/extras/package/win32/NSIS/languages/galician.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Elimina as preferencias e a caché do reprodutor multimedia VLC que pertenzan a versións previas"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "O reprodutor multimedia VLC xa está instalado. $\nQuere eliminar \
+ a versión anterior antes de instalar $(^Name)?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Desinstalar"
StrCpy $Name_Section92 "Eliminar as preferencias e a caché"
diff --combined extras/package/win32/NSIS/languages/german.nsh
index 3c09ad0,7433f08..050fe60
--- a/extras/package/win32/NSIS/languages/german.nsh
+++ b/extras/package/win32/NSIS/languages/german.nsh
@@@ -1,7 -1,6 +1,13 @@@
++<<<<<<< HEAD
+StrCpy $Name_Section01 "Media-Player (benötigt)"
+StrCpy $Name_Section02a "Symbole im Startmenü"
+StrCpy $Name_Section02b "Desktopsymbol"
+StrCpy $Name_Section34 "Web-Plugins"
++=======
+ StrCpy $Name_Section01 "Media-Player (benötigt)"
+ StrCpy $Name_Section02a "Symbole im Startmenü"
+ StrCpy $Name_Section02b "Desktopsymbol"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section03 "Mozilla-Plugin"
StrCpy $Name_Section04 "ActiveX-Plugin"
StrCpy $Name_Section05 "DVD- und CD-Wiedergabe"
@@@ -9,15 -8,15 +15,26 @@@ StrCpy $Name_Section06 "Dateitypzuordnu
StrCpy $Name_SectionGroupAudio "Audiodateien"
StrCpy $Name_SectionGroupVideo "Videodateien"
StrCpy $Name_SectionGroupOther "Andere"
++<<<<<<< HEAD
+StrCpy $Name_Section07 "Kontextmenü"
+StrCpy $Name_Section08 "Lösche die Einstellungen und den Cache"
++=======
+ StrCpy $Name_Section07 "Kontextmenü"
+ StrCpy $Name_Section08 "Lösche die Einstellungen und den Cache"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Desc_Section01 \
"Der Media Player"
StrCpy $Desc_Section02a \
++<<<<<<< HEAD
+ "Fügt Symbole im Startmenü für leichten Zugang hinzu"
+StrCpy $Desc_Section02b \
+ "Fügt ein Desktopsymbol für leichten Zugang ein"
++=======
+ "Fügt Symbole im Startmenü für leichten Zugang hinzu"
+ StrCpy $Desc_Section02b \
+ "Fügt ein Desktopsymbol für leichten Zugang ein"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Desc_Section03 \
"Das VLC Mozilla und Mozilla-Firefox Plugin"
StrCpy $Desc_Section04 \
@@@ -25,25 -24,29 +42,51 @@@
StrCpy $Desc_Section05 \
"DVD und CD Wiedergabe Registrierung"
StrCpy $Desc_Section06 \
++<<<<<<< HEAD
+ "Setzt den VLC media player als Standard-Anwendung für die ausgewählten Dateitypen"
+StrCpy $Desc_Section07 \
+ "Fügt Kontextmenü-Einträge hinzu ('Wiedergabe mit VLC' und 'Zur VLC-Wiedergabeliste hinzufügen')"
+StrCpy $Desc_Section08 \
+ "Löscht die VLC media player Einstellungen und übergebliebenen Cache-Dateien der alten Installation"
+
+StrCpy $Name_Section91 "Deinstallieren"
+StrCpy $Name_Section92 "Einstellungen und Cache löschen"
+
+StrCpy $Desc_Section91 \
+"VLC media player und alle Komponenten deinstallieren"
+StrCpy $Desc_Section92 \
+"VLC media player Einstellungen und Cache-Dateien löschen"
+
+StrCpy $ShellAssociation_Play "Wiedergabe"
+StrCpy $ContextMenuEntry_PlayWith "Mit VLC media player wiedergeben"
+StrCpy $ContextMenuEntry_AddToPlaylist "Zur VLC media player Wiedergabeliste hinzufügen"
+
+StrCpy $Link_VisitWebsite "Besuchen Sie die VideoLAN VLC media player Webseite"
++=======
+ "Setzt den VLC Media-Player als Standard-Anwendung für die ausgewählten Dateitypen"
+ StrCpy $Desc_Section07 \
+ "Fügt Kontextmenü-Einträge hinzu ('Wiedergabe mit VLC' und 'Zur VLC-Wiedergabeliste hinzufügen')"
+ StrCpy $Desc_Section08 \
+ "Löscht die VLC media player Einstellungen und übergebliebenen Cache-Dateien der alten Installation"
+
+ StrCpy $Message_AlreadyInstalled \
+ "Der VLC Media Player ist schon installiert. $\nWollen Sie vor \
+ dem Installieren des $(^Name) die alte Version entfernen?"
+
+ StrCpy $Name_Section91 "Deinstallieren"
+ StrCpy $Name_Section92 "Einstellungen und Cache löschen"
+
+ StrCpy $Desc_Section91 \
+ "VLC Media Player und alle Komponenten deinstallieren"
+ StrCpy $Desc_Section92 \
+ "VLC Media Player Einstellungen und Cache-Dateien löschen"
+
+ StrCpy $ShellAssociation_Play "Wiedergabe"
+ StrCpy $ContextMenuEntry_PlayWith "Mit VLC Media Player wiedergeben"
+ StrCpy $ContextMenuEntry_AddToPlaylist "Zur VLC Media Player Wiedergabeliste hinzufügen"
+
+ StrCpy $Link_VisitWebsite "Besuchen Sie die VideoLAN VLC Media Player Webseite"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_InstTypeRecommended "Empfohlen"
StrCpy $Name_InstTypeMinimum "Minimal"
@@@ -55,23 -58,4 +98,27 @@@ StrCpy $Action_OnArrivalVCDMovie "VCD-V
StrCpy $Action_OnArrivalSVCDMovie "SVCD-Video wiedergeben"
StrCpy $Action_OnArrivalVideoFiles "Videodateien wiedergeben"
StrCpy $Action_OnArrivalMusicFiles "Audiodateien wiedergeben"
-StrCpy $Action_OnArrivalDVDAudio "Audio-DVD wiedergeben"
++<<<<<<< HEAD
+StrCpy $Action_OnArrivalDVDAudio "Audio-DVD wiedergeben"
+
+StrCpy $License_NextText "Jetzt sind Sie über Ihre Rechte informiert. Klicken Sie auf Weiter."
+
+StrCpy $Detail_CheckProcesses "Überprüfen der Prozesse..."
+StrCpy $MessageBox_VLCRunning "VLC scheint ausgeführt zu werden und wird nun geschlossen."
+StrCpy $MessageBox_VLCUnableToClose "Dieses Installationsprogramm konnte VLC nicht schließen, tun Sie es bitte manuell."
+StrCpy $MessageBox_InstallAborted "Installation abgebrochen!"
+
+StrCpy $Reinstall_Headline "Bereits installiert"
+StrCpy $Reinstall_HeadlineInstall "Wählen Sie, wie Sie den VLC media player installieren möchten."
+StrCpy $Reinstall_HeadlineMaintenance "Wählen Sie die durchgeführte Wartungsoption aus."
+StrCpy $Reinstall_MessageOlder "Eine ältere Version des VLC media players ist auf dem System installiert. Wählen Sie die durchgeführte Operation aus und klicken Sie auf Weiter, um fortzufahren."
+StrCpy $Reinstall_MessageNewer "Eine neuere Version des VLC media players ist bereits installiert! Es wird nicht empfohlen, auf eine ältere Version downzugraden. Wählen Sie die durchgeführte Operation aus und klicken Sie auf Weiter, um fortzufahren."
+StrCpy $Reinstall_MessageSame "VLC ${VERSION} ist bereits installiert. Wählen Sie die durchgeführte Operation aus und klicken Sie auf Weiter, um fortzufahren."
+StrCpy $Reinstall_OptionUpgrade "Aktualisieren Sie den VLC media player mit vorherigen Einstellungen (empfohlen)"
+StrCpy $Reinstall_OptionDowngrade "Ein Downgrade des VLC media players mit vorherigen Einstellungen (empfohlen)"
+StrCpy $Reinstall_OptionComponents "Hinzufügen/Entfernen/Installieren von Komponenten"
+StrCpy $Reinstall_OptionAdvanced "Einstellungen ändern (erweitert)"
- StrCpy $Reinstall_OptionUninstall "Deinstallieren des VLC media players"
++StrCpy $Reinstall_OptionUninstall "Deinstallieren des VLC media players"
++=======
++StrCpy $Action_OnArrivalDVDAudio "Audio-DVD wiedergeben"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined extras/package/win32/NSIS/languages/hebrew.nsh
index 088816b,8f2d3c2..d655169
--- a/extras/package/win32/NSIS/languages/hebrew.nsh
+++ b/extras/package/win32/NSIS/languages/hebrew.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"îçé÷ú ääòãôåú å÷åáöé äîèîåï ùì ðâï äîãéä VLC ùðùàøå îäú÷ðåú ÷åãîåú"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "ðâï äîãéä VLC ëáø îåú÷ï. $\näàí áøöåðê ìäñéø àú äâøñä ä÷åãîú áèøí \
+ äú÷ðú $(^Name) ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "äñøä"
StrCpy $Name_Section92 "îçé÷ú ääòãôåú åäîèîåï"
diff --combined extras/package/win32/NSIS/languages/hungarian.nsh
index c739d4a,e4e70a5..d79d2d7
--- a/extras/package/win32/NSIS/languages/hungarian.nsh
+++ b/extras/package/win32/NSIS/languages/hungarian.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Törli a VLC médialejátszó elõzõ telepítésbõl maradt beállításait és gyorsítótár-fájljait"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "A VLC médialejátszó már telepítve van. $\nEl kívánja távolítani az \
+ elõzõ verziót a $(^Name) telepítése elõtt?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Eltávolítás"
StrCpy $Name_Section92 "Beállítások és gyorsítótár törlése"
diff --combined extras/package/win32/NSIS/languages/italian.nsh
index 1269b83,d40f529..22cbe59
--- a/extras/package/win32/NSIS/languages/italian.nsh
+++ b/extras/package/win32/NSIS/languages/italian.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Elimina le preferenze del lettore multimediale VLC e i file in cache lasciati da precedenti installazioni"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "Il lettore multimediale VLC è già installato. $\nVuoi rimuovere \
+ la versione precedente prima dell'installazione di $(^Name) ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Disinstalla"
StrCpy $Name_Section92 "Elimina preferenze e cache"
diff --combined extras/package/win32/NSIS/languages/japanese.nsh
index 8ee761e,67232da..205904b
--- a/extras/package/win32/NSIS/languages/japanese.nsh
+++ b/extras/package/win32/NSIS/languages/japanese.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"‘O‰ñ‚̃Cƒ“ƒXƒg[ƒ‹ˆÈ~‚ÉŽc‚Á‚Ä‚¢‚éVLCƒƒfƒBƒAƒvƒŒƒCƒ„[‚ÌÝ’è‚ƃLƒƒƒbƒVƒ…ƒtƒ@ƒCƒ‹‚ðíœ"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "VLCƒƒfƒBƒAƒvƒŒƒCƒ„[‚ÍŠù‚ɃCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚Ü‚·B$\n \
+ $(^Name)‚̃Cƒ“ƒXƒg[ƒ‹‚Ì‘O‚ɈȑO‚̃o[ƒWƒ‡ƒ“‚ð휂µ‚Ü‚·‚©H"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹"
StrCpy $Name_Section92 "Ý’è‚ƃLƒƒƒbƒVƒ…‚Ìíœ"
diff --combined extras/package/win32/NSIS/languages/lithuanian.nsh
index 875c73a,d34bd45..1e58d28
--- a/extras/package/win32/NSIS/languages/lithuanian.nsh
+++ b/extras/package/win32/NSIS/languages/lithuanian.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Iðtrina anksèiau ádiegtos VLC leistuvës nuostatas ir podëlio rinkmenas"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "VLC leistuvë jau ádiegta. $\nAr paðalinti \
+ anksèiau ádiegtà versijà prieð diegiant $(^Name) ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Paðalinti"
StrCpy $Name_Section92 "Iðtrinti nustatymus ir podëlá"
diff --combined extras/package/win32/NSIS/languages/occitan.nsh
index 6d6682d,49d5022..27c09ce
--- a/extras/package/win32/NSIS/languages/occitan.nsh
+++ b/extras/package/win32/NSIS/languages/occitan.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Suprimir las preferéncias de VLC media player e los fichièrs cache de las ancianas versions"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "VLC media player es ja installat. $\nVolètz suprimir l'anciana version \
+ abans d'installar aquela : $(^Name) ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Desinstallar"
StrCpy $Name_Section92 "Suprimir las preferéncias e lo cache"
diff --combined extras/package/win32/NSIS/languages/polish.nsh
index bf935f7,5526dc0..4b815c9
--- a/extras/package/win32/NSIS/languages/polish.nsh
+++ b/extras/package/win32/NSIS/languages/polish.nsh
@@@ -1,77 -1,60 +1,133 @@@
StrCpy $Name_Section01 "Media Player (wymagany)"
++<<<<<<< HEAD
+StrCpy $Name_Section02a "Skrót w Menu Start"
+StrCpy $Name_Section02b "Ikona na pulpicie"
+StrCpy $Name_Section34 "Wtyczki internetowe"
+StrCpy $Name_Section03 "Wtyczka Mozilla"
+StrCpy $Name_Section04 "Wtyczka ActiveX"
+StrCpy $Name_Section05 "Odtwarzanie płyt"
++=======
+ StrCpy $Name_Section02a "Skrót w menu Start"
+ StrCpy $Name_Section02b "Ikona na pulpicie"
+ StrCpy $Name_Section03 "Wtyczka Mozilla"
+ StrCpy $Name_Section04 "Wtyczka ActiveX"
+ StrCpy $Name_Section05 "Odtwarzanie p³yt"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section06 "Skojarzenia typu pliku"
StrCpy $Name_SectionGroupAudio "Pliki audio"
StrCpy $Name_SectionGroupVideo "Pliki wideo"
StrCpy $Name_SectionGroupOther "Inne"
StrCpy $Name_Section07 "Menu kontekstowe"
++<<<<<<< HEAD
+StrCpy $Name_Section08 "Wyczyścić pamięć podręczną i usunąć ustawienia"
++=======
+ StrCpy $Name_Section08 "Wyczyœciæ pamiêæ podrêczn¹ i usun¹æ ustawienia"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Desc_Section01 \
"Pliki samego odtwarzacza"
StrCpy $Desc_Section02a \
++<<<<<<< HEAD
+ "Dodaje skrót łatwego dostępu w Twoim Menu Start"
+StrCpy $Desc_Section02b \
+ "Dodaje ikonę łatwego dostępu na Twoim pulpicie"
++=======
+ "Dodaje skrót ³atwego dostêpu w twoim menu Start"
+ StrCpy $Desc_Section02b \
+ "Dodaje ikonê ³atwego dostêpu na twoim pulpicie"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Desc_Section03 \
"Wtyczka VLC Mozilla i Mozilla Firefox"
StrCpy $Desc_Section04 \
"Wtyczka VLC ActiveX"
StrCpy $Desc_Section05 \
++<<<<<<< HEAD
+ "Rejestracja VLC do odtwarzania płyt DVD i CD"
+StrCpy $Desc_Section06 \
+ "Ustawia VLC media player jako domyślną aplikację dla poszczególnego typu pliku"
+StrCpy $Desc_Section07 \
+ "Dodaje nowe pozycje do menu kontekstowego ('Odtwórz w VLC' i 'Dodaj do listy odtwarzania VLC')"
+StrCpy $Desc_Section08 \
+ "Usuwa ustawienia odtwarzacza VLC media player i pamięci podręcznej poprzednich instalacji"
+
+StrCpy $Name_Section91 "Odinstaluj"
+StrCpy $Name_Section92 "Wyczyścić pamięć podręczną i usunąć ustawienia"
+
+StrCpy $Desc_Section91 \
+"Odinstaluj VLC media player i wszystkie jego składniki"
+StrCpy $Desc_Section92 \
+"Usuwa ustawienia odtwarzacza VLC media player i pamięci podręcznej"
+
+StrCpy $ShellAssociation_Play "Odtwórz"
+StrCpy $ContextMenuEntry_PlayWith "Odtwórz w VLC media player"
+StrCpy $ContextMenuEntry_AddToPlaylist "Dodaj do listy odtwarzania VLC media player"
+
+StrCpy $Link_VisitWebsite "Odwiedź witrynę VideoLAN VLC media player"
+
+StrCpy $Name_InstTypeRecommended "Zalecana"
+StrCpy $Name_InstTypeMinimum "Minimalna"
+StrCpy $Name_InstTypeFull "Pełna"
+
+StrCpy $Action_OnArrivalDVD "Odtwarzaj film na DVD"
+StrCpy $Action_OnArrivalAudioCD "Odtwarzaj CD-Audio"
++=======
+ "Rejestracja VLC do odtwarzania p³yt DVD i CD"
+ StrCpy $Desc_Section06 \
+ "Ustawia VLC media player jako domyœln¹ aplikacjê dla poszczególnych typów pliku"
+ StrCpy $Desc_Section07 \
+ "Dodaje nowe pozycje do menu kontekstowego ('Odtwórz w VLC' i 'Dodaj do listy odtwarzania VLC')"
+ StrCpy $Desc_Section08 \
+ "Usuwa ustawienia odtwarzacza VLC media player i pamiêci podrêcznej poprzednich instalacji"
+ StrCpy $Message_AlreadyInstalled \
+ "VLC media player zosta³ ju¿ zainstalowany. $\nCzy chcesz usun¹æ \
+ poprzedni¹ wersjê przed zainstalowaniem $(^Name) ?"
+
+ StrCpy $Name_Section91 "Odinstaluj"
+ StrCpy $Name_Section92 "Wyczyœciæ pamiêæ podrêczn¹ i usun¹æ ustawienia"
+
+ StrCpy $Desc_Section91 \
+ "Odinstaluj VLC media player i wszystkie jego sk³adniki"
+ StrCpy $Desc_Section92 \
+ "Usuwa ustawienia odtwarzacza VLC media player i pamiêci podrêcznej"
+
+ StrCpy $ShellAssociation_Play "Odtwórz"
+ StrCpy $ContextMenuEntry_PlayWith "Odtwórz w VLC media player"
+ StrCpy $ContextMenuEntry_AddToPlaylist "Dodaj do listy odtwarzania VLC media player"
+
+ StrCpy $Link_VisitWebsite "OdwiedŸ witrynê VideoLAN VLC media player"
+
+ StrCpy $Name_InstTypeRecommended "Zalecana"
+ StrCpy $Name_InstTypeMinimum "Minimalna"
+ StrCpy $Name_InstTypeFull "Pe³na"
+
+ StrCpy $Action_OnArrivalDVD "Odtwarzaj film na DVD"
+ StrCpy $Action_OnArrivalAudioCD "Odtwarzaj audio CD"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Action_OnArrivalVCDMovie "Odtwarzaj film na VCD"
StrCpy $Action_OnArrivalSVCDMovie "Odtwarzaj film na SVCD"
StrCpy $Action_OnArrivalVideoFiles "Odtwarzaj pliki wideo"
StrCpy $Action_OnArrivalMusicFiles "Odtwarzaj pliki audio"
++<<<<<<< HEAD
+StrCpy $Action_OnArrivalDVDAudio "Odtwarzaj DVD-Audio"
+
+StrCpy $License_NextText "Jesteś teraz świadomy swoich praw. Kliknij przycisk Dalej, aby kontynuować."
+
+StrCpy $Detail_CheckProcesses "Procesy sprawdzania..."
+StrCpy $MessageBox_VLCRunning "VLC jest uruchomiony i zostanie teraz zamknięty."
+StrCpy $MessageBox_VLCUnableToClose "Instalator nie może zamknąć VLC, musisz zrobić to ręcznie."
+StrCpy $MessageBox_InstallAborted "Instalacja przerwana!"
+
+StrCpy $Reinstall_Headline "Już zainstalowany"
+StrCpy $Reinstall_HeadlineInstall "Wybierz, w jaki sposób chcesz zainstalować VLC."
+StrCpy $Reinstall_HeadlineMaintenance "Wybierz opcjÄ™ konserwacji do wykonania."
+StrCpy $Reinstall_MessageOlder "Starsza wersja VLC jest zainstalowana na Twoim systemie. Wybierz operację do wykonania, a następnie kliknij przycisk Dalej, aby kontynuować."
+StrCpy $Reinstall_MessageNewer "Nowsza wersja VLC jest już zainstalowana! Nie zaleca się, instalować i korzystać ze starszej wersji. Wybierz operację do wykonania, a następnie kliknij przycisk Dalej, aby kontynuować."
+StrCpy $Reinstall_MessageSame "VLC ${VERSION} jest już zainstalowany. Wybierz operację do wykonania, a następnie kliknij przycisk Dalej, aby kontynuować."
+StrCpy $Reinstall_OptionUpgrade "Uaktualnij VLC, używając poprzednich ustawień (zalecane)"
+StrCpy $Reinstall_OptionDowngrade "Zainstaluj starszą wersję VLC, używając poprzednich ustawień (zalecane)"
+StrCpy $Reinstall_OptionComponents "Dodaj/Usuń/Zainstaluj komponenty"
+StrCpy $Reinstall_OptionAdvanced "Zmień ustawienia (zaawansowane)"
- StrCpy $Reinstall_OptionUninstall "Odinstaluj VLC"
++StrCpy $Reinstall_OptionUninstall "Odinstaluj VLC"
++=======
+ StrCpy $Action_OnArrivalDVDAudio "Odtwarzaj audio DVD"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined extras/package/win32/NSIS/languages/punjabi.nsh
index edad772,653a76e..a8d84e5
--- a/extras/package/win32/NSIS/languages/punjabi.nsh
+++ b/extras/package/win32/NSIS/languages/punjabi.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"VLC ਮੀਡਿਆ ਪਲੇਅਰ ਪਸੰਦ ਅਤੇ ਕੈਸ਼ ਨੂੰ ਹਟਾਓ, ਜੋ ਕਿ ਪਿਛਲੀ ਇੰਸਟਾਲੇਸ਼ਨ ਤੋਂ ਬਚੀ ਹੈ"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "VLC ਮੀਡਿਆ ਪਲੇਅਰ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ।$\nਕੀ ਤà©à¨¸à©€à¨‚ ਪਿਛਲੇ ਵਰਜਨ ਨੂੰ \
+ $(^Name) ਇੰਸਟਾਲ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਹਟਾਉਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "ਅਣ-ਇੰਸਟਾਲ ਕਰੋ"
StrCpy $Name_Section92 "ਪਸੰਦ ਅਤੇ ਕੈਸ਼ ਹਟਾਓ"
diff --combined extras/package/win32/NSIS/languages/russian.nsh
index f29093d,65606aa..dc066c7
--- a/extras/package/win32/NSIS/languages/russian.nsh
+++ b/extras/package/win32/NSIS/languages/russian.nsh
@@@ -30,6 -30,10 +30,13 @@@ StrCpy $Desc_Section07
StrCpy $Desc_Section08 \
"Óäàëÿåò íàñòðîéêè è êýø ìåäèà-ïðîèãðûâàòåëÿ VLC, îñòàâøèåñÿ ïîñëå ïðåäûäóùåé óñòàíîâêè"
++<<<<<<< HEAD
++=======
+ StrCpy $Message_AlreadyInstalled \
+ "Ìåäèà-ïðîèãðûâàòåëü VLC óæå óñòàíîâëåí. $\nÆåëàåòå óäàëèòü \
+ ïðåäûäóùóþ âåðñèþ ïåðåä óñòàíîâêîé $(^Name) ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
StrCpy $Name_Section91 "Äåèíñòàëëÿöèÿ"
StrCpy $Name_Section92 "Óäàëèòü íàñòðîéêè è êýø"
diff --combined extras/package/win32/NSIS/vlc.win32.nsi.in
index 0a113e7,5bd3c44..df1a367
--- a/extras/package/win32/NSIS/vlc.win32.nsi.in
+++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
@@@ -56,11 -56,10 +56,18 @@@ InstType $Name_InstTypeRecommende
InstType $Name_InstTypeMinimum
InstType $Name_InstTypeFull
++<<<<<<< HEAD
+RequestExecutionLevel admin
+!addincludedir NSIS
+!addplugindir NSIS
+!include UAC.nsh
+!include nsProcess.nsh
++=======
+ RequestExecutionLevel user
+ !addincludedir NSIS
+ !addplugindir NSIS
+ !include UAC.nsh
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
!include WinVer.nsh
!include FileFunc.nsh
!include MUI2.nsh
@@@ -168,9 -167,6 +175,12 @@@ ${MementoSection} $Name_Section01 SEC0
SetShellVarContext all
SetOutPath "$INSTDIR"
++<<<<<<< HEAD
+ DetailPrint $Detail_CheckProcesses
+ Call CheckRunningProcesses
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
!insertmacro OpenUninstallLog
; VLC.exe, libvlc.dll
@@@ -215,18 -211,23 +225,38 @@@
WriteRegStr HKCR Applications\vlc.exe\shell\Open\command "" '"$INSTDIR\vlc.exe" --started-from-file "%1"'
!insertmacro MacroAllExtensions WriteRegStrSupportedTypes
++<<<<<<< HEAD
+ ; Windows default programs Registration
+ ; Vista and above detection
+ ${If} ${AtLeastWinVista}
+ WriteRegStr HKLM "Software\RegisteredApplications" "VLC" "Software\Clients\Media\VLC\Capabilities"
+ WriteRegStr HKLM "Software\Clients\Media\VLC\Capabilities" "ApplicationName" "VLC media player"
+ WriteRegStr HKLM "Software\Clients\Media\VLC\Capabilities" "ApplicationDescription" "VLC - The video swiss knife"
+ WriteRegStr HKLM "Software\Clients\Media\VLC" "" "VLC media player"
+ WriteRegStr HKLM "Software\Clients\Media\VLC\InstallInfo" "HideIconsCommand" "$\"$INSTDIR\spad-setup.exe$\" /HideIcons /S"
+ WriteRegStr HKLM "Software\Clients\Media\VLC\InstallInfo" "ShowIconsCommand" "$\"$INSTDIR\spad-setup.exe$\" /ShowIcons /S"
+ WriteRegStr HKLM "Software\Clients\Media\VLC\InstallInfo" "ReinstallCommand" "$\"$INSTDIR\spad-setup.exe$\" /Reinstall /S"
+ WriteRegDWORD HKLM "Software\Clients\Media\VLC\InstallInfo" "IconsVisible" 0x001
+ ${EndIf}
++=======
+ ; Windows default programs Registration
+ ; Vista and above detection
+ ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+ StrCpy $R1 $R0 1
+ StrCmp $R1 '6' lbl_vista lbl_done
+
+ lbl_vista:
+ WriteRegStr HKLM "Software\RegisteredApplications" "VLC" "Software\Clients\Media\VLC\Capabilities"
+ WriteRegStr HKLM "Software\Clients\Media\VLC\Capabilities" "ApplicationName" "VLC media player"
+ WriteRegStr HKLM "Software\Clients\Media\VLC\Capabilities" "ApplicationDescription" "VLC - The video swiss knife"
+ WriteRegStr HKLM "Software\Clients\Media\VLC" "" "VLC media player"
+ WriteRegStr HKLM "Software\Clients\Media\VLC\InstallInfo" "HideIconsCommand" "$\"$INSTDIR\spad-setup.exe$\" /HideIcons /S"
+ WriteRegStr HKLM "Software\Clients\Media\VLC\InstallInfo" "ShowIconsCommand" "$\"$INSTDIR\spad-setup.exe$\" /ShowIcons /S"
+ WriteRegStr HKLM "Software\Clients\Media\VLC\InstallInfo" "ReinstallCommand" "$\"$INSTDIR\spad-setup.exe$\" /Reinstall /S"
+ WriteRegDWORD HKLM "Software\Clients\Media\VLC\InstallInfo" "IconsVisible" 0x001
+
+ lbl_done:
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
${MementoSectionEnd}
${MementoSection} $Name_Section02a SEC02a
@@@ -600,6 -601,18 +630,21 @@@ UAC_Success
!include "languages\brazilian_portuguese.nsh"
EndLanguageCmp:
++<<<<<<< HEAD
++=======
+ ;;ReadRegStr $R0 ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \
+ ;;"UninstallString"
+ ;;StrCmp $R0 "" finished
+
+ ;;MessageBox MB_YESNO|MB_ICONEXCLAMATION $Message_AlreadyInstalled /SD IDNO IDNO finished
+
+ ;Run the uninstaller
+ ;uninst:
+ ClearErrors
+ ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
+ finished:
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
FunctionEnd
;;; Page to upgrade / downgrade or customize the installation
@@@ -618,12 -631,12 +663,21 @@@ Function PageReinstal
${If} $PreviousVersionState == "newer"
++<<<<<<< HEAD
+ !insertmacro MUI_HEADER_TEXT $Reinstall_Headline $Reinstall_HeadlineInstall
+ nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 $Reinstall_MessageOlder
+ Pop $R0
+ nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 $Reinstall_OptionUpgrade
+ Pop $ReinstallUninstallBtn
+ nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 $Reinstall_OptionAdvanced
++=======
+ !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install VLC."
+ nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 "An older version of VLC is installed on your system. Select the operation you want to perform and click Next to continue."
+ Pop $R0
+ nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 "Upgrade VLC using previous settings (recommended)"
+ Pop $ReinstallUninstallBtn
+ nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Change settings (advanced)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
Pop $R0
${If} $ReinstallType == ""
@@@ -632,12 -645,12 +686,21 @@@
${ElseIf} $PreviousVersionState == "older"
++<<<<<<< HEAD
+ !insertmacro MUI_HEADER_TEXT $Reinstall_Headline $Reinstall_HeadlineInstall
+ nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 $Reinstall_MessageNewer
+ Pop $R0
+ nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 $Reinstall_OptionDowngrade
+ Pop $ReinstallUninstallBtn
+ nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 $Reinstall_OptionAdvanced
++=======
+ !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install VLC."
+ nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 "A newer version of VLC is already installed! It is not recommended that you downgrade to an older version. Select the operation you want to perform and click Next to continue."
+ Pop $R0
+ nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 "Downgrade VLC using previous settings (recommended)"
+ Pop $ReinstallUninstallBtn
+ nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Change settings (advanced)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
Pop $R0
${If} $ReinstallType == ""
@@@ -646,12 -659,12 +709,21 @@@
${ElseIf} $PreviousVersionState == "same"
++<<<<<<< HEAD
+ !insertmacro MUI_HEADER_TEXT $Reinstall_Headline $Reinstall_HeadlineMaintenance
+ nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 $Reinstall_MessageSame
+ Pop $R0
+ nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 $Reinstall_OptionComponents
+ Pop $R0
+ nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 $Reinstall_OptionUninstall
++=======
+ !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose the maintenance option to perform."
+ nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 "VLC ${VERSION} is already installed. Select the operation you want to perform and click Next to continue."
+ Pop $R0
+ nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 "Add/Remove/Reinstall components"
+ Pop $R0
+ nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Uninstall VLC"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
Pop $ReinstallUninstallBtn
${If} $ReinstallType == ""
@@@ -931,18 -944,18 +1003,30 @@@ UAC_Elevate
Quit
UAC_Err:
++<<<<<<< HEAD
+ MessageBox mb_iconstop "Unable to elevate, error $0$\nPlease try to run this installer with admin privileges."
+ Abort
+
+UAC_ElevationAborted:
+ MessageBox mb_iconstop "This installer requires admin privileges, aborting!"
++=======
+ MessageBox mb_iconstop "Unable to elevate, error $0"
+ Abort
+
+ UAC_ElevationAborted:
+ MessageBox mb_iconstop "This installer requires admin access, aborting!"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
Abort
UAC_Success:
@HAVE_WIN64_TRUE@ SetRegView 64
StrCmp 1 $3 +4
StrCmp 3 $1 0 UAC_ElevationAborted
++<<<<<<< HEAD
+ MessageBox mb_iconstop "This installer requires admin privileges, try again."
++=======
+ MessageBox mb_iconstop "This installer requires admin access, try again"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
goto UAC_Elevate
!insertmacro MUI_UNGETLANGUAGE
diff --combined extras/package/win32/package.mak
index 6d213f3,b523646..1b422df
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@@ -130,18 -130,9 +130,24 @@@ els
$(CXX) $^ -D_WIN32_IE=0x0601 -D__forceinline=inline -shared -o $@ -lole32 -static-libstdc++ -static-libgcc
$(STRIP) $@
endif
++<<<<<<< HEAD
+$(win32_destdir)/NSIS/nsProcess.dll: extras/package/win32/NSIS/nsProcess/nsProcess.c extras/package/win32/NSIS/nsProcess/pluginapi.c
+ mkdir -p "$(win32_destdir)/NSIS/"
+if HAVE_WIN64
+ i686-w64-mingw32-gcc $^ -shared -o $@ -lole32 -static-libgcc
+ i686-w64-mingw32-strip $@
+else
+ $(CC) $^ -D_WIN32_IE=0x0601 -shared -o $@ -lole32 -static-libgcc
+ $(STRIP) $@
+endif
+
+
+package-win32-exe: package-win-strip $(win32_destdir)/NSIS/UAC.dll $(win32_destdir)/NSIS/nsProcess.dll
++=======
+
+
+ package-win32-exe: package-win-strip $(win32_destdir)/NSIS/UAC.dll
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# Script installer
cp $(top_builddir)/extras/package/win32/NSIS/vlc.win32.nsi "$(win32_destdir)/"
cp $(top_builddir)/extras/package/win32/NSIS/spad.nsi "$(win32_destdir)/"
@@@ -149,7 -140,6 +155,10 @@@
cp -r $(srcdir)/extras/package/win32/NSIS/helpers "$(win32_destdir)/"
mkdir -p "$(win32_destdir)/NSIS/"
cp "$(top_srcdir)/extras/package/win32/NSIS/UAC.nsh" "$(win32_destdir)/NSIS/"
++<<<<<<< HEAD
+ cp "$(top_srcdir)/extras/package/win32/NSIS/nsProcess.nsh" "$(win32_destdir)/NSIS/"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# Create package
if makensis -VERSION >/dev/null 2>&1; then \
diff --combined include/vlc_interface.h
index d2d8482,999211e..f222b1a
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@@ -4,7 -4,7 +4,11 @@@
* interface, such as message output.
*****************************************************************************
* Copyright (C) 1999, 2000 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: 81ad15e3e659297e0982a375f7f3e6061ec92a42 $
++=======
+ * $Id: 9bc6241b7eb84459a28f3fee32bff129d74bad80 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Vincent Seguin <seguin at via.ecp.fr>
*
@@@ -244,7 -244,7 +248,11 @@@ typedef enum vlc_dialog
"*.xa;" \
"*.xm"
++<<<<<<< HEAD
+#define EXTENSIONS_VIDEO "*.3g2;*.3gp;*.3gp2;*.3gpp;*.amv;*.asf;*.avi;*.bin;*.divx;*.drc;*.dv;*f4v;*.flv;*.gvi;*.gxf;*.iso;*.m1v;*.m2v;" \
++=======
+ #define EXTENSIONS_VIDEO "*.3g2;*.3gp;*.3gp2;*.3gpp;*.amv;*.asf;*.avi;*.bin;*.divx;*.drc;*.dv;*f4v;*.flv;*.gvi;*.gvi;*.gxf;*.iso;*.m1v;*.m2v;" \
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"*.m2t;*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp2v;*.mp4;*.mp4v;*.mpe;*.mpeg;*.mpeg1;" \
"*.mpeg2;*.mpeg4;*.mpg;*.mpv2;*.mts;*.mtv;*.mxf;*.mxg;*.nsv;*.nuv;" \
"*.ogg;*.ogm;*.ogv;*.ogx;*.ps;" \
diff --combined modules/audio_output/audiounit_ios.c
index 27b6a4b,e8e6b91..0b7a39b
--- a/modules/audio_output/audiounit_ios.c
+++ b/modules/audio_output/audiounit_ios.c
@@@ -2,7 -2,7 +2,11 @@@
* audiounit_ios.c: AudioUnit output plugin for iOS
*****************************************************************************
* Copyright (C) 2012 - 2013 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: 00d61b915dc37d8259edcd7babcf7a2536f6ddf3 $
++=======
+ * $Id: b780fd0aa3c9986173feb68e38b0970369df84c5 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
*
@@@ -66,11 -66,7 +70,15 @@@ struct aout_sys_
int i_rate; /* media sample rate */
int i_bytes_per_sample;
++<<<<<<< HEAD
+
+ bool b_paused;
+
+ vlc_mutex_t lock;
+ vlc_cond_t cond;
++=======
+ bool b_got_first_sample;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
};
#pragma mark -
@@@ -108,10 -104,6 +116,13 @@@ static int Open(vlc_object_t *obj
if (unlikely(sys == NULL))
return VLC_ENOMEM;
++<<<<<<< HEAD
+ vlc_mutex_init(&sys->lock);
+ vlc_cond_init(&sys->cond);
+ sys->b_paused = false;
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
aout->sys = sys;
aout->start = Start;
aout->stop = Stop;
@@@ -124,9 -116,6 +135,12 @@@ static void Close(vlc_object_t *obj
audio_output_t *aout = (audio_output_t *)obj;
aout_sys_t *sys = aout->sys;
++<<<<<<< HEAD
+ vlc_mutex_destroy(&sys->lock);
+ vlc_cond_destroy(&sys->cond);
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
free(sys);
}
@@@ -251,16 -240,13 +265,23 @@@ static int StartAnalog(audio_output_t *
return false;
}
++<<<<<<< HEAD
+ /* AU init */
++=======
+ /* AU initiliaze */
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
status = AudioUnitInitialize(p_sys->au_unit);
if (status != noErr) {
msg_Err(p_aout, "failed to init AudioUnit (%li)", status);
return false;
}
++<<<<<<< HEAD
+ /* setup circular buffer */
+ TPCircularBufferInit(&p_sys->circular_buffer, AUDIO_BUFFER_SIZE_IN_SECONDS * fmt->i_rate * fmt->i_bytes_per_frame);
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/* start audio session so playback continues if mute switch is on */
AudioSessionInitialize (NULL,
kCFRunLoopCommonModes,
@@@ -272,8 -258,10 +293,15 @@@
AudioSessionSetProperty(kAudioSessionProperty_AudioCategory, sizeof(sessionCategory),&sessionCategory);
AudioSessionSetActive(true);
++<<<<<<< HEAD
+ status = AudioOutputUnitStart(p_sys->au_unit);
+ msg_Dbg(p_aout, "audio output unit started: %li", status);
++=======
+ /* setup circular buffer */
+ TPCircularBufferInit(&p_sys->circular_buffer, AUDIO_BUFFER_SIZE_IN_SECONDS * fmt->i_rate * fmt->i_bytes_per_frame);
+
+ p_sys->b_got_first_sample = false;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
return true;
}
@@@ -308,6 -296,13 +336,16 @@@ static void Play (audio_output_t * p_ao
struct aout_sys_t *p_sys = p_aout->sys;
if (p_block->i_nb_samples > 0) {
++<<<<<<< HEAD
++=======
+ if (!p_sys->b_got_first_sample) {
+ /* Start the AU */
+ OSStatus status = AudioOutputUnitStart(p_sys->au_unit);
+ msg_Dbg(p_aout, "audio output unit started: %li", status);
+ p_sys->b_got_first_sample = true;
+ }
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/* move data to buffer */
if (unlikely(!TPCircularBufferProduceBytes(&p_sys->circular_buffer, p_block->p_buffer, p_block->i_buffer)))
msg_Warn(p_aout, "Audio buffer was dropped");
@@@ -324,32 -319,25 +362,52 @@@ static void Pause (audio_output_t *p_ao
struct aout_sys_t * p_sys = p_aout->sys;
VLC_UNUSED(date);
++<<<<<<< HEAD
+ vlc_mutex_lock(&p_sys->lock);
+ p_sys->b_paused = pause;
+ vlc_mutex_unlock(&p_sys->lock);
+
+ if (pause)
+ AudioSessionSetActive(false);
+ else
+ AudioSessionSetActive(true);
++=======
+ if (pause) {
+ AudioOutputUnitStop(p_sys->au_unit);
+ AudioSessionSetActive(false);
+ } else {
+ AudioOutputUnitStart(p_sys->au_unit);
+ AudioSessionSetActive(true);
+ }
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
static void Flush(audio_output_t *p_aout, bool wait)
{
struct aout_sys_t * p_sys = p_aout->sys;
++<<<<<<< HEAD
+
+ if (wait) {
+ int32_t availableBytes;
+ vlc_mutex_lock(&p_sys->lock);
+ TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
+ while (availableBytes > 0) {
+ vlc_cond_wait(&p_sys->cond, &p_sys->lock);
+ TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
+ }
+ vlc_mutex_unlock(&p_sys->lock);
+ } else
+ /* flush circular buffer */
+ TPCircularBufferClear(&p_aout->sys->circular_buffer);
++=======
+ VLC_UNUSED(wait);
+
+ p_sys->b_got_first_sample = false;
+
+ /* flush circular buffer */
+ AudioOutputUnitStop(p_aout->sys->au_unit);
+ TPCircularBufferClear(&p_aout->sys->circular_buffer);
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
static int TimeGet(audio_output_t *p_aout, mtime_t *delay)
@@@ -382,34 -370,29 +440,59 @@@ static OSStatus RenderCallback(vlc_obje
VLC_UNUSED(ioActionFlags);
VLC_UNUSED(inTimeStamp);
VLC_UNUSED(inBusNumber);
++<<<<<<< HEAD
+ VLC_UNUSED(inNumberFrames);
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
audio_output_t * p_aout = (audio_output_t *)p_obj;
struct aout_sys_t * p_sys = p_aout->sys;
++<<<<<<< HEAD
+ int bytesRequested = ioData->mBuffers[0].mDataByteSize;
+ Float32 *targetBuffer = (Float32*)ioData->mBuffers[0].mData;
+
+ vlc_mutex_lock(&p_sys->lock);
+ /* Pull audio from buffer */
+ int32_t availableBytes;
+ Float32 *buffer = TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
+
+ /* check if we have enough data */
+ if (!availableBytes || p_sys->b_paused) {
+ /* return an empty buffer so silence is played until we have data */
+ memset(targetBuffer, 0, ioData->mBuffers[0].mDataByteSize);
+ } else {
+ int32_t bytesToCopy = __MIN(bytesRequested, availableBytes);
+
+ memcpy(targetBuffer, buffer, bytesToCopy);
+ TPCircularBufferConsume(&p_sys->circular_buffer, bytesToCopy);
+ ioData->mBuffers[0].mDataByteSize = bytesToCopy;
+ }
+
+ vlc_cond_signal(&p_sys->cond);
+ vlc_mutex_unlock(&p_sys->lock);
+
++=======
+ int bytesToCopy = ioData->mBuffers[0].mDataByteSize;
+ Float32 *targetBuffer = (Float32*)ioData->mBuffers[0].mData;
+
+ /* Pull audio from buffer */
+ int32_t availableBytes = 0;
+ Float32 *buffer = TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
+
+ /* check if we have enough data */
+ if (!availableBytes) {
+ /* return an empty buffer so silence is played until we have data */
+ memset(targetBuffer, 0, bytesToCopy);
+ } else {
+ memcpy(targetBuffer, buffer, __MIN(bytesToCopy, availableBytes));
+ TPCircularBufferConsume(&p_sys->circular_buffer, __MIN(bytesToCopy, availableBytes));
+ VLC_UNUSED(inNumberFrames);
+ if (availableBytes < bytesToCopy)
+ memset((uint8_t*) targetBuffer + availableBytes, 0, bytesToCopy - availableBytes);
+ }
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
return noErr;
}
diff --combined modules/audio_output/auhal.c
index 5bd6f67,d1c9da5..f106080
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@@ -2,7 -2,7 +2,11 @@@
* auhal.c: AUHAL and Coreaudio output plugin
*****************************************************************************
* Copyright (C) 2005 - 2013 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: 0f33d0f87ab604dab22cf539c1fcba9e7e1b7133 $
++=======
+ * $Id: 1ce1d9f8eab01b1d2f5603fb2ed3c7ced948efd2 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Derk-Jan Hartman <hartman at videolan dot org>
* Felix Paul Kühne <fkuehne at videolan dot org>
@@@ -103,6 -103,9 +107,12 @@@ struct aout_sys_
bool b_revert; /* Whether we need to revert the stream format */
bool b_changed_mixing; /* Whether we need to set the mixing mode back */
++<<<<<<< HEAD
++=======
+
+ bool b_got_first_sample; /* did the aout core provide something to render? */
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
int i_rate; /* media sample rate */
int i_bytes_per_sample;
@@@ -112,7 -115,6 +122,10 @@@
float f_volume;
bool b_mute;
++<<<<<<< HEAD
+ bool b_paused;
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
vlc_mutex_t lock;
vlc_cond_t cond;
@@@ -191,7 -193,6 +204,10 @@@ static int Open(vlc_object_t *obj
p_sys->b_digital = false;
p_sys->b_ignore_streams_changed_callback = false;
p_sys->b_selected_dev_is_default = false;
++<<<<<<< HEAD
+ p_sys->b_paused = false;
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
p_aout->sys = p_sys;
p_aout->start = Start;
@@@ -201,19 -202,6 +217,22 @@@
p_aout->device_select = SwitchAudioDevice;
p_sys->device_list = CFArrayCreate(kCFAllocatorDefault, NULL, 0, NULL);
++<<<<<<< HEAD
+ /*
+ * Force an own run loop for callbacks.
+ *
+ * According to rtaudio, this is absolutely necessary since 10.6 to get correct notifications.
+ * It might fix issues when using the module as a library where a proper loop is not setup already.
+ */
+ CFRunLoopRef theRunLoop = NULL;
+ AudioObjectPropertyAddress property = { kAudioHardwarePropertyRunLoop, kAudioObjectPropertyScopeGlobal,kAudioObjectPropertyElementMaster };
+ err = AudioObjectSetPropertyData(kAudioObjectSystemObject, &property, 0, NULL, sizeof(CFRunLoopRef), &theRunLoop);
+ if (err != noErr) {
+ msg_Err(p_aout, "failed to set the run loop property [%4.4s]", (char *)&err);
+ }
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/* Attach a listener so that we are notified of a change in the device setup */
AudioObjectPropertyAddress audioDevicesAddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
err = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &audioDevicesAddress, DevicesListener, (void *)p_aout);
@@@ -313,7 -301,6 +332,10 @@@ static int Start(audio_output_t *p_aout
p_sys->b_revert = false;
p_sys->b_changed_mixing = false;
p_sys->i_bytes_per_sample = 0;
++<<<<<<< HEAD
+ p_sys->b_paused = false;
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
vlc_mutex_lock(&p_sys->var_lock);
p_sys->i_selected_dev = p_sys->i_new_selected_dev;
@@@ -349,7 -336,6 +371,10 @@@
err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &defaultDeviceAddress, 0, NULL, &propertySize, &defaultDeviceID);
if (err != noErr) {
msg_Err(p_aout, "could not get default audio device [%4.4s]", (char *)&err);
++<<<<<<< HEAD
+ vlc_mutex_unlock(&p_sys->var_lock);
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
goto error;
}
else
@@@ -358,7 -344,6 +383,10 @@@
p_sys->i_selected_dev = defaultDeviceID;
p_sys->b_selected_dev_is_digital = var_InheritBool(p_aout, "spdif");
}
++<<<<<<< HEAD
+ vlc_mutex_unlock(&p_sys->var_lock);
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
// recheck if device still supports digital
b_start_digital = p_sys->b_selected_dev_is_digital;
@@@ -412,6 -397,7 +440,10 @@@
b_success = true;
}
}
++<<<<<<< HEAD
++=======
+ vlc_mutex_unlock(&p_sys->var_lock);
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if (b_success) {
p_aout->play = Play;
@@@ -423,6 -409,7 +455,10 @@@
error:
/* If we reach this, this aout has failed */
++<<<<<<< HEAD
++=======
+ vlc_mutex_unlock(&p_sys->var_lock);
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msg_Err(p_aout, "opening auhal output failed");
return VLC_EGENERIC;
}
@@@ -828,7 -815,7 +864,11 @@@ static int StartAnalog(audio_output_t *
TPCircularBufferInit(&p_sys->circular_buffer, AUDIO_BUFFER_SIZE_IN_SECONDS *
fmt->i_rate * fmt->i_bytes_per_frame);
++<<<<<<< HEAD
+ verify_noerr(AudioOutputUnitStart(p_sys->au_unit));
++=======
+ p_sys->b_got_first_sample = false;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/* Set volume for output unit */
VolumeSet(p_aout, p_sys->f_volume);
@@@ -1056,6 -1043,7 +1096,10 @@@ static void Stop(audio_output_t *p_aout
verify_noerr(AudioComponentInstanceDispose(p_sys->au_unit));
}
++<<<<<<< HEAD
++=======
+ vlc_mutex_lock(&p_sys->var_lock);
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if (p_sys->b_digital) {
/* Stop device */
err = AudioDeviceStop(p_sys->i_selected_dev,
@@@ -1118,6 -1106,8 +1162,11 @@@
msg_Warn(p_aout, "failed to remove audio device life checker [%4.4s]", (char *)&err);
}
++<<<<<<< HEAD
++=======
+ vlc_mutex_unlock(&p_sys->var_lock);
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
p_sys->i_bytes_per_sample = 0;
p_sys->b_digital = false;
@@@ -1345,6 -1335,12 +1394,15 @@@ static void Play(audio_output_t * p_aou
struct aout_sys_t *p_sys = p_aout->sys;
if (p_block->i_nb_samples > 0) {
++<<<<<<< HEAD
++=======
+ if (!p_sys->b_got_first_sample) {
+ /* Start the AU */
+ verify_noerr(AudioOutputUnitStart(p_sys->au_unit));
+ p_sys->b_got_first_sample = true;
+ }
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/* Do the channel reordering */
if (p_sys->chans_to_reorder && !p_sys->b_digital) {
aout_ChannelReorder(p_block->p_buffer,
@@@ -1370,9 -1366,17 +1428,23 @@@ static void Pause(audio_output_t *p_aou
struct aout_sys_t * p_sys = p_aout->sys;
VLC_UNUSED(date);
++<<<<<<< HEAD
+ vlc_mutex_lock(&p_sys->lock);
+ p_sys->b_paused = pause;
+ vlc_mutex_unlock(&p_sys->lock);
++=======
+ if (p_aout->sys->b_digital) {
+ if (pause)
+ AudioDeviceStop(p_sys->i_selected_dev, p_sys->i_procID);
+ else
+ AudioDeviceStart(p_sys->i_selected_dev, p_sys->i_procID);
+ } else {
+ if (pause)
+ AudioOutputUnitStop(p_sys->au_unit);
+ else
+ AudioOutputUnitStart(p_sys->au_unit);
+ }
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
static void Flush(audio_output_t *p_aout, bool wait)
@@@ -1390,7 -1394,10 +1462,14 @@@
vlc_mutex_unlock(&p_sys->lock);
} else {
++<<<<<<< HEAD
++ /* flush circular buffer */
++=======
+ p_sys->b_got_first_sample = false;
+
/* flush circular buffer */
+ AudioOutputUnitStop(p_aout->sys->au_unit);
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
TPCircularBufferClear(&p_aout->sys->circular_buffer);
}
}
@@@ -1439,7 -1446,7 +1518,11 @@@ static OSStatus RenderCallbackAnalog(vl
Float32 *buffer = TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
/* check if we have enough data */
++<<<<<<< HEAD
+ if (!availableBytes || p_sys->b_paused) {
++=======
+ if (!availableBytes) {
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/* return an empty buffer so silence is played until we have data */
memset(targetBuffer, 0, ioData->mBuffers[0].mDataByteSize);
} else {
@@@ -1485,7 -1492,7 +1568,11 @@@ static OSStatus RenderCallbackSPDIF(Aud
char *buffer = TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
/* check if we have enough data */
++<<<<<<< HEAD
+ if (!availableBytes || p_sys->b_paused) {
++=======
+ if (!availableBytes) {
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/* return an empty buffer so silence is played until we have data */
memset(targetBuffer, 0, outOutputData->mBuffers[p_sys->i_stream_index].mDataByteSize);
} else {
@@@ -1550,7 -1557,7 +1637,11 @@@ static OSStatus DeviceAliveListener(Aud
}
/*
++<<<<<<< HEAD
+ * Callback when default audio device changed
++=======
+ * Callback when current device is not alive anymore
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*/
static OSStatus DefaultDeviceChangedListener(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress inAddresses[], void *inClientData)
{
@@@ -1577,12 -1584,12 +1668,21 @@@
msg_Dbg(p_aout, "default device changed to %i", defaultDeviceID);
++<<<<<<< HEAD
+ /* Default device is changed by the os to allow other apps to play sound while in digital
+ mode. But this should not affect ourself. */
+ if (p_aout->sys->b_digital) {
+ msg_Dbg(p_aout, "ignore, as digital mode is active");
+ return noErr;
+ }
++=======
+ /*
+ * The default device id changes to 0 when switching to SPDIF for whatever reason.
+ * We need to ignore that.
+ */
+ if(defaultDeviceID == 0)
+ return noErr;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/* Also ignore events which announce the same device id */
if(defaultDeviceID == p_aout->sys->i_selected_dev)
@@@ -1594,8 -1601,9 +1694,14 @@@
return noErr;
}
++<<<<<<< HEAD
+/*
+ * Callback when physical formats for device change
++=======
+
+ /*
+ * Callback when default audio device changed
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*/
static OSStatus StreamsChangedListener(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress inAddresses[], void *inClientData)
{
@@@ -1654,7 -1662,7 +1760,11 @@@
}
/*
++<<<<<<< HEAD
+ * StreamListener: check whether the device's physical format change is complete
++=======
+ * StreamListener: check whether the device's physical format changes on-the-fly (unlikely)
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*/
static OSStatus StreamListener(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress inAddresses[], void *inClientData)
{
@@@ -1846,8 -1854,6 +1956,11 @@@ static int AudioStreamChangeFormat(audi
OSStatus err = noErr;
UInt32 i_param_size = 0;
++<<<<<<< HEAD
+ int retValue = true;
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
AudioObjectPropertyAddress physicalFormatAddress = { kAudioStreamPropertyPhysicalFormat, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
struct { vlc_mutex_t lock; vlc_cond_t cond; } w;
@@@ -1863,8 -1869,7 +1976,12 @@@
err = AudioObjectAddPropertyListener(i_stream_id, &physicalFormatAddress, StreamListener, (void *)&w);
if (err != noErr) {
msg_Err(p_aout, "AudioObjectAddPropertyListener for kAudioStreamPropertyPhysicalFormat failed [%4.4s]", (char *)&err);
++<<<<<<< HEAD
+ retValue = false;
+ goto out;
++=======
+ return false;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
/* change the format */
@@@ -1872,8 -1877,7 +1989,12 @@@
&change_format);
if (err != noErr) {
msg_Err(p_aout, "could not set the stream format [%4.4s]", (char *)&err);
++<<<<<<< HEAD
+ retValue = false;
+ goto out;
++=======
+ return false;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
/* The AudioStreamSetProperty is not only asynchronious (requiring the locks)
@@@ -1900,12 -1904,11 +2021,19 @@@
/* We need to check again */
}
++<<<<<<< HEAD
+out:
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/* Removing the property listener */
err = AudioObjectRemovePropertyListener(i_stream_id, &physicalFormatAddress, StreamListener, (void *)&w);
if (err != noErr) {
msg_Err(p_aout, "AudioStreamRemovePropertyListener failed [%4.4s]", (char *)&err);
++<<<<<<< HEAD
+ retValue = false;
++=======
+ return false;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
/* Destroy the lock and condition */
@@@ -1913,5 -1916,5 +2041,9 @@@
vlc_mutex_destroy(&w.lock);
vlc_cond_destroy(&w.cond);
++<<<<<<< HEAD
+ return retValue;
++=======
+ return true;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
diff --combined modules/audio_output/directx.c
index 8fd0ac5,e18086e..b15dd12
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@@ -2,7 -2,7 +2,11 @@@
* directx.c: Windows DirectX audio output method
*****************************************************************************
* Copyright (C) 2001-2009 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: b43a184027ca6a4c2112967a08f00340e7a80315 $
++=======
+ * $Id: 64ffc136e31167d48313e8bd254dbc36ce10d067 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Gildas Bazin <gbazin at videolan.org>
*
@@@ -184,7 -184,7 +188,11 @@@ static int Start( audio_output_t *p_aou
if ( AOUT_FMT_SPDIF( fmt ) && var_InheritBool( p_aout, "spdif" )
&& CreateDSBuffer( p_aout, VLC_CODEC_SPDIFL, fmt->i_physical_channels,
++<<<<<<< HEAD
+ aout_FormatNbChannels( fmt ), fmt->i_rate, false )
++=======
+ aout_FormatNbChannels( fmt ), fmt->i_rate, true )
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
== VLC_SUCCESS )
{
msg_Dbg( p_aout, "using A/52 pass-through over S/PDIF" );
@@@ -580,10 -580,6 +588,13 @@@ static int CreateDSBuffer( audio_output
dsbdesc.dwBufferBytes = DS_BUF_SIZE; /* buffer size */
dsbdesc.lpwfxFormat = (WAVEFORMATEX *)&waveformat;
++<<<<<<< HEAD
+ /* CreateSoundBuffer doesn't allow volume control for non-PCM buffers */
+ if ( i_format == VLC_CODEC_SPDIFL )
+ dsbdesc.dwFlags &= ~DSBCAPS_CTRLVOLUME;
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if FAILED( IDirectSound_CreateSoundBuffer(
p_aout->sys->p_dsobject, &dsbdesc,
&p_aout->sys->p_dsbuffer, NULL) )
diff --combined modules/audio_output/waveout.c
index d3bd81c,2f94063..53d9aff
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@@ -2,7 -2,7 +2,11 @@@
* waveout.c : Windows waveOut plugin for vlc
*****************************************************************************
* Copyright (C) 2001-2009 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: f06c8eef7c57b9e3ddbd9d1dc15ab294715ff916 $
++=======
+ * $Id: 13c0f1e99bcfb6409c2dbf934cc2db9d3619f48f $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Gildas Bazin <gbazin at videolan.org>
* André Weber
@@@ -178,6 -178,12 +182,15 @@@ static int Start( audio_output_t *p_aou
/* Default behaviour is to use software gain */
p_aout->sys->b_soft = true;
++<<<<<<< HEAD
++=======
+ /*
+ check for configured audio device!
+ */
+ fmt->i_format = var_InheritBool( p_aout, "waveout-float32" )?
+ VLC_CODEC_FL32: VLC_CODEC_S16N;
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
char *dev = var_GetNonEmptyString( p_aout, "waveout-audio-device");
uint32_t devid = findDeviceID( dev );
@@@ -227,12 -233,6 +240,15 @@@
if( fmt->i_format != VLC_CODEC_SPDIFL )
{
++<<<<<<< HEAD
+ /*
+ check for configured audio device!
+ */
+ fmt->i_format = var_InheritBool( p_aout, "waveout-float32" )?
+ VLC_CODEC_FL32: VLC_CODEC_S16N;
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
int max_chan = var_InheritInteger( p_aout, "waveout-audio-channels");
int i_channels = aout_FormatNbChannels(fmt);
i_channels = ( i_channels < max_chan )? i_channels: max_chan;
diff --combined modules/codec/Makefile.am
index e2f79a2,8d24f26..7961afc
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@@ -3,9 -3,9 +3,15 @@@
basedir = codec
dir = codec
++<<<<<<< HEAD
+mods = a52 adpcm aes3 araw cc cdg crystalhd cvdsub ddummy dirac dmo dts dvbsub edummy faad fdkaac flac g711 kate libass libmpeg2 lpcm mash mpeg_audio opus png qsv quicktime rawvideo schroedinger scte27 sdl_image shine speex spudec stl subsdec subsusf svcdsub t140 telx theora tremor twolame uleaddvaudio vorbis wma_fixed x264 x26410b zvbi
+libvlc_LTLIBRARIES = $(LTLIBcrystalhd) $(LTLIBdirac) $(LTLIBdmo) $(LTLIBfaad) $(LTLIBfdkaac) $(LTLIBflac) $(LTLIBkate) $(LTLIBlibass) $(LTLIBlibmpeg2) $(LTLIBmash) $(LTLIBopus) $(LTLIBpng) $(LTLIBqsv) $(LTLIBquicktime) $(LTLIBschroedinger) $(LTLIBsdl_image) $(LTLIBshine) $(LTLIBspeex) $(LTLIBtelx) $(LTLIBtheora) $(LTLIBtremor) $(LTLIBtwolame) $(LTLIBvorbis) $(LTLIBwma_fixed) $(LTLIBx264) $(LTLIBx26410b) $(LTLIBzvbi)
+EXTRA_LTLIBRARIES = libcrystalhd_plugin.la libdirac_plugin.la libdmo_plugin.la libfaad_plugin.la libfdkaac_plugin.la libflac_plugin.la libkate_plugin.la liblibass_plugin.la liblibmpeg2_plugin.la libmash_plugin.la libopus_plugin.la libpng_plugin.la libqsv_plugin.la libquicktime_plugin.la libschroedinger_plugin.la libsdl_image_plugin.la libshine_plugin.la libspeex_plugin.la libtelx_plugin.la libtheora_plugin.la libtremor_plugin.la libtwolame_plugin.la libvorbis_plugin.la libwma_fixed_plugin.la libx264_plugin.la libx26410b_plugin.la libzvbi_plugin.la
++=======
+ mods = a52 adpcm aes3 araw cc cdg crystalhd cvdsub ddummy dirac dmo dts dvbsub edummy faad fdkaac flac fluidsynth g711 kate libass libmpeg2 lpcm mash mpeg_audio opus png qsv quicktime rawvideo schroedinger scte27 sdl_image shine speex spudec stl subsdec subsusf svcdsub t140 telx theora tremor twolame uleaddvaudio vorbis wma_fixed x264 x26410b zvbi
+ libvlc_LTLIBRARIES = $(LTLIBcrystalhd) $(LTLIBdirac) $(LTLIBdmo) $(LTLIBfaad) $(LTLIBfdkaac) $(LTLIBflac) $(LTLIBfluidsynth) $(LTLIBkate) $(LTLIBlibass) $(LTLIBlibmpeg2) $(LTLIBmash) $(LTLIBopus) $(LTLIBpng) $(LTLIBqsv) $(LTLIBquicktime) $(LTLIBschroedinger) $(LTLIBsdl_image) $(LTLIBshine) $(LTLIBspeex) $(LTLIBtelx) $(LTLIBtheora) $(LTLIBtremor) $(LTLIBtwolame) $(LTLIBvorbis) $(LTLIBwma_fixed) $(LTLIBx264) $(LTLIBx26410b) $(LTLIBzvbi)
+ EXTRA_LTLIBRARIES = libcrystalhd_plugin.la libdirac_plugin.la libdmo_plugin.la libfaad_plugin.la libfdkaac_plugin.la libflac_plugin.la libfluidsynth_plugin.la libkate_plugin.la liblibass_plugin.la liblibmpeg2_plugin.la libmash_plugin.la libopus_plugin.la libpng_plugin.la libqsv_plugin.la libquicktime_plugin.la libschroedinger_plugin.la libsdl_image_plugin.la libshine_plugin.la libspeex_plugin.la libtelx_plugin.la libtheora_plugin.la libtremor_plugin.la libtwolame_plugin.la libvorbis_plugin.la libwma_fixed_plugin.la libx264_plugin.la libx26410b_plugin.la libzvbi_plugin.la
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
include $(top_srcdir)/modules/common.am
@@@ -213,6 -213,18 +219,21 @@@ libflac_plugin_la_OBJCFLAGS = $(AM_OBJC
libflac_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_flac)
libflac_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_flac)
++<<<<<<< HEAD
++=======
+ # The fluidsynth plugin
+ libfluidsynth_plugin_la_SOURCES = $(SOURCES_fluidsynth)
+ nodist_libfluidsynth_plugin_la_SOURCES = $(nodist_SOURCES_fluidsynth)
+ # Force per-target objects:
+ libfluidsynth_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_fluidsynth)
+ libfluidsynth_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_fluidsynth)
+ libfluidsynth_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_fluidsynth)
+ libfluidsynth_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) $(OBJCFLAGS_fluidsynth)
+ # Set LIBADD manually:
+ libfluidsynth_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_fluidsynth)
+ libfluidsynth_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_fluidsynth)
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# The g711 plugin
libg711_plugin_la_SOURCES = $(SOURCES_g711)
nodist_libg711_plugin_la_SOURCES = $(nodist_SOURCES_g711)
diff --combined modules/codec/Modules.am
index 1d5a858,a93dac7..a89448d
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@@ -41,6 -41,7 +41,10 @@@ SOURCES_cvdsub = cvdsub.
SOURCES_sdl_image = sdl_image.c
SOURCES_zvbi = zvbi.c
SOURCES_cdg = cdg.c
++<<<<<<< HEAD
++=======
+ SOURCES_fluidsynth = fluidsynth.c
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
SOURCES_cc = cc.c cc.h substext.h
SOURCES_kate = kate.c
SOURCES_schroedinger = schroedinger.c
@@@ -210,14 -211,3 +214,17 @@@ if HAVE_ANDROI
libvlc_LTLIBRARIES += libiomx_plugin.la libmediacodec_plugin.la
endif
++<<<<<<< HEAD
+## fluidsynth ##
+libfluidsynth_plugin_la_SOURCES = fluidsynth.c
+libfluidsynth_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_fluidsynth)
+libfluidsynth_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_fluidsynth)
+libfluidsynth_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_fluidsynth)
+if HAVE_DARWIN
+libfluidsynth_plugin_la_LDFLAGS += -Wl,-framework,CoreFoundation,-framework,CoreServices
+endif
+
+libvlc_LTLIBRARIES += $(LTLIBfluidsynth)
+EXTRA_LTLIBRARIES += libfluidsynth_plugin.la
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined modules/codec/lpcm.c
index c44001f,59044b6..e9c2008
--- a/modules/codec/lpcm.c
+++ b/modules/codec/lpcm.c
@@@ -2,7 -2,7 +2,11 @@@
* lpcm.c: lpcm decoder/packetizer module
*****************************************************************************
* Copyright (C) 1999-2008 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: eb9793f50b1b91039a9f5cf5cc9ccbbbcb4f93c3 $
++=======
+ * $Id: 8ad9c6951f44523b5b7fef20ae7bb5977622ed46 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Samuel Hocevar <sam at zoy.org>
* Henri Fallon <henri at videolan.org>
@@@ -1103,7 -1103,7 +1107,11 @@@ static void BdExtract( block_t *p_aout_
unsigned i_channels, unsigned i_channels_padding,
unsigned i_bits )
{
++<<<<<<< HEAD
+ if( i_bits != 16 || i_channels_padding > 0 )
++=======
+ if( i_channels_padding > 0 )
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
{
uint8_t *p_src = p_block->p_buffer;
uint8_t *p_dst = p_aout_buffer->p_buffer;
@@@ -1115,7 -1115,7 +1123,11 @@@
memcpy( p_dst, p_src, i_channels * i_bits / 8 );
#else
if (i_bits == 16) {
++<<<<<<< HEAD
+ swab( p_src, p_dst, (i_channels + i_channels_padding) * i_bits / 8 );
++=======
+ swab( p_dst, p_src, (i_channels + i_channels_padding) * i_bits / 8 );
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
} else {
p_dst[0] = 0;
p_dst[1] = p_src[2];
diff --combined modules/demux/asf/asf.c
index 3acea45,05bb108..097234e
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@@ -261,13 -261,7 +261,17 @@@ static int SeekIndex( demux_t *p_demux
uint64_t i_offset = (uint64_t)p_index->index_entry[i_entry].i_packet_number *
p_sys->p_fp->i_min_data_packet_size;
++<<<<<<< HEAD
+
+ if ( stream_Seek( p_demux->s, p_sys->i_data_begin + i_offset ) == VLC_SUCCESS )
+ {
+ es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, VLC_TS_0 + i_date );
+ return VLC_SUCCESS;
+ }
+ else return VLC_EGENERIC;
++=======
+ return stream_Seek( p_demux->s, p_sys->i_data_begin + i_offset );
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
static void SeekPrepare( demux_t *p_demux )
@@@ -752,17 -746,6 +756,20 @@@ static int DemuxInit( demux_t *p_demux
goto error;
}
++<<<<<<< HEAD
+ if ( ASF_FindObject( p_sys->p_root->p_hdr,
+ &asf_object_content_encryption_guid, 0 ) != NULL
+ || ASF_FindObject( p_sys->p_root->p_hdr,
+ &asf_object_extended_content_encryption_guid, 0 ) != NULL
+ || ASF_FindObject( p_sys->p_root->p_hdr,
+ &asf_object_advanced_content_encryption_guid, 0 ) != NULL )
+ {
+ msg_Warn( p_demux, "ASF plugin discarded (DRM encumbered content)" );
+ goto error;
+ }
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
p_sys->i_track = ASF_CountObject( p_sys->p_root->p_hdr,
&asf_object_stream_properties_guid );
if( p_sys->i_track <= 0 )
diff --combined modules/demux/asf/libasf.c
index dcc9b73,423a2af..bd60308
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@@ -141,16 -141,9 +141,22 @@@ static int ASF_ReadObjectCommon( stream
return VLC_SUCCESS;
}
++<<<<<<< HEAD
+static int ASF_NextObject( stream_t *s, asf_object_t *p_obj, uint64_t i_boundary )
+{
+ asf_object_t obj;
+
+ int64_t i_pos = stream_Tell( s );
+ if ( i_boundary && i_pos >= 0 && (uint64_t) i_pos >= i_boundary )
+ {
+ return VLC_EGENERIC;
+ }
+
++=======
+ static int ASF_NextObject( stream_t *s, asf_object_t *p_obj )
+ {
+ asf_object_t obj;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if( p_obj == NULL )
{
if( ASF_ReadObjectCommon( s, &obj ) )
@@@ -220,7 -213,7 +226,11 @@@ static int ASF_ReadObject_Header( stre
free( p_subobj );
break;
}
++<<<<<<< HEAD
+ if( ASF_NextObject( s, p_subobj, 0 ) ) /* Go to the next object */
++=======
+ if( ASF_NextObject( s, p_subobj ) ) /* Go to the next object */
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
break;
}
return VLC_SUCCESS;
@@@ -512,7 -505,7 +522,11 @@@ static int ASF_ReadObject_header_extens
break;
}
++<<<<<<< HEAD
+ if( ASF_NextObject( s, p_obj, 0 ) ) /* Go to the next object */
++=======
+ if( ASF_NextObject( s, p_obj ) ) /* Go to the next object */
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
{
break;
}
@@@ -1248,13 -1241,6 +1262,16 @@@ static void ASF_FreeObject_marker( asf_
FREENULL( p_mk->name );
}
++<<<<<<< HEAD
+static int ASF_ReadObject_Raw(stream_t *s, asf_object_t *p_obj)
+{
+ VLC_UNUSED(s);
+ VLC_UNUSED(p_obj);
+ return VLC_SUCCESS;
+}
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#if 0
static int ASF_ReadObject_XXX(stream_t *s, asf_object_t *p_obj)
{
@@@ -1332,12 -1318,6 +1349,15 @@@ static const struc
{ &asf_object_extended_content_description, ASF_OBJECT_OTHER,
ASF_ReadObject_extended_content_description,
ASF_FreeObject_extended_content_description },
++<<<<<<< HEAD
+ { &asf_object_content_encryption_guid, ASF_OBJECT_OTHER,
+ ASF_ReadObject_Raw, ASF_FreeObject_Null },
+ { &asf_object_advanced_content_encryption_guid, ASF_OBJECT_OTHER,
+ ASF_ReadObject_Raw, ASF_FreeObject_Null },
+ { &asf_object_extended_content_encryption_guid, ASF_OBJECT_OTHER,
+ ASF_ReadObject_Raw, ASF_FreeObject_Null },
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
{ &asf_object_null_guid, 0, NULL, NULL }
};
@@@ -1488,9 -1468,6 +1508,12 @@@ static const struc
{ &asf_object_advanced_mutual_exclusion, "Advanced Mutual Exclusion" },
{ &asf_object_stream_prioritization, "Stream Prioritization" },
{ &asf_object_extended_content_description, "Extended content description"},
++<<<<<<< HEAD
+ { &asf_object_content_encryption_guid, "Content Encryption"},
+ { &asf_object_advanced_content_encryption_guid, "Advanced Content Encryption"},
+ { &asf_object_extended_content_encryption_guid, "Entended Content Encryption"},
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
{ NULL, "Unknown" },
};
@@@ -1551,7 -1528,6 +1574,10 @@@ asf_object_root_t *ASF_ReadObjectRoot(
{
asf_object_root_t *p_root = malloc( sizeof( asf_object_root_t ) );
asf_object_t *p_obj;
++<<<<<<< HEAD
+ uint64_t i_boundary = 0;
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if( !p_root )
return NULL;
@@@ -1581,15 -1557,12 +1607,24 @@@
switch( p_obj->common.i_type )
{
case( ASF_OBJECT_HEADER ):
++<<<<<<< HEAD
+ if ( p_root->p_index || p_root->p_data || p_root->p_hdr ) break;
+ p_root->p_hdr = (asf_object_header_t*)p_obj;
+ break;
+ case( ASF_OBJECT_DATA ):
+ if ( p_root->p_index || p_root->p_data ) break;
+ p_root->p_data = (asf_object_data_t*)p_obj;
+ break;
+ case( ASF_OBJECT_INDEX ):
+ if ( p_root->p_index ) break;
++=======
+ p_root->p_hdr = (asf_object_header_t*)p_obj;
+ break;
+ case( ASF_OBJECT_DATA ):
+ p_root->p_data = (asf_object_data_t*)p_obj;
+ break;
+ case( ASF_OBJECT_INDEX ):
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
p_root->p_index = (asf_object_index_t*)p_obj;
break;
default:
@@@ -1597,13 -1570,6 +1632,16 @@@
GUID_PRINT( p_obj->common.i_object_id ) );
break;
}
++<<<<<<< HEAD
+
+ /* Set a limit to avoid junk when possible */
+ if ( !guidcmp( &p_obj->common.i_object_id, &asf_object_file_properties_guid ) )
+ {
+ i_boundary = p_obj->file_properties.i_file_size;
+ }
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if( p_obj->common.i_type == ASF_OBJECT_DATA &&
p_obj->common.i_object_size <= 50 )
{
@@@ -1616,7 -1582,7 +1654,11 @@@
break;
}
++<<<<<<< HEAD
+ if( ASF_NextObject( s, p_obj, i_boundary ) ) /* Go to the next object */
++=======
+ if( ASF_NextObject( s, p_obj ) ) /* Go to the next object */
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
break;
}
diff --combined modules/gui/macosx/ControlsBar.h
index bb1e57d,ddb91fd..bd616d4
--- a/modules/gui/macosx/ControlsBar.h
+++ b/modules/gui/macosx/ControlsBar.h
@@@ -2,7 -2,7 +2,11 @@@
* ControlsBar.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2012 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: c0fd5a1a1a7b4b0f277d6fc929c6d6587d96a83d $
++=======
+ * $Id: d7637c2ed6525c2d701f921238ef936cc45b002d $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
* David Fuhrmann <david dot fuhrmann at googlemail dot com>
@@@ -71,7 -71,6 +75,10 @@@
@property (readonly) id bottomBarView;
- (CGFloat)height;
++<<<<<<< HEAD
+- (void)toggleForwardBackwardMode:(BOOL)b_alt;
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
- (IBAction)play:(id)sender;
- (IBAction)bwd:(id)sender;
diff --combined modules/gui/macosx/ControlsBar.m
index 6ba3b4c,8f6a6e5..085bd81
--- a/modules/gui/macosx/ControlsBar.m
+++ b/modules/gui/macosx/ControlsBar.m
@@@ -2,7 -2,7 +2,11 @@@
* ControlsBar.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2012-2013 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: 77506234850c18c32df24e4bed3b57b5b6559ba6 $
++=======
+ * $Id: 8fec32af017e356d2886954b888b7f298659dca0 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
* David Fuhrmann <david dot fuhrmann at googlemail dot com>
@@@ -156,9 -156,6 +160,12 @@@
[o_fullscreen_btn removeFromSuperviewWithoutNeedingDisplay];
}
++<<<<<<< HEAD
+ if (config_GetInt(VLCIntf, "macosx-show-playback-buttons"))
+ [self toggleForwardBackwardMode: YES];
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
- (CGFloat)height
@@@ -166,26 -163,6 +173,29 @@@
return [o_bottombar_view frame].size.height;
}
++<<<<<<< HEAD
+- (void)toggleForwardBackwardMode:(BOOL)b_alt
+{
+ if (b_alt == YES) {
+ /* change the accessibility help for the backward/forward buttons accordingly */
+ [[o_bwd_btn cell] accessibilitySetOverrideValue:_NS("Click and hold to skip backward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
+ [[o_fwd_btn cell] accessibilitySetOverrideValue:_NS("Click and hold to skip forward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
+
+ [o_fwd_btn setAction:@selector(alternateForward:)];
+ [o_bwd_btn setAction:@selector(alternateBackward:)];
+
+ } else {
+ /* change the accessibility help for the backward/forward buttons accordingly */
+ [[o_bwd_btn cell] accessibilitySetOverrideValue:_NS("Click to go to the previous playlist item. Hold to skip backward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
+ [[o_fwd_btn cell] accessibilitySetOverrideValue:_NS("Click to go to the next playlist item. Hold to skip forward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
+
+ [o_fwd_btn setAction:@selector(fwd:)];
+ [o_bwd_btn setAction:@selector(bwd:)];
+ }
+}
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#pragma mark -
#pragma mark Button Actions
@@@ -264,17 -241,6 +274,20 @@@
}
}
++<<<<<<< HEAD
+// alternative actions for forward / backward buttons when next / prev are activated
+- (IBAction)alternateForward:(id)sender
+{
+ [[VLCCoreInteraction sharedInstance] forwardExtraShort];
+}
+
+- (IBAction)alternateBackward:(id)sender
+{
+ [[VLCCoreInteraction sharedInstance] backwardExtraShort];
+}
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
- (IBAction)timeSliderAction:(id)sender
{
float f_updated;
@@@ -774,6 -740,10 +787,13 @@@ else
[o_next_btn setAlternateImage: [NSImage imageNamed:@"next-6btns-pressed"]];
}
++<<<<<<< HEAD
++=======
+ /* change the accessibility help for the backward/forward buttons accordingly */
+ [[o_bwd_btn cell] accessibilitySetOverrideValue:_NS("Click and hold to skip backward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
+ [[o_fwd_btn cell] accessibilitySetOverrideValue:_NS("Click and hold to skip forward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
NSRect frame;
frame = [o_bwd_btn frame];
frame.size.width--;
@@@ -834,7 -804,8 +854,12 @@@ else
[o_bottombar_view performSelector:@selector(addSubview:) withObject:o_next_btn afterDelay:.2];
}
++<<<<<<< HEAD
+ [self toggleForwardBackwardMode: YES];
++=======
+ [o_fwd_btn setAction:@selector(forward:)];
+ [o_bwd_btn setAction:@selector(backward:)];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
- (void)removeJumpButtons:(BOOL)b_fast
@@@ -856,6 -827,10 +881,13 @@@
[o_next_btn release];
o_next_btn = NULL;
++<<<<<<< HEAD
++=======
+ /* change the accessibility help for the backward/forward buttons accordingly */
+ [[o_bwd_btn cell] accessibilitySetOverrideValue:_NS("Click to go to the previous playlist item. Hold to skip backward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
+ [[o_fwd_btn cell] accessibilitySetOverrideValue:_NS("Click to go to the next playlist item. Hold to skip forward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
NSRect frame;
frame = [o_bwd_btn frame];
frame.size.width++;
@@@ -904,9 -879,10 +936,16 @@@ else
[[o_bwd_btn animator] setAlternateImage:[NSImage imageNamed:@"backward-3btns-pressed"]];
}
++<<<<<<< HEAD
+ [self toggleForwardBackwardMode: NO];
+
+ [o_bottombar_view setNeedsDisplay:YES];
++=======
+ [o_bottombar_view setNeedsDisplay:YES];
+
+ [o_fwd_btn setAction:@selector(fwd:)];
+ [o_bwd_btn setAction:@selector(bwd:)];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
- (void)togglePlaymodeButtons
@@@ -998,6 -974,17 +1037,20 @@@
[[VLCCoreInteraction sharedInstance] next];
}
++<<<<<<< HEAD
++=======
+ // alternative actions for forward / backward buttons when next / prev are activated
+ - (IBAction)forward:(id)sender
+ {
+ [[VLCCoreInteraction sharedInstance] forwardExtraShort];
+ }
+
+ - (IBAction)backward:(id)sender
+ {
+ [[VLCCoreInteraction sharedInstance] backwardExtraShort];
+ }
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
- (void)setRepeatOne
{
[o_repeat_btn setImage: o_repeat_one_img];
diff --combined modules/gui/macosx/MainMenu.m
index fa04d12,d86f81d..fa3bfaf
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@@ -2,7 -2,7 +2,11 @@@
* MainMenu.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2011-2013 Felix Paul Kühne
++<<<<<<< HEAD
+ * $Id: 17e748152bc992343f639cc638d2bb5107db61cc $
++=======
+ * $Id: ab90e38210f570a369a58292725ad2e439d82ef7 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
*
@@@ -705,12 -705,7 +709,16 @@@ static VLCMainMenu *_o_sharedInstance
{
BOOL b_value = !config_GetInt(VLCIntf, "macosx-show-playback-buttons");
config_PutInt(VLCIntf, "macosx-show-playback-buttons", b_value);
++<<<<<<< HEAD
+
+ [[[[VLCMain sharedInstance] mainWindow] controlsBar] toggleJumpButtons];
+ [[[VLCMain sharedInstance] voutController] updateWindowsUsingBlock:^(VLCVideoWindowCommon *o_window) {
+ [[o_window controlsBar] toggleForwardBackwardMode: b_value];
+ }];
+
++=======
+ [[[[VLCMain sharedInstance] mainWindow] controlsBar] toggleJumpButtons];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
[o_mi_toggleJumpButtons setState: b_value];
}
diff --combined modules/gui/macosx/MainWindow.m
index 9a6d8e7,8b10c21..3f7aedd
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@@ -2,7 -2,7 +2,11 @@@
* MainWindow.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2013 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: 5dd6dc2a51358edd23e10983b01bbf35e658f073 $
++=======
+ * $Id: 9fa9828f30e6564c5d564c4a50cdf10f087642e4 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
* Jon Lech Johansen <jon-vl at nanocrew.net>
@@@ -308,6 -308,7 +312,10 @@@ static VLCMainWindow *_o_sharedInstanc
[o_sidebaritems addObject: internetItem];
[o_sidebar_view reloadData];
++<<<<<<< HEAD
++=======
+ [o_sidebar_view selectRowIndexes:[NSIndexSet indexSetWithIndex:1] byExtendingSelection:NO];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
[o_sidebar_view setDropItem:playlistItem dropChildIndex:NSOutlineViewDropOnItemIndex];
[o_sidebar_view registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]];
@@@ -330,9 -331,6 +338,12 @@@
[o_fspanel center];
}
++<<<<<<< HEAD
+ // select playlist item by default
+ [o_sidebar_view selectRowIndexes:[NSIndexSet indexSetWithIndex:1] byExtendingSelection:NO];
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if (b_dark_interface) {
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(windowResizedOrMoved:) name: NSWindowDidResizeNotification object: nil];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(windowResizedOrMoved:) name: NSWindowDidMoveNotification object: nil];
@@@ -408,21 -406,17 +419,32 @@@
- (void)resizePlaylistAfterCollapse
{
++<<<<<<< HEAD
+ // no animation here since we might be in the middle of another resize animation
+ NSRect plrect;
+ plrect = [o_playlist_table frame];
+ plrect.size.height = [o_split_view frame].size.height - 20.0; // actual pl top bar height, which differs from its frame
+ [o_playlist_table setFrame: plrect];
+ [o_playlist_table setNeedsDisplay: YES];
++=======
+ NSRect plrect;
+ plrect = [o_playlist_table frame];
+ plrect.size.height = i_lastSplitViewHeight - 20.0; // actual pl top bar height, which differs from its frame
+ [[o_playlist_table animator] setFrame: plrect];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
NSRect rightSplitRect;
rightSplitRect = [o_right_split_view frame];
plrect = [o_dropzone_box frame];
plrect.origin.x = (rightSplitRect.size.width - plrect.size.width) / 2;
plrect.origin.y = (rightSplitRect.size.height - plrect.size.height) / 2;
++<<<<<<< HEAD
+ [o_dropzone_view setFrame: [o_playlist_table frame]];
+ [o_dropzone_box setFrame: plrect];
+ [o_dropzone_view setNeedsDisplay: YES];
++=======
+ [[o_dropzone_box animator] setFrame: plrect];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
- (void)makeSplitViewVisible
@@@ -473,21 -467,6 +495,24 @@@
// only exception for an controls bar button action
- (IBAction)togglePlaylist:(id)sender
{
++<<<<<<< HEAD
+ // Beware, this code is really ugly
+
+ /*
+ * sender can be:
+ * - nil if video playback is started or stopped
+ * - NSNumber with 1 if playlist item changes --> show video view
+ * - sender object if triggered through menu item or button
+ */
+ BOOL b_unhide_videoview = NO;
+ if([sender isKindOfClass: [NSNumber class]] && [sender intValue] == 1) {
+ b_unhide_videoview = YES;
+ sender = nil;
+ }
+
+ msg_Dbg(VLCIntf, "toggle playlist from state: removed splitview %i, minimized view %i. Sender is %p, unhide video view %i", b_splitview_removed, b_minimized_view, sender, b_unhide_videoview);
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if (![self isVisible] && sender != nil) {
[self makeKeyAndOrderFront: sender];
return;
@@@ -508,15 -487,12 +533,24 @@@
if (!(b_nativeFullscreenMode && b_fullscreen) && !b_splitview_removed && ((b_have_alt_key && b_activeVideo)
|| (b_nonembedded && sender != nil)
|| (!b_activeVideo && sender != nil)
++<<<<<<< HEAD
+ || (b_minimized_view && sender == nil && b_unhide_videoview == NO))) {
+ // for starting playback, window is resized through resized events
+ // for stopping playback, resize through reset to previous frame
+ [self hideSplitView: sender != nil];
+ b_minimized_view = NO;
+ } else {
+ if (b_splitview_removed) {
+ if (!b_nonembedded || (sender != nil && b_nonembedded))
+ [self showSplitView: sender != nil || b_unhide_videoview];
++=======
+ || b_minimized_view))
+ [self hideSplitView: sender != nil];
+ else {
+ if (b_splitview_removed) {
+ if (!b_nonembedded || (sender != nil && b_nonembedded))
+ [self showSplitView: sender != nil];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if (sender == nil)
b_minimized_view = YES;
@@@ -538,8 -514,6 +572,11 @@@
[o_video_view setHidden: YES];
}
}
++<<<<<<< HEAD
+
+ msg_Dbg(VLCIntf, "toggle playlist to state: removed splitview %i, minimized view %i", b_splitview_removed, b_minimized_view);
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
- (IBAction)dropzoneButtonAction:(id)sender
@@@ -778,15 -752,8 +815,20 @@@
BOOL b_videoPlayback = [[VLCMain sharedInstance] activeVideoPlayback];
if (!b_videoPlayback) {
++<<<<<<< HEAD
+ if (!b_nonembedded && (!b_nativeFullscreenMode || (b_nativeFullscreenMode && !b_fullscreen)) && frameBeforePlayback.size.width > 0 && frameBeforePlayback.size.height > 0) {
+
+ // only resize back to minimum view of this is still desired final state
+ float f_threshold_height = f_min_video_height + [o_controls_bar height];
+ if(frameBeforePlayback.size.height > f_threshold_height || b_minimized_view)
+ [[self animator] setFrame:frameBeforePlayback display:YES];
+ }
+
+ frameBeforePlayback = NSMakeRect(0, 0, 0, 0);
++=======
+ if (!b_nonembedded && (!b_nativeFullscreenMode || (b_nativeFullscreenMode && !b_fullscreen)) && frameBeforePlayback.size.width > 0 && frameBeforePlayback.size.height > 0)
+ [[self animator] setFrame:frameBeforePlayback display:YES];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
// update fs button to reflect state for next startup
if (var_InheritBool(VLCIntf, "fullscreen") || var_GetBool(pl_Get(VLCIntf), "fullscreen")) {
diff --combined modules/gui/macosx/VLCVoutWindowController.m
index ee30de9,ebc8fa1..ab854a8
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@@ -2,7 -2,7 +2,11 @@@
* VLCVoutWindowController.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2012-2013 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: 224f12a57a07d58a4659893eeb8291f57ff742b6 $
++=======
+ * $Id: fb934b80f74e761b8e88146644f2f946615168a2 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
* David Fuhrmann <david dot fuhrmann at googlemail dot com>
@@@ -94,7 -94,6 +98,10 @@@
BOOL b_no_video_deco_only = !b_video_wallpaper;
o_new_video_window = [[VLCVideoWindowCommon alloc] initWithContentRect:window_rect styleMask:mask backing:NSBackingStoreBuffered defer:YES];
[o_new_video_window setDelegate:o_new_video_window];
++<<<<<<< HEAD
+ [o_new_video_window setReleasedWhenClosed: NO];
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if (b_video_wallpaper)
[o_new_video_window setLevel:CGWindowLevelForKey(kCGDesktopWindowLevelKey) + 1];
@@@ -187,9 -186,10 +194,16 @@@
}
if (!b_video_wallpaper) {
++<<<<<<< HEAD
+ // set (only!) window origin if specified
+ if (b_nonembedded) {
+ NSRect window_rect = [o_new_video_window frame];
++=======
+ // set window size
+
+ if (b_nonembedded) {
+ NSRect window_rect = [o_new_video_window getWindowRectForProposedVideoViewSize:videoViewSize];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if (videoViewPosition.origin.x > 0.)
window_rect.origin.x = videoViewPosition.origin.x;
if (videoViewPosition.origin.y > 0.)
@@@ -211,7 -211,6 +225,10 @@@
[o_new_video_window setFrameTopLeftPoint: top_left_point];
}
++<<<<<<< HEAD
+ // resize window
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
[o_new_video_window setNativeVideoSize:videoViewSize];
[o_new_video_window makeKeyAndOrderFront: self];
diff --combined modules/gui/macosx/VideoEffects.m
index c98c985,de42e6c..ae071db
--- a/modules/gui/macosx/VideoEffects.m
+++ b/modules/gui/macosx/VideoEffects.m
@@@ -2,7 -2,7 +2,11 @@@
* VideoEffects.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2011-2012 Felix Paul Kühne
++<<<<<<< HEAD
+ * $Id: b435888ed1e36d39209c0b687894705397630e4f $
++=======
+ * $Id: 838e4c07dd3547ff0a732e0aaa648ab3361ee3d5 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
*
@@@ -520,12 -520,12 +524,21 @@@ static VLCVideoEffects *_o_sharedInstan
psz_string = config_GetPsz(p_intf, psz_filter_type);
if (b_on) {
++<<<<<<< HEAD
+ if (psz_string == NULL) {
+ psz_string = strdup(psz_name);
+ } else if (strstr(psz_string, psz_name) == NULL) {
+ char *psz_tmp = strdup([[NSString stringWithFormat: @"%s:%s", psz_string, psz_name] UTF8String]);
+ free(psz_string);
+ psz_string = psz_tmp;
++=======
+ if (!psz_string) {
+ free(psz_string);
+ psz_string = strdup(psz_name);
+ } else if (strstr(psz_string, psz_name) == NULL) {
+ free(psz_string);
+ psz_string = strdup([[NSString stringWithFormat: @"%s:%s", psz_string, psz_name] UTF8String]);
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
} else {
if (!psz_string)
diff --combined modules/gui/macosx/applescript.m
index d48a124,7b12cd9..159550b
--- a/modules/gui/macosx/applescript.m
+++ b/modules/gui/macosx/applescript.m
@@@ -2,7 -2,7 +2,11 @@@
* applescript.m: MacOS X AppleScript support
*****************************************************************************
* Copyright (C) 2002-2013 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: d570568d05bde52ee1cdb59bbf48fc103c5e37f7 $
++=======
+ * $Id: 947dbc8b7bade5939d5f0794b81568e9cfb9db64 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Derk-Jan Hartman <thedj at users.sourceforge.net>
* Felix Paul Kühne <fkuehne at videolan dot org>
@@@ -29,7 -29,6 +33,10 @@@
#import "applescript.h"
#import "CoreInteraction.h"
#import "playlist.h"
++<<<<<<< HEAD
+#import <vlc_url.h>
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/*****************************************************************************
* VLGetURLScriptCommand implementation
@@@ -47,31 -46,12 +54,40 @@@
if (o_url != nil)
[[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL: o_url];
++<<<<<<< HEAD
+ input_thread_t * p_input = pl_CurrentInput(VLCIntf);
+ BOOL b_returned = NO;
+
+ if (p_input) {
+ b_returned = input_AddSubtitle(p_input, [o_urlString UTF8String], true);
+ vlc_object_release(p_input);
+ if (!b_returned)
+ return nil;
+ }
+
+ char *psz_uri = vlc_path2uri([o_urlString UTF8String], NULL);
+ if (!psz_uri)
+ return nil;
+
+ NSDictionary *o_dic;
+ NSArray *o_array;
+ o_dic = [NSDictionary dictionaryWithObject:[NSString stringWithCString:psz_uri encoding:NSUTF8StringEncoding] forKey:@"ITEM_URL"];
+ free(psz_uri);
+
+ o_array = [NSArray arrayWithObject: o_dic];
+
+ if (b_autoplay)
+ [[[VLCMain sharedInstance] playlist] appendArray: o_array atPos: -1 enqueue: NO];
+ else
+ [[[VLCMain sharedInstance] playlist] appendArray: o_array atPos: -1 enqueue: YES];
++=======
+ NSArray *o_result = [NSArray arrayWithObject:[NSDictionary dictionaryWithObject:o_urlString forKey: @"ITEM_URL"]];
+
+ if (b_autoplay)
+ [[[VLCMain sharedInstance] playlist] appendArray: o_result atPos: -1 enqueue: NO];
+ else
+ [[[VLCMain sharedInstance] playlist] appendArray: o_result atPos: -1 enqueue: YES];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
}
return nil;
diff --combined modules/gui/macosx/intf.h
index e1e980c,6342fa8..fc91a6a
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@@ -2,7 -2,7 +2,11 @@@
* intf.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2013 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: 90a9fa25d36257441a743b0ae8457ac22be86da4 $
++=======
+ * $Id: fdb2ff1d1d4a36b9a9538aa991c133e6a95ba4f9 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Jon Lech Johansen <jon-vl at nanocrew.net>
* Derk-Jan Hartman <hartman at videolan dot org>
@@@ -213,9 -213,6 +217,12 @@@ struct intf_sys_
- (void)windowDidBecomeKey:(NSNotification *)o_notification;
- (void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event;
++<<<<<<< HEAD
+
+- (void)resetAndReinitializeUserDefaults;
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
@end
diff --combined modules/gui/macosx/intf.m
index 98b4cd0,ba850f9..9a360dc
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@@ -2,7 -2,7 +2,11 @@@
* intf.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2013 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: 6ca0e1cda951d6b76d363bbb774fd9c05d36992f $
++=======
+ * $Id: 0fe54cf2b086cc2762b86284aebe71c81ff86c2a $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Jon Lech Johansen <jon-vl at nanocrew.net>
* Derk-Jan Hartman <hartman at videolan.org>
@@@ -1064,7 -1064,7 +1068,11 @@@ static VLCMain *_o_sharedMainInstance
- (void)application:(NSApplication *)o_app openFiles:(NSArray *)o_names
{
++<<<<<<< HEAD
+ char *psz_uri = vlc_path2uri([[o_names objectAtIndex:0] UTF8String], NULL);
++=======
+ char *psz_uri = vlc_path2uri([[o_names objectAtIndex:0] UTF8String], "file");
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if (launched == NO) {
if (items_at_launch) {
@@@ -1082,7 -1082,7 +1090,11 @@@
input_thread_t * p_input = pl_CurrentInput(VLCIntf);
if (p_input) {
BOOL b_returned = NO;
++<<<<<<< HEAD
+ b_returned = input_AddSubtitle(p_input, [[o_names objectAtIndex:0] UTF8String], true);
++=======
+ b_returned = input_AddSubtitle(p_input, psz_uri, true);
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
vlc_object_release(p_input);
if (!b_returned) {
free(psz_uri);
@@@ -1350,11 -1350,8 +1362,16 @@@
var_AddCallback(p_current_input, "intf-event", InputEvent, [VLCMain sharedInstance]);
[self playbackStatusUpdated];
[o_mainmenu setRateControlsEnabled: YES];
++<<<<<<< HEAD
+
+ if ([self activeVideoPlayback] && [[o_mainwindow videoView] isHidden]) {
+ [o_mainwindow performSelectorOnMainThread:@selector(togglePlaylist:) withObject: [NSNumber numberWithInt:1] waitUntilDone:NO];
+ }
+
++=======
+ if ([self activeVideoPlayback] && [[o_mainwindow videoView] isHidden])
+ [o_mainwindow performSelectorOnMainThread:@selector(togglePlaylist:) withObject: nil waitUntilDone:NO];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
p_input_changed = vlc_object_hold(p_current_input);
}
}
@@@ -1884,24 -1881,10 +1901,31 @@@
#pragma mark -
#pragma mark Remove old prefs
++<<<<<<< HEAD
+
+static NSString * kVLCPreferencesVersion = @"VLCPreferencesVersion";
+static const int kCurrentPreferencesVersion = 3;
+
+- (void)resetAndReinitializeUserDefaults
+{
+ // note that [NSUserDefaults resetStandardUserDefaults] will NOT correctly reset to the defaults
+
+ NSString *appDomain = [[NSBundle mainBundle] bundleIdentifier];
+ [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:appDomain];
+
+ // set correct version to avoid question about outdated config
+ [[NSUserDefaults standardUserDefaults] setInteger:kCurrentPreferencesVersion forKey:kVLCPreferencesVersion];
+ [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
+- (void)removeOldPreferences
+{
++=======
+ - (void)removeOldPreferences
+ {
+ static NSString * kVLCPreferencesVersion = @"VLCPreferencesVersion";
+ static const int kCurrentPreferencesVersion = 3;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
int version = [defaults integerForKey:kVLCPreferencesVersion];
if (version >= kCurrentPreferencesVersion)
@@@ -1918,8 -1901,10 +1942,15 @@@
} else if (version == 2) {
/* version 2 (used by VLC 2.0.x and early versions of 2.1) can lead to exceptions within 2.1 or later
* so we reset the OS X specific prefs here - in practice, no user will notice */
++<<<<<<< HEAD
+ [self resetAndReinitializeUserDefaults];
+
++=======
+ [NSUserDefaults resetStandardUserDefaults];
+
+ [defaults setInteger:kCurrentPreferencesVersion forKey:kVLCPreferencesVersion];
+ [defaults synchronize];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
} else {
NSArray *libraries = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
NSUserDomainMask, YES);
@@@ -1941,17 -1926,16 +1972,30 @@@
return;
}
++<<<<<<< HEAD
+ // Do NOT add the current plist file here as this would conflict with caching.
+ // Instead, just reset below.
+ NSArray * ourPreferences = [NSArray arrayWithObjects:@"org.videolan.vlc", @"VLC", nil];
+
+ /* Move the file to trash one by one. Using above array the method would stop after first file
+ not found. */
+ for (NSString *file in ourPreferences) {
+ [[NSWorkspace sharedWorkspace] performFileOperation:NSWorkspaceRecycleOperation source:preferences destination:@"" files:[NSArray arrayWithObject:file] tag:nil];
+ }
+
+ [self resetAndReinitializeUserDefaults];
++=======
+ NSArray * ourPreferences = [NSArray arrayWithObjects:@"org.videolan.vlc.plist", @"VLC", @"org.videolan.vlc", nil];
+
+ /* Move the file to trash so that user can find them later */
+ [[NSWorkspace sharedWorkspace] performFileOperation:NSWorkspaceRecycleOperation source:preferences destination:nil files:ourPreferences tag:0];
+
+ /* really reset the defaults from now on */
+ [NSUserDefaults resetStandardUserDefaults];
+
+ [defaults setInteger:kCurrentPreferencesVersion forKey:kVLCPreferencesVersion];
+ [defaults synchronize];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
/* Relaunch now */
diff --combined modules/gui/macosx/simple_prefs.h
index 0eed640,7bc4fc8..69aded9
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@@ -2,7 -2,7 +2,11 @@@
* simple_prefs.h: Simple Preferences for Mac OS X
*****************************************************************************
* Copyright (C) 2008-2013 VLC authors and VideoLAN
++<<<<<<< HEAD
+* $Id: 106e1c4712956d76adc5104ed72e7219d1c2ced2 $
++=======
+ * $Id: d97ae1c41140676ea626b7dd6ec47d4d80250ea7 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
*
@@@ -107,8 -107,6 +111,11 @@@
IBOutlet id o_intf_luahttp_box;
IBOutlet id o_intf_luahttppwd_lbl;
IBOutlet id o_intf_luahttppwd_fld;
++<<<<<<< HEAD
+ IBOutlet id o_intf_pauseitunes_lbl;
+ IBOutlet id o_intf_pauseitunes_pop;
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
IBOutlet id o_osd_encoding_pop;
IBOutlet id o_osd_encoding_txt;
diff --combined modules/gui/macosx/simple_prefs.m
index 38bb51d,cf0fb79..af52fe1
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@@ -2,7 -2,7 +2,11 @@@
* simple_prefs.m: Simple Preferences for Mac OS X
*****************************************************************************
* Copyright (C) 2008-2013 VLC authors and VideoLAN
++<<<<<<< HEAD
+* $Id: 387873de8e5c3d1198331fc51fb3c94f5f130056 $
++=======
+ * $Id: 41f8c0ab42a26b54ab1ac25bce038e1d6cbf2104 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
*
@@@ -371,7 -371,6 +375,10 @@@ create_toolbar_item(NSString * o_itemId
[o_intf_pauseminimized_ckb setTitle: _NS("Pause the video playback when minimized")];
[o_intf_luahttp_box setTitle:_NS("Lua HTTP")];
[o_intf_luahttppwd_lbl setStringValue:_NS("Password")];
++<<<<<<< HEAD
+ [o_intf_pauseitunes_lbl setStringValue:_NS("Control iTunes during playback")];
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/* Subtitles and OSD */
[o_osd_encoding_txt setStringValue: _NS("Default Encoding")];
@@@ -605,7 -604,6 +612,10 @@@ static inline char * __config_GetLabel(
[self setupButton: o_intf_autoresize_ckb forBoolValue: "macosx-video-autoresize"];
[self setupButton: o_intf_pauseminimized_ckb forBoolValue: "macosx-pause-minimized"];
[self setupField: o_intf_luahttppwd_fld forOption: "http-password"];
++<<<<<<< HEAD
+ [self setupButton: o_intf_pauseitunes_pop forIntList: "macosx-control-itunes"];
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/******************
* audio settings *
@@@ -863,7 -861,8 +873,12 @@@
config_SaveConfigFile(p_intf);
/* reset OS X defaults */
++<<<<<<< HEAD
+ [[VLCMain sharedInstance] resetAndReinitializeUserDefaults];
++=======
+ [NSUserDefaults resetStandardUserDefaults];
+ [[NSUserDefaults standardUserDefaults] synchronize];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/* Relaunch now */
const char * path = [[[NSBundle mainBundle] executablePath] UTF8String];
@@@ -984,8 -983,6 +999,11 @@@ static inline void save_module_list(int
}
config_PutPsz(p_intf, "http-password", [[o_intf_luahttppwd_fld stringValue] UTF8String]);
++<<<<<<< HEAD
+ SaveIntList(o_intf_pauseitunes_pop, "macosx-control-itunes");
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/* activate stuff without restart */
if ([o_intf_appleremote_ckb state] == YES)
[[[VLCMain sharedInstance] appleRemoteController] startListening: [VLCMain sharedInstance]];
diff --combined modules/gui/macosx/wizard.m
index 38b3910,07281ab..8813841
--- a/modules/gui/macosx/wizard.m
+++ b/modules/gui/macosx/wizard.m
@@@ -2,7 -2,7 +2,11 @@@
* wizard.m: MacOS X Streaming Wizard
*****************************************************************************
* Copyright (C) 2005-2013 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: e8c832fc6abcc51176ad611f4aed5a6d3eaf7fe8 $
++=======
+ * $Id: 082b1e9105df5f683c9992617090bba6b66f9a33 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>,
* Brendon Justin <brendonjustin at gmail.com>
@@@ -1097,7 -1097,7 +1101,11 @@@ static VLCWizard *_o_sharedInstance = n
NSMutableArray * tempArray = [[NSMutableArray alloc] init];
int x = 0;
int y = [[o_userSelections objectForKey:@"pathToStrm"] count];
++<<<<<<< HEAD
+ NSString * tempString = [[NSString alloc] init];
++=======
+ NSMutableString * tempString = [[NSMutableString alloc] init];
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
while( x != y)
{
NSString * fileNameToUse;
diff --combined modules/gui/qt4/components/sout/profile_selector.cpp
index 9b38f22,0bfe919..9cc7af1
--- a/modules/gui/qt4/components/sout/profile_selector.cpp
+++ b/modules/gui/qt4/components/sout/profile_selector.cpp
@@@ -2,7 -2,7 +2,11 @@@
* profile_selector.cpp : A small profile selector and editor
****************************************************************************
* Copyright (C) 2009 the VideoLAN team
++<<<<<<< HEAD
+ * $Id: b9f7ea84c257ea8d4fba110876a121152559612d $
++=======
+ * $Id: 5b5a724e309f705912f3ce6096526c21fe606453 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Jean-Baptiste Kempf <jb at videolan.org>
*
@@@ -287,6 -287,10 +291,13 @@@ void VLCProfileSelector::updateOptions
HASHPICK( "vcodec", "height" );
if ( !value.isEmpty() && value.toInt() > 0 )
smrl.option( "height", value );
++<<<<<<< HEAD
++=======
+ } else {
+ HASHPICK( "video", "copy" );
+ if ( ! value.isEmpty() )
+ smrl.option( "vcodec", "copy" );
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
} else {
smrl.option( "vcodec", "none" );
@@@ -316,6 -320,10 +327,13 @@@
smrl.option( "afilter", valuesList.join( ":" ) );
}
++<<<<<<< HEAD
++=======
+ } else {
+ HASHPICK( "audio", "copy" );
+ if ( ! value.isEmpty() )
+ smrl.option( "acodec", "copy" );
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
} else {
smrl.option( "acodec", "none" );
diff --combined modules/gui/qt4/input_manager.cpp
index 454f2cb,a7244d0..738f118
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@@ -2,7 -2,7 +2,11 @@@
* input_manager.cpp : Manage an input and interact with its GUI elements
****************************************************************************
* Copyright (C) 2006-2008 the VideoLAN team
++<<<<<<< HEAD
+ * $Id: 2384170abf87c254419474fd1c94ace679caffd4 $
++=======
+ * $Id: bd32de63841e6ed8a6d353921f3226d359b58f6f $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Clément Stenac <zorglub at videolan.org>
* Ilkka Ollakka <ileoo at videolan.org>
@@@ -167,7 -167,6 +171,10 @@@ void InputManager::delInput(
/* Reset all InfoPanels but stats */
emit artChanged( NULL );
++<<<<<<< HEAD
+ emit artChanged( "" );
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
emit infoChanged( NULL );
emit currentMetaChanged( (input_item_t *)NULL );
@@@ -951,8 -950,11 +958,16 @@@ void InputManager::setAtoB(
/* Function called regularly when in an AtoB loop */
void InputManager::AtoBLoop( float, int64_t i_time, int )
{
++<<<<<<< HEAD
+ if( timeB && i_time >= timeB )
+ var_SetTime( THEMIM->getInput(), "time" , timeA );
++=======
+ if( timeB )
+ {
+ if( i_time >= timeB || i_time < timeA )
+ var_SetTime( THEMIM->getInput(), "time" , timeA );
+ }
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
/**********************************************************************
diff --combined modules/packetizer/flac.c
index d592e4f,7e43334..248ab75
--- a/modules/packetizer/flac.c
+++ b/modules/packetizer/flac.c
@@@ -2,7 -2,7 +2,11 @@@
* flac.c: flac packetizer module.
*****************************************************************************
* Copyright (C) 1999-2001 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: 090b60160eae10a9b4e68618f5e2d7aafb459b26 $
++=======
+ * $Id: 16d3c46b1fb9824bdbacb8a0a428c9c3654119e1 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Gildas Bazin <gbazin at videolan.org>
* Sigmund Augdal Helberg <dnumgis at videolan.org>
@@@ -248,6 -248,7 +252,10 @@@ static block_t *Packetize( decoder_t *p
while( 1 )
{
++<<<<<<< HEAD
++=======
+ int previous_size;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
switch( p_sys->i_state )
{
case STATE_NOSYNC:
@@@ -315,6 -316,8 +323,11 @@@
/* TODO: If pp_block == NULL, flush the buffer without checking the
* next sync word */
++<<<<<<< HEAD
++=======
+ previous_size = 0; /* Try to return the biggest frame */
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
/* Check if next expected frame contains the sync word */
while( block_PeekOffsetBytes( &p_sys->bytestream,
p_sys->i_frame_size, p_header,
@@@ -330,13 -333,27 +343,37 @@@
&p_sys->i_rate,
&p_sys->i_bits_per_sample );
++<<<<<<< HEAD
+ if( i_frame_length )
+ {
+ p_sys->i_state = STATE_SEND_DATA;
+ break;
+ }
+ }
+ p_sys->i_frame_size++;
++=======
+ if( i_frame_length ) {
+ if( !p_sys->b_stream_info || p_sys->stream_info.max_framesize <= 0 ) {
+ /* Stop immediately if we don't know the maximum framesize */
+ p_sys->i_state = STATE_SEND_DATA;
+ break;
+ }
+ previous_size = p_sys->i_frame_size;
+ }
+ }
+ p_sys->i_frame_size++;
+
+ if( p_sys->b_stream_info && p_sys->stream_info.max_framesize > 0 &&
+ p_sys->i_frame_size > p_sys->stream_info.max_framesize )
+ break;
+ }
+
+ if (previous_size)
+ {
+ /* Use the largest frame size */
+ p_sys->i_frame_size = previous_size;
+ p_sys->i_state = STATE_SEND_DATA;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
if( p_sys->i_state != STATE_SEND_DATA )
diff --combined modules/text_renderer/freetype.c
index 1c45c9f,eae8a7c..6b03219
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@@ -2,7 -2,7 +2,11 @@@
* freetype.c : Put text on the video, using freetype2
*****************************************************************************
* Copyright (C) 2002 - 2012 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: c27ec4558956f00b1fd2b448fa07d680a2be5c82 $
++=======
+ * $Id: 05fa2a21a3ab873960a34d9fe474421364404454 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Sigmund Augdal Helberg <dnumgis at videolan.org>
* Gildas Bazin <gbazin at videolan.org>
@@@ -90,11 -90,10 +94,18 @@@
#endif
/* Freetype */
++<<<<<<< HEAD
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_STROKER_H
+#include FT_SYNTHESIS_H
++=======
+ #include <freetype/ftsynth.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #include FT_STROKER_H
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#define FT_FLOOR(X) ((X & -64) >> 6)
#define FT_CEIL(X) (((X + 63) & -64) >> 6)
@@@ -2622,11 -2621,7 +2633,15 @@@ static int RenderCommon( filter_t *p_fi
strlen( p_region_in->psz_html ),
true );
if( unlikely(p_sub == NULL) )
++<<<<<<< HEAD
+ {
+ free( psz_text );
+ free( pp_styles );
+ return VLC_SUCCESS;
+ }
++=======
+ return VLC_SUCCESS;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
xml_reader_t *p_xml_reader = p_filter->p_sys->p_xml;
if( !p_xml_reader )
diff --combined modules/video_filter/deinterlace/deinterlace.c
index dadeef3,80e66f2..439c1ea
--- a/modules/video_filter/deinterlace/deinterlace.c
+++ b/modules/video_filter/deinterlace/deinterlace.c
@@@ -2,7 -2,7 +2,11 @@@
* deinterlace.c : deinterlacer plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2011 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: e6a0b0fb196fcb1a8aaa26a96394fb4dd9da1d12 $
++=======
+ * $Id: f7d5f64f8035ea4f18e93a250b1aaf580caa5b21 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Author: Sam Hocevar <sam at zoy.org>
* Christophe Massiot <massiot at via.ecp.fr>
@@@ -642,14 -642,13 +646,21 @@@ notsupp
if( !p_sys )
return VLC_ENOMEM;
++<<<<<<< HEAD
+ p_sys->chroma = chroma;
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
config_ChainParse( p_filter, FILTER_CFG_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
char *psz_mode = var_InheritString( p_filter, FILTER_CFG_PREFIX "mode" );
SetFilterMethod( p_filter, psz_mode, packed );
free( psz_mode );
++<<<<<<< HEAD
++=======
+ p_sys->chroma = chroma;
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
for( int i = 0; i < METADATA_SIZE; i++ )
{
p_sys->meta.pi_date[i] = VLC_TS_INVALID;
diff --combined po/ach.po
index 5aac663,c507dc9..4b0a493
--- a/po/ach.po
+++ b/po/ach.po
@@@ -4,7 -4,7 +4,11 @@@ msgid "
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2011-02-04 19:14+0200\n"
"Last-Translator: Alfred John <agwanta2004 at yahoo.co.uk>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@@ -141,7 -141,7 +145,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -470,10 -470,10 +478,17 @@@ msgid "&About
msgstr "&Maromo"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -512,17 -512,17 +527,29 @@@ msgid "Save...
msgstr "Gwoki..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Nwo Weng"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Nwo acel"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -603,7 -603,7 +630,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Disable"
msgstr "Ket itic"
@@@ -1318,20 -1318,20 +1349,36 @@@ msgstr "Rwom me Purem
msgid "Decoded format"
msgstr "Gigonyo tere"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1747,7 -1747,7 +1794,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1836,7 -1836,7 +1887,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Peke"
@@@ -1861,7 -1861,7 +1916,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Mi video"
@@@ -2062,7 -2062,7 +2121,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Kare lung tye ki wie malo"
@@@ -2115,7 -2115,7 +2178,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2124,7 -2124,7 +2191,11 @@@ msgstr "Kwanyo woko ki i wang kaneno
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Yore me kwanyo i wang kaneno"
@@@ -2182,7 -2182,7 +2253,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Dirija ma kideyo"
@@@ -2365,7 -2365,7 +2440,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Kal purem "
@@@ -2499,12 -2499,12 +2578,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2512,7 -2512,7 +2600,11 @@@ msgid "Default
msgstr "Manen jwi"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2835,7 -2835,7 +2927,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3696,7 -3696,7 +3792,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Caa woko"
@@@ -3723,8 -3723,8 +3823,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3811,10 -3811,10 +3916,17 @@@ msgid "Slower (fine)
msgstr "Motmot (fine)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3827,10 -3827,10 +3939,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Mukato angec"
@@@ -3839,9 -3839,9 +3958,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4093,9 -4093,9 +4218,15 @@@ msgid "Select the key to decrease audi
msgstr "Yer fail ma ibino gwoko iyie"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Jwik manok"
@@@ -4561,7 -4561,7 +4692,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Cal macek"
@@@ -4776,12 -4776,12 +4911,21 @@@ msgstr "Gol Rwako iyie
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Jwik woko"
@@@ -5556,7 -5556,7 +5700,11 @@@ msgstr "Ngol woko
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "Bakacic- me lac ki bor pa cal ma i TV"
@@@ -8041,7 -8041,7 +8189,11 @@@ msgstr "Gin aketa me kaneno
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Ka neno"
@@@ -8854,7 -8854,7 +9006,11 @@@ msgstr "
msgid "Volume Set"
msgstr "Dwon"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10037,7 -10037,7 +10193,11 @@@ msgstr "Langete:
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "Fail me wer"
@@@ -10073,7 -10073,7 +10233,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "Kite me yiko Wer"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "Kite me yiko Wer"
@@@ -10083,32 -10083,32 +10247,56 @@@
msgid "Last audio device"
msgstr "Giketo jami me awinya"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
++=======
+ #: modules/audio_output/auhal.c:578
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio device is not configured"
msgstr "Nying giketo gin awinya"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Kite me yiko Wer"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -11351,46 -11351,46 +11539,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Col"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Ma laburuburu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Maryeny"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Tar"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Marema mito col"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Makwar"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11398,61 -11398,61 +11614,97 @@@ msgid "Fuchsia
msgstr "Fuchsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Yelo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Olive"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Ma lalum"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Teal"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lime"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Papul"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Navy"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Bululu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11590,7 -11590,7 +11842,11 @@@ msgstr "Wi wer Maditu
msgid "Subtitle renderers using libass"
msgstr "Niango wie matino"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13457,10 -13457,10 +13713,17 @@@ msgid "Fast
msgstr "Me oyoto"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Majwi"
@@@ -13578,8 -13578,8 +13841,13 @@@ msgid "D-Bus control interface
msgstr "Qt kaneno"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13943,9 -13943,9 +14211,15 @@@ msgstr "
msgid "Opening"
msgstr "Yab"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Cung manok"
@@@ -15942,7 -15942,7 +16216,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG yo tero jami makubere akuba"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Ngec ma jenge i coc ma i TV"
@@@ -16135,7 -16135,7 +16413,11 @@@ msgid "VLC media player Help
msgstr "Kony me gi tuku wer me VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Ka nongo"
@@@ -16230,9 -16230,9 +16512,15 @@@ msgstr "Ket nying pi kagwoko manyen men
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Gwok"
@@@ -16377,7 -16377,7 +16665,11 @@@ msgstr "Gin manyen pe ononge
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Jami myero med matye ka tuku onyo ma gi cungo pi kagwok me tic."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Pye I cawa"
@@@ -16398,7 -16398,7 +16690,11 @@@ msgstr "
msgid "Backward"
msgstr "Dok I yongec"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16409,7 -16409,7 +16705,11 @@@ msgstr "
msgid "Forward"
msgstr "Mede Anyim"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16430,89 -16430,89 +16730,160 @@@ msgstr "Wang kaneno matye Madit
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "Yer fail ma ibino gwoko iyie"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "Nyut wer"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "Nwo:"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "Yer fail ma ibino gwoko iyie"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "Dwon matidi"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Adwogi"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -16554,7 -16554,7 +16925,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16751,8 -16751,8 +17126,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Lakite meri"
@@@ -16845,37 -16845,37 +17225,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "Latuku me VLC"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Pe ginongo jami mo mamito timo oyoto"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Pe ginongo jami mo mamito timo oyoto"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Mede kwede"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Pe onongo lanen mo ma nyutu bunyere mukato."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "kwany woko ma con macwinyi omito?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Wan wa tyeko nongo woko VLC me cik macon pi fail ma imaro."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Dir I dwok ika yugi ki I nwo nongo VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Pe onongo lanen mo ma nyutu bunyere mukato."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "kwany woko ma con macwinyi omito?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Wan wa tyeko nongo woko VLC me cik macon pi fail ma imaro."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Dir I dwok ika yugi ki I nwo nongo VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "Ket kite iyik Dul me VLC (%s).rtfd"
@@@ -17033,7 -17033,7 +17445,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Pung Rwome odoco"
@@@ -17174,7 -17174,7 +17590,11 @@@ msgstr "Kan VLC
msgid "Hide Others"
msgstr "Kan mukene"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Nyut gin weng"
@@@ -17265,15 -17265,15 +17685,27 @@@ msgstr "&Lub Yiko
msgid "A→B Loop"
msgstr "Cako A->B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Wek woko iyonge Tuku cen"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Mede Anyim"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Wek woko iyonge Tuku cen"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Mede Anyim"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Dok I yongec"
@@@ -17289,30 -17289,30 +17721,56 @@@ msgstr "Dwok Dwone
msgid "Audio Device"
msgstr "Giketo jami me awinya"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Nucu me Kite"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Kite kikome"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Kit ma odoke"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Maromo wang kaneno weng"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Nucu me Kite"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Kite kikome"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Kit ma odoke"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Maromo wang kaneno weng"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Lyer Iwie"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Gin me Video ma i kaneno lung"
@@@ -17321,7 -17321,7 +17779,11 @@@
msgid "Post processing"
msgstr "Yubu gin acwala"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Fail me Wie matino"
@@@ -17562,7 -17562,7 +18024,11 @@@ msgid "Play another media synchronously
msgstr "Tuk ki gituku mukene benebene"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Yer..."
@@@ -17749,7 -17749,7 +18215,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Niango wie matino"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Kit coc"
@@@ -17981,12 -17981,12 +18451,20 @@@ msgstr "Bal onoge icawa me kano jami
msgid "VLC was unable to save the meta data."
msgstr "VCL pe okano jami man."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Yore ma imito"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Nwo tera weng"
@@@ -18170,133 -18170,128 +18648,241 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Gik ki ituko"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Gonyo lok kit Majwi"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Yiko kite me Nyute"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Gonyo lok kit Majwi"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Yiko kite me Nyute"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Rangi me coc"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Kite"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Leb me Wie matino"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Leb matino mameri"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Mi OSD ti"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Mi OSD ti"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Ma pe nen"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "Lok rangi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Wang kaneno matye Madit"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Wang kaneno matye Madit"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Yaro kamaler"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Kite me kwanyo"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Cal matino ma ikom Video"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Boc"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Kite ne"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Ki ilangete macen"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Keto namba malube"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Kineno me agiki iyi: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Fud pe kineno"
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Kite me kwanyo"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Cal matino ma ikom Video"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Boc"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Kite ne"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Ki ilangete macen"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Keto namba malube"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Kineno me agiki iyi: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Fud pe kineno"
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Lyeto matidi maloyo"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Lyeto matidi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Lyeto madit"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Lyeto madit maloyo"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Dwok yore mere bed kite macon"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18309,21 -18304,21 +18895,38 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Yer folda weki igwoki ginanena ma imako oyoto iye."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Yer"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Yer folda weki igwoki ginanena ma imako oyoto iye."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Yer"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the directory or filename where the records will be stored."
msgstr "Pe giyero kagwoko me kano fail"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18331,17 -18326,17 +18934,30 @@@ msgstr "
"Di luyab manyen pi\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Coko ma pe konyo"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Coko ma pe konyo"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"Icwer cwiny, luyab magi pe watwero miyo bedo bala yo macek pi layab matek"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Man ma gicoko \"%@\" otyeko kwanyo oko. "
@@@ -20367,21 -20362,21 +20983,37 @@@ msgstr "ywee lok ikome ma iyero
msgid "Create a new profile"
msgstr "Ket lok ikome manyen"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Yab"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid " Profile Name Missing"
msgstr "Nying ngec makiryeyo"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Myero iter nying pi lok ikome"
@@@ -23887,47 -23882,47 +24519,83 @@@ msgstr "Coc maceto woko ma ginongo
msgid "Overlays/Subtitles"
msgstr "Ket iwi wie madit ikom cal anena"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font size in pixels"
msgstr "Kit me nukuta, nyig cal"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "Ma pe nen"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23936,98 -23931,98 +24604,178 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "Pimo kit Video"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "Polici ma kwako mako maka-ka ginmo mamite"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "Ma pe nen"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "Rangi me coc"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Smaller"
msgstr "Dwon matidi"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/af.po
index 93aa7b1,ddc8c87..52b7957
--- a/po/af.po
+++ b/po/af.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2011-02-12 23:51+0200\n"
"Last-Translator: F Wolff <friedel at translate.org.za>\n"
"Language-Team: translate-discuss-af at lists.sourceforge.net\n"
@@@ -140,7 -140,7 +144,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -469,10 -469,10 +477,17 @@@ msgid "&About
msgstr "Aangaande"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -511,17 -511,17 +526,29 @@@ msgid "Save...
msgstr ""
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Herhaal almal"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Herhaal een"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -602,7 -602,7 +629,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Deaktiveer"
@@@ -1312,20 -1312,20 +1343,36 @@@ msgstr "Raam tempo
msgid "Decoded format"
msgstr "Gedekodeer"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1732,7 -1732,7 +1779,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1817,7 -1817,7 +1868,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Geen"
@@@ -1842,7 -1842,7 +1897,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Aktiveer video"
@@@ -2044,7 -2044,7 +2103,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Altyd bo-op"
@@@ -2097,7 -2097,7 +2160,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2107,7 -2107,7 +2174,11 @@@ msgstr "Ontvleg
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2163,7 -2163,7 +2234,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Vensterversierings"
@@@ -2344,7 -2344,7 +2419,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2477,12 -2477,12 +2556,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2490,7 -2490,7 +2578,11 @@@ msgid "Default
msgstr "Verstek"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2813,7 -2813,7 +2905,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3674,7 -3674,7 +3770,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignoreer"
@@@ -3700,8 -3700,8 +3800,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3787,10 -3787,10 +3892,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3803,10 -3803,10 +3915,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Vorige"
@@@ -3815,9 -3815,9 +3934,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4071,9 -4071,9 +4196,15 @@@ msgid "Select the key to decrease audi
msgstr "Kies die lêer om na te stoor"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Maak stil"
@@@ -4539,7 -4539,7 +4670,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Kiekie"
@@@ -4749,12 -4749,12 +4884,21 @@@ msgstr "Laai inprop af
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Kanselleer"
@@@ -5527,7 -5527,7 +5671,11 @@@ msgstr "Snoei
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "Aspekverhouding"
@@@ -8012,7 -8012,7 +8160,11 @@@ msgstr "Skerm
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Skerm"
@@@ -8836,7 -8836,7 +8988,11 @@@ msgstr "
msgid "Volume Set"
msgstr "Volume"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10025,7 -10025,7 +10181,11 @@@ msgstr "Klank:
msgid "ALSA audio output"
msgstr "Stroom-lewering"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "Afvoer lêer"
@@@ -10061,7 -10061,7 +10221,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "Stroom-lewering"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "Oudio-instelings"
@@@ -10071,32 -10071,32 +10235,56 @@@
msgid "Last audio device"
msgstr "Klanktoestel"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
++=======
+ #: modules/audio_output/auhal.c:578
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio device is not configured"
msgstr "Klanktoestel-naam"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Video kodeks"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -11337,32 -11337,32 +11525,52 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Swart"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Grys"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Silwer"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Wit"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
#, fuzzy
@@@ -11370,14 -11370,14 +11578,22 @@@ msgid "Maroon
msgstr "Maroen"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Rooi"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11385,61 -11385,61 +11601,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Geel"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Olyf"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Groen"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lemmetjie"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Pers"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Blou"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11578,7 -11578,7 +11830,11 @@@ msgstr "Ondertitels-enkodering
msgid "Subtitle renderers using libass"
msgstr "Ondertitels-enkodering"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13456,10 -13456,10 +13712,17 @@@ msgid "Fast
msgstr "Vinniger"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normaal"
@@@ -13578,8 -13578,8 +13841,13 @@@ msgid "D-Bus control interface
msgstr "Beheer koppelvlak"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13942,9 -13942,9 +14210,15 @@@ msgstr "
msgid "Opening"
msgstr "Open"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Laat wag"
@@@ -15948,7 -15948,7 +16222,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG-vervoerstroom"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -16143,7 -16143,7 +16421,11 @@@ msgid "VLC media player Help
msgstr "VLC-mediaspeler-hulp"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Indeks"
@@@ -16238,9 -16238,9 +16520,15 @@@ msgstr "Tik naam vir die nuwe gids:
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Stoor"
@@@ -16387,7 -16387,7 +16675,11 @@@ msgstr "Geen toevoer gevind nie
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Die stroom moet speel of wagtend wees vir boekmerke om te werk."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Spring na tyd"
@@@ -16408,7 -16408,7 +16700,11 @@@ msgstr "
msgid "Backward"
msgstr "Gaan agtertoe"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16419,7 -16419,7 +16715,11 @@@ msgstr "
msgid "Forward"
msgstr "Gaan vorentoe"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16440,89 -16440,89 +16740,160 @@@ msgstr "Swart skerms in volskerm
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "Kies die lêer om na te stoor"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "Wys speellys"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "Herhaal almal"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "Kies die lêer om na te stoor"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "Verstekvolume"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Effekte"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -16563,7 -16563,7 +16934,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16760,8 -16760,8 +17135,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -16854,37 -16854,37 +17234,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "VLC-mediaspeler"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Geen omvalstaaflêer gevind nie"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Geen omvalstaaflêer gevind nie"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Gaan voort"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Kon nie enige spoor van vorige omval vind nie."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Verwyder ou voorkeure?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "'n Ouer weergawe van VLC se voorkeurlêers is pas gevind."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Skuif na die asblik en herbegin VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Kon nie enige spoor van vorige omval vind nie."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Verwyder ou voorkeure?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "'n Ouer weergawe van VLC se voorkeurlêers is pas gevind."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Skuif na die asblik en herbegin VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -17045,7 -17045,7 +17457,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Lock Aspect Ratio"
msgstr "Sluit aspekverhouding vas"
@@@ -17186,7 -17186,7 +17602,11 @@@ msgstr "Versteek VLC
msgid "Hide Others"
msgstr "Versteek ander"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show All"
msgstr "Wys alle"
@@@ -17280,16 -17280,16 +17700,28 @@@ msgstr "&Baansinchronisasie
msgid "A→B Loop"
msgstr "A->B-lus"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Quit after Playback"
msgstr "Sluit af na terugspeel"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Gaan vorentoe"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Gaan vorentoe"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Gaan agtertoe"
@@@ -17305,30 -17305,30 +17737,56 @@@ msgstr "Sagter
msgid "Audio Device"
msgstr "Klanktoestel"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Halfgrootte"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Normale grootte"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dubbelgrootte"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Pas by skerm"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Halfgrootte"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Normale grootte"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dubbelgrootte"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Pas by skerm"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Sweef bo-op"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -17337,7 -17337,7 +17795,11 @@@
msgid "Post processing"
msgstr "Náverwerking"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Onderskrifte-lêer"
@@@ -17580,7 -17580,7 +18042,11 @@@ msgid "Play another media synchronously
msgstr "Speel 'n ander medium sinchronies"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Kies..."
@@@ -17768,7 -17768,7 +18234,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Ondertitels-enkodering"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Lettergrootte"
@@@ -18002,12 -18002,12 +18472,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr "VLC kon nie die metadata stoor nie."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Voorkeure"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Stel almal terug"
@@@ -18194,25 -18194,21 +18672,41 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Verstek enkod"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Verstek enkod"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
#, fuzzy
msgid "Font color"
msgstr "Skrifkleur"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
@@@ -18220,112 -18216,112 +18714,204 @@@
msgid "Font"
msgstr "Skriftipe"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Taal vir onderskrifte"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Voorkeurtaal vir onderskrifte"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Ondeursigtigheid"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Force bold"
msgstr "Dwing IPv6"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "Omgekeerde kleure"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Black screens in Fullscreen mode"
msgstr "Swart skerms in volskerm"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
#, fuzzy
msgid "Display"
msgstr "Vertoon"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Afvoervolume"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Gids"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Formaat"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Afvoervolume"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Gids"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Formaat"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Sequential numbering"
msgstr "Sekwensiële nommers"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Stel voorkeure terug"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18338,36 -18334,36 +18924,66 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the directory or filename where the records will be stored."
msgstr "'n Gids waar die lêers gestoor moet word, moet gekies word."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -20501,20 -20497,20 +21117,36 @@@ msgstr "Skrap gekose profiel
msgid "Create a new profile"
msgstr "Skep 'n nuwe profiel"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Skep"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "U moet 'n naam gee vir die profiel."
@@@ -24058,47 -24054,47 +24690,83 @@@ msgstr "Stroom-lewering
msgid "Overlays/Subtitles"
msgstr "Open ondertitels"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font size in pixels"
msgstr "Lettergrootte"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "Ondeursigtigheid"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24107,102 -24103,102 +24775,182 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "Agtergrond"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "Agtergrond"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "Ondeursigtigheid"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
++=======
+ #: modules/text_renderer/freetype.c:187
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow opacity"
msgstr "Lukraak af"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "Lukraak af"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
++=======
+ #: modules/text_renderer/freetype.c:189
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow angle"
msgstr "Lukraak af"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:191
++=======
+ #: modules/text_renderer/freetype.c:190
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow distance"
msgstr "Lukraak af"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Smaller"
msgstr "Klein"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Klein"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Groot"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Larger"
msgstr "Groot"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/am.po
index 1665fe0,209029b..5cd6310
--- a/po/am.po
+++ b/po/am.po
@@@ -5,7 -5,7 +5,11 @@@ msgid "
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2011-04-06 00:53+0200\n"
"Last-Translator: Solomon Gizaw <solohavi at yahoo.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@@ -142,7 -142,7 +146,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -468,10 -468,10 +476,17 @@@ msgid "&About
msgstr "&ስለ"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -510,17 -510,17 +525,29 @@@ msgid "Save...
msgstr "አስቀáˆáŒ¥ "
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "áˆáˆ‰áŠ•áˆ ድገሠ"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "አንድን ድገሠ"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -601,7 -601,7 +628,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Disable"
msgstr "አንቃ "
@@@ -1316,20 -1316,20 +1347,36 @@@ msgstr "የንዑስ áŠáˆá áጥáŠ
msgid "Decoded format"
msgstr "ስá‹áˆáŠá‰± የተገለጠ"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1744,7 -1744,7 +1791,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1833,7 -1833,7 +1884,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "áˆáŠ•áˆ "
@@@ -1858,7 -1858,7 +1913,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "ቪድዮ አንቃ "
@@@ -2059,7 -2059,7 +2118,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "áˆáˆáŒŠá‹œ ከላዠ"
@@@ -2112,7 -2112,7 +2175,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2121,7 -2121,7 +2188,11 @@@ msgstr "á‹«áˆá‰°á‰†áˆ‹áˆˆáˆ
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "የአለመቆለá áˆáŠá‰³"
@@@ -2179,7 -2179,7 +2250,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "የመስኮት ጌጦች "
@@@ -2362,7 -2362,7 +2437,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "ንዑስ áŠáˆáŽá‰½áŠ• á‹áˆˆáˆ "
@@@ -2496,12 -2496,12 +2575,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2509,7 -2509,7 +2597,11 @@@ msgid "Default
msgstr "áŠá‰£áˆª "
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2832,7 -2832,7 +2924,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3693,7 -3693,7 +3789,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "ተዠ"
@@@ -3720,8 -3720,8 +3820,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3808,10 -3808,10 +3913,17 @@@ msgid "Slower (fine)
msgstr "á‹áŒ ያለ (ደህና) "
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3824,10 -3824,10 +3936,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "ቀዳሚ "
@@@ -3836,9 -3836,9 +3955,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4090,9 -4090,9 +4215,15 @@@ msgid "Select the key to decrease audi
msgstr "የሚቀመጠá‹áŠ• á‹á‹áˆ áˆáˆ¨áŒ¥ "
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "ድáˆá€-ከáˆ"
@@@ -4558,7 -4558,7 +4689,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "ቅá…በተ áŽá‰¶"
@@@ -4772,12 -4772,12 +4907,21 @@@ msgstr "ተሰኪ አá‹áˆá‹µ
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "ሰáˆá‹ "
@@@ -5552,7 -5552,7 +5696,11 @@@ msgstr "ከáˆáŠáˆ
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "áˆáŒ¥áŒ¥áŠ ገá…ታ"
@@@ -8035,7 -8035,7 +8183,11 @@@ msgstr "የማያ መቅረጫ áŒá‰¢á‰
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "ማያ"
@@@ -8848,7 -8848,7 +9000,11 @@@ msgstr "
msgid "Volume Set"
msgstr "የድáˆáŒ½ መጠን "
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10030,7 -10030,7 +10186,11 @@@ msgstr "የዶáˆá‰¢ áŠá‰ ብá¡
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "የተሰሚ á‹á‹áˆŽá‰½ "
@@@ -10066,7 -10066,7 +10226,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "የተሰሚ ቅንብሮች "
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "የተሰሚ ቅንብሮች "
@@@ -10076,32 -10076,32 +10240,56 @@@
msgid "Last audio device"
msgstr "የተሰሚ መሳሪያ "
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
++=======
+ #: modules/audio_output/auhal.c:578
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio device is not configured"
msgstr "የተሰሚ መሳሪያ ስሠ"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "የተሰሚ ቅንብሮች "
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -11343,46 -11343,46 +11531,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "ጥá‰áˆ "
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "áŒáˆ«áŒ« "
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "ብáˆáˆ› "
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "áŠáŒ "
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "ሸáŠáˆ‹ መሰሠቀለሠ"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "ቀዠ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11390,61 -11390,61 +11606,97 @@@ msgid "Fuchsia
msgstr "ደማቅ ቀዠየወá‹áŠ•áŒ ጅ ቀለሠ"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "ቢጫ "
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "ወá‹áˆ« "
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "አረንጓዴ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "አረንጓዴያዊ ሰማያዊ ቀለሠ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "ደማቅ ቡኒ "
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "ወá‹áŠ• ጠጅ "
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "የባህሠኃá‹áˆ "
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "ሰማያዊ "
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11582,7 -11582,7 +11834,11 @@@ msgstr "የጽáˆá‹á‹Š ትáˆáŒ‰áˆžá‰
msgid "Subtitle renderers using libass"
msgstr "ጽáˆá‹á‹Š ትáˆáŒ‰áˆžá‰½ ቅየራ "
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13449,10 -13449,10 +13705,17 @@@ msgid "Fast
msgstr "በጣሠáˆáŒ£áŠ• "
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "መደበኛ "
@@@ -13570,8 -13570,8 +13833,13 @@@ msgid "D-Bus control interface
msgstr "ኪá‹á‰² በá‹áŠáŒˆáŒ½ "
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13935,9 -13935,9 +14203,15 @@@ msgstr "
msgid "Opening"
msgstr "áŠáˆá‰µ "
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "á‹á‰³"
@@@ -15934,7 -15934,7 +16208,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "ኤáˆá’ኤጂ ትራንስá–áˆá‰µ ዥረት "
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "ቴሌቴáŠáˆµá‰µ "
@@@ -16127,7 -16127,7 +16405,11 @@@ msgid "VLC media player Help
msgstr "የቪኤáˆáˆ² ማጫወቻ እገዛ "
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "ማጣቀሻ"
@@@ -16222,9 -16222,9 +16504,15 @@@ msgstr "ለአዲስ አቃአስሠá
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "አስቀáˆáŒ¥ "
@@@ -16368,7 -16368,7 +16656,11 @@@ msgstr "áŒá‰¢á‰µ አáˆá‰°áŒˆáŠ˜áˆ
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "እáˆá‰£á‰¶á‰¹ እንዲሰሩ ዥረቱ እየተጫወተ ወá‹áˆ ለጊዜዠየቆመ መሆን አለበትᢠ"
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "ወደ ሰአት á‹áˆˆáˆ "
@@@ -16389,7 -16389,7 +16681,11 @@@ msgstr "
msgid "Backward"
msgstr "ወደኅላ áˆá‰€á‰… ማለት "
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16400,7 -16400,7 +16696,11 @@@ msgstr "
msgid "Forward"
msgstr "ብቅ ማለት "
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16421,89 -16421,89 +16721,160 @@@ msgstr "ጥá‰á‰µ ማያዎች በሙáˆ
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "የሚቀመጠá‹áŠ• á‹á‹áˆ áˆáˆ¨áŒ¥ "
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "የሙዚቃዎች á‹áˆá‹áˆáŠ• አሳዠ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "ድገáˆá¡ "
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "የሚቀመጠá‹áŠ• á‹á‹áˆ áˆáˆ¨áŒ¥ "
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "ትንሽ የድáˆá… መጠን "
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "ተጽዕኖዎች "
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -16545,7 -16545,7 +16916,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16742,8 -16742,8 +17117,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "ብጠ"
@@@ -16836,37 -16836,37 +17216,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "ቪኤáˆáˆ² ማጫወቻ "
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "የስንከላ áˆá‹áŒá‰¥ ማስታወሻ አáˆá‰°áŒˆáŠ˜áˆ "
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "የስንከላ áˆá‹áŒá‰¥ ማስታወሻ አáˆá‰°áŒˆáŠ˜áˆ "
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "ቀጥሠ"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "áˆáŠ•áˆ የቀድሞ የመሰናከሠዱካ ማáŒáŠ˜á‰µ አáˆá‰»áˆˆáˆá¢ "
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "የቆዮ áˆáˆáŒ«á‹Žá‰½áŠ• አስወáŒá‹µ? "
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "የቆየ የቪኤáˆáˆ² áˆáˆáŒ« á‹á‹áˆŽá‰½ ቅጂ አáˆáŠ• አገኘን "
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "ወደ መጣያ አንቀሳቅስና ቪኤáˆáˆ²áŠ• ዳáŒáˆ አስጀáˆáˆ "
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "áˆáŠ•áˆ የቀድሞ የመሰናከሠዱካ ማáŒáŠ˜á‰µ አáˆá‰»áˆˆáˆá¢ "
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "የቆዮ áˆáˆáŒ«á‹Žá‰½áŠ• አስወáŒá‹µ? "
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "የቆየ የቪኤáˆáˆ² áˆáˆáŒ« á‹á‹áˆŽá‰½ ቅጂ አáˆáŠ• አገኘን "
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "ወደ መጣያ አንቀሳቅስና ቪኤáˆáˆ²áŠ• ዳáŒáˆ አስጀáˆáˆ "
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -17024,7 -17024,7 +17436,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "áˆáŒ¥áŒ¥áŠ ገá…ታን ቆáˆá "
@@@ -17165,7 -17165,7 +17581,11 @@@ msgstr "ቪኤáˆáˆ²áŠ• ደብቅ
msgid "Hide Others"
msgstr "ለሎችን ደብቅ "
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "áˆáˆ‰áŠ•áˆ አሳዠ"
@@@ -17256,15 -17256,15 +17676,27 @@@ msgstr "&የሙዚቃ ስáˆáˆªá‹«
msgid "A→B Loop"
msgstr "A->B ዙሠ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "ከመáˆáˆ¶ ማጫወት በኋላ ጨáˆáˆµáŠ“ አá‰áˆ "
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "ብቅ ማለት "
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "ከመáˆáˆ¶ ማጫወት በኋላ ጨáˆáˆµáŠ“ አá‰áˆ "
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "ብቅ ማለት "
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "ወደኅላ áˆá‰€á‰… ማለት "
@@@ -17280,30 -17280,30 +17712,56 @@@ msgstr "የድáˆá… መጠኑን ቀáŠ
msgid "Audio Device"
msgstr "የተሰሚ መሳሪያ "
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "áŒáˆ›áˆ½ መጠን "
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "የተለመደ መጠን "
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "እጥá መጠን "
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "ከማያዠጋሠአስማማ "
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "áŒáˆ›áˆ½ መጠን "
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "የተለመደ መጠን "
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "እጥá መጠን "
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "ከማያዠጋሠአስማማ "
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "ከላዠአንሳá "
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "የሙሉ ማያ ቪድዮ መሳሪያ "
@@@ -17312,7 -17312,7 +17770,11 @@@
msgid "Post processing"
msgstr "ድህረ ቅንበራ "
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "የጽáˆá‹á‹Š ትáˆáŒ‰áˆ á‹á‹áˆ "
@@@ -17553,7 -17553,7 +18015,11 @@@ msgid "Play another media synchronously
msgstr "ሌላ ማህደረ መረጃ በሰመረ áˆáŠ”ታ አጫá‹á‰µ "
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "áˆáˆ¨áŒ¥... "
@@@ -17740,7 -17740,7 +18206,11 @@@ msgstr "ኤáá’ኤስ
msgid "Subtitle encoding"
msgstr "ጽáˆá‹á‹Š ትáˆáŒ‰áˆžá‰½ ቅየራ "
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "የቅáˆáŒ¸ á‰áˆáŠ መጠን "
@@@ -17972,12 -17972,12 +18442,20 @@@ msgstr "ሜታ በማስቀመጥ ላá‹
msgid "VLC was unable to save the meta data."
msgstr "ቪኤáˆáˆ² ሜታ ዳታá‹áŠ• ማስቀመጥ አáˆá‰»áˆˆáˆ "
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "áˆáˆáŒ«á‹Žá‰½ "
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "áˆáˆ‰áŠ•áˆ ዳáŒáˆ አስጀáˆáˆ "
@@@ -18161,133 -18161,128 +18639,241 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "መáˆáˆ¶ ማጫወቱን ለጊዜዠአá‰áˆ "
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "áŠá‰£áˆª ቅየራ "
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "የማሳያ ቅንብሮች "
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "áŠá‰£áˆª ቅየራ "
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "የማሳያ ቅንብሮች "
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "የቅáˆáŒ¸ á‰áˆáŠ ቀለሠ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "ቅáˆáŒ¸ á‰áˆáŠ "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "የጽáˆá‹á‹Š ትáˆáŒ‰áˆ ቋንቋዎች"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "የተመረጠየጽáˆá‹á‹Š ትáˆáŒ‰áˆžá‰½ ቋንቋ "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "ኦኤስዲን አንቃ "
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "ኦኤስዲን አንቃ "
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "መጋረድ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "ቀለሞችን ገáˆá‰¥áŒ¥ "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "ጥá‰á‰µ ማያዎች በሙሉ ማያ ዘዴ"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "ጥá‰á‰µ ማያዎች በሙሉ ማያ ዘዴ"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "አሳá‹"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "የá‹áŒ½áŠ ት ሞáŒáˆ "
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "የቪድዮ ቅጽበተ áŽá‰¶á‹Žá‰½ "
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "አቃአ"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "ቅረጽ "
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "ቅድመ ቅጥያ"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "ቅደሠተከተሠያለዠአቆጣጠሠ"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "የመጨረሻ ማጣሪያ ᡠ%@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "ማጣሪያ እስከአáˆáŠ• አáˆá‰°áŠ«áˆ„ደሠ"
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "የá‹áŒ½áŠ ት ሞáŒáˆ "
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "የቪድዮ ቅጽበተ áŽá‰¶á‹Žá‰½ "
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "አቃአ"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "ቅረጽ "
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "ቅድመ ቅጥያ"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "ቅደሠተከተሠያለዠአቆጣጠሠ"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "የመጨረሻ ማጣሪያ ᡠ%@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "ማጣሪያ እስከአáˆáŠ• አáˆá‰°áŠ«áˆ„ደሠ"
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "á‹á‰…ተኛዠቆá‹á‰³ "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "á‹á‰…ተኛ ቆá‹á‰³ "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "ረጅሠቆá‹á‰³ "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "ከáተኛ ቆá‹á‰³ "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "áˆáˆáŒ«á‹Žá‰½áŠ• ዳáŒáˆ አስጀáˆáˆ "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18300,21 -18295,21 +18886,38 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "የቪድዮ ቅጽበተ áŽá‰¶áˆ…ን ለማስቀመጥ አቃአáˆáˆ¨áŒ¥á¢ "
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "áˆáˆ¨áŒ¥ "
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "የቪድዮ ቅጽበተ áŽá‰¶áˆ…ን ለማስቀመጥ አቃአáˆáˆ¨áŒ¥á¢ "
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "áˆáˆ¨áŒ¥ "
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the directory or filename where the records will be stored."
msgstr "á‹á‹áˆŽá‰¹ የሚቀመጡበት ዕဠማá‹áŒ« መመረጥ አለበት "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18322,16 -18317,16 +18925,29 @@@ msgstr "
"አዲስ á‰áˆáŽá‰½ ለ \n"
" ተጫን "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "የተሳሳተ á‹áˆ…ደት "
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "በሚያሳá‹áŠ• áˆáŠ”ታ እáŠá‹šáˆ… á‰áˆáŽá‰½ እንደ ማáጠኛ á‰áˆá አቋራጮች ሊመደቡ አá‹á‰½áˆ‰áˆá¢ "
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "የተሳሳተ á‹áˆ…ደት "
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "በሚያሳá‹áŠ• áˆáŠ”ታ እáŠá‹šáˆ… á‰áˆáŽá‰½ እንደ ማáጠኛ á‰áˆá አቋራጮች ሊመደቡ አá‹á‰½áˆ‰áˆá¢ "
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "á‹áˆ… á‹áˆ…ደት ቀደሠብሎ በ\"%@\" ተወስዷáˆá¢ "
@@@ -20355,21 -20350,21 +20971,37 @@@ msgstr "የተመረጠá‹áŠ• መገለ
msgid "Create a new profile"
msgstr "አዲስ መገለጫ áጠሠ"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "áጠሠ"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid " Profile Name Missing"
msgstr "የመገለጫ ስáˆá¡"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "ለመገለጫዠስሠማዘጋጀት አለብህᢠ"
@@@ -23874,47 -23869,47 +24506,83 @@@ msgstr "የመáŠáŒ¨ የተለቀቀ á‹
msgid "Overlays/Subtitles"
msgstr "በቪድዮዠላዠየጽáˆá‹á‹Š ትáˆáŒ‰áˆžá‰½áŠ• ሸáን "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font size in pixels"
msgstr "የቅáˆáŒ¸ á‰áˆáŠ መጠን ᤠá’áŠáˆµáˆŽá‰½ "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "መጋረድ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23923,98 -23918,98 +24591,178 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "ቪድዮ áˆáŒ¥áŒ¥áŠ ገá…ታ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "áŠá‰£áˆª መሸጎጫ መመሪያ "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "መጋረድ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "የቅáˆáŒ¸ á‰áˆáŠ ቀለሠ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Smaller"
msgstr "ትንሽ የድáˆá… መጠን "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/an.po
index 6fc02c0,1b75610..99fe1d3
--- a/po/an.po
+++ b/po/an.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-05-04 07:53+0000\n"
"Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
"Language-Team: Aragonese (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -137,7 -137,7 +141,11 @@@ msgstr "Quantos parametros y modulos d'
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -486,10 -486,10 +494,17 @@@ msgid "&About
msgstr "Quanto a"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -528,17 -528,17 +543,29 @@@ msgid "Save...
msgstr "Alzar..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Repetir tot..."
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Repetir una vegada"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -645,7 -645,7 +672,11 @@@ msgstr "S'ha arribau a o numero maximo
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Inhabilitar"
@@@ -1347,21 -1347,21 +1378,37 @@@ msgstr "Velocidat d'os fotogramas
msgid "Decoded format"
msgstr "Formato descodificau"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "No s'ha puesto ubrir a dentrada"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "No s'ha puesto ubrir a dentrada"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"O VLC no ye capable d'ubrir o MRL '%s'. Comprebe o rechistro ta saber-ne mas."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "O VLC no puet reconoixer o formato de dentrada"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "O VLC no puet reconoixer o formato de dentrada"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1793,7 -1793,7 +1840,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1883,7 -1883,7 +1934,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Garra"
@@@ -1914,7 -1914,7 +1969,11 @@@ msgstr "
"comportamiento por defecto ye trigar automaticament o millor metodo "
"disponible."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Activar o video"
@@@ -2127,7 -2127,7 +2186,11 @@@ msgstr "
"defecto."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Siempre dencima"
@@@ -2188,7 -2188,7 +2251,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2197,7 -2197,7 +2264,11 @@@ msgstr "Desentrelazar
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Modo desentrelazau"
@@@ -2256,7 -2256,7 +2327,11 @@@ msgstr "
"Inhabilitar o diaple chestor d'a enerchÃa mientres qualsiquier reproducción, "
"ta empachar que l'ordinador dentre en suspensión debiu a la inactividat."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Decoracions d'a finestra"
@@@ -2463,7 -2463,7 +2538,11 @@@ msgstr "
"pixels quadraus (1:1). Si tiene una pantalla de 16:9, puestar le calga "
"cambiar-la a 4:3 ta mantener as proporcions."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Omitir os fotogramas"
@@@ -2614,12 -2614,12 +2693,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2627,7 -2627,7 +2715,11 @@@ msgid "Default
msgstr "Por defecto"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2984,7 -2984,7 +3076,11 @@@ msgid "You can completely disable the s
msgstr "Puet deshabilitar completament o procesau de subimachens."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3930,7 -3930,7 +4026,11 @@@ msgstr "
"Istas opcions son as teclas enlazadas globals de VLC, conoixidas como "
"«alcorces de teclau»."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignorar"
@@@ -3954,8 -3954,8 +4054,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4036,10 -4036,10 +4141,17 @@@ msgid "Slower (fine)
msgstr "Mas lento (preciso)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4054,10 -4054,10 +4166,17 @@@ msgstr "
"reproducción."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Anterior"
@@@ -4068,9 -4068,9 +4187,15 @@@ msgstr "
"Seleccione l'alcorce de teclau ta blincar a l'obchecto previo en a lista de "
"reproducción."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4306,9 -4306,9 +4431,15 @@@ msgid "Select the key to decrease audi
msgstr "Seleccionar tecla ta baixar o volumen"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Silenciar"
@@@ -4723,7 -4723,7 +4854,11 @@@ msgstr "Rotar por os dispositivos d'aud
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Captura de pantalla"
@@@ -4929,12 -4929,12 +5064,21 @@@ msgstr "Descargando ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Cancelar"
@@@ -5700,7 -5700,7 +5844,11 @@@ msgstr "Retallar
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Proporción"
@@@ -8094,7 -8094,7 +8242,11 @@@ msgstr "Dentrada de pantalla
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Pantalla"
@@@ -8835,7 -8835,7 +8987,11 @@@ msgstr "Vol máx #
msgid "Volume Set"
msgstr "Conchunto de volumen"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9989,7 -9989,7 +10145,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "Salida d'audio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Falló salida d'audio"
@@@ -10022,7 -10022,7 +10182,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -10030,32 -10030,32 +10194,56 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Salida AudioUnit HAL"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Salida AudioUnit HAL"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"O dispositivo de salida d'audio seleccionau ye estando usau exclusivament "
"por unatro programa."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "O dispositivo d'audio no ye configurau"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "O dispositivo d'audio no ye configurau"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Salida codificada)"
@@@ -11314,46 -11314,46 +11502,74 @@@ msgstr "Uembra
msgid "Outline"
msgstr "Perfil"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Negro"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Griso"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Plata"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Blanco"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Granate"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Rojo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11361,61 -11361,61 +11577,97 @@@ msgid "Fuchsia
msgstr "Fucsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Amariello"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Verde oliva"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Verde"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Verde azulado"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lima"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Púrpura"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Azul marino"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Azul"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11571,7 -11571,7 +11823,11 @@@ msgstr "SubtÃtulo (abanzau)
msgid "Subtitle renderers using libass"
msgstr "Generadores de subtÃtulos usando libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Construindo caché de fuents"
@@@ -13497,10 -13497,10 +13753,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -13609,8 -13609,8 +13872,13 @@@ msgid "D-Bus control interface
msgstr "Interficie de control D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13960,9 -13960,9 +14228,15 @@@ msgstr "Inicializando
msgid "Opening"
msgstr "Ubrindo"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pausa"
@@@ -15891,7 -15891,7 +16165,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Demuxor d'emisión de transporte MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletexto"
@@@ -16070,7 -16070,7 +16348,11 @@@ msgid "VLC media player Help
msgstr "Aduya d'o reproductor multimedia VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Indiz"
@@@ -16158,9 -16158,9 +16440,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Alzar"
@@@ -16305,7 -16305,7 +16593,11 @@@ msgstr "
"A emisión debe estar reproducindo-se u en pausa ta que funcionen os "
"favoritos."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Blincar a tiempo"
@@@ -16325,7 -16325,7 +16617,11 @@@ msgstr "
msgid "Backward"
msgstr "Retroceder"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16335,7 -16335,7 +16631,11 @@@ msgstr "
msgid "Forward"
msgstr "Abance"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16355,84 -16355,84 +16655,155 @@@ msgstr "Intercambiar pantalla completa
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Amostrar/amagar lista de reproducción"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Amostrar/amagar lista de reproducción"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Repetir"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Barajar"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Barajar"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Volumen completo"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Volumen completo"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efectos"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16468,7 -16468,7 +16839,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16653,8 -16653,8 +17028,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Personalizar"
@@@ -16756,37 -16756,37 +17136,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "No se trobó rechistro d'errors"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "No se trobó rechistro d'errors"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Continar"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "No se podió trobar garra vestigio de fallos previos."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Eliminar preferencias antigas?"
+
+#: modules/gui/macosx/intf.m:1937
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "No se podió trobar garra vestigio de fallos previos."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Eliminar preferencias antigas?"
+
+ #: modules/gui/macosx/intf.m:1922
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "We just found an older version of VLC's preferences files."
msgstr ""
"S'ha trobau una versión mas antiga d'os fichers de preferencias de VLC."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Mover a la papelera y reiniciar VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Mover a la papelera y reiniciar VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16960,7 -16960,7 +17372,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Blocar proporción"
@@@ -17089,7 -17089,7 +17505,11 @@@ msgstr "Amagar VLC
msgid "Hide Others"
msgstr "Amagar atros"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Amostrar tot"
@@@ -17174,15 -17174,15 +17594,27 @@@ msgstr "Sincronización de pista
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Salir dimpués de reproducir"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Blinco abance"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Salir dimpués de reproducir"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Blinco abance"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Blinco dezaga"
@@@ -17198,30 -17198,30 +17630,56 @@@ msgstr "Baixar volumen
msgid "Audio Device"
msgstr "Dispositivo d'audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Metat de grandaria"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Grandaria normal"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Grandaria dople"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Achustar a pantalla"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Metat de grandaria"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Grandaria normal"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Grandaria dople"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Achustar a pantalla"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Flotar sobre tot"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Dispositivo de video a pantalla completa"
@@@ -17230,7 -17230,7 +17688,11 @@@
msgid "Post processing"
msgstr "Post-Proceso"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -17458,7 -17458,7 +17920,11 @@@ msgid "Play another media synchronously
msgstr "Reproducir unatro meyo de forma sincronizada"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Seleccionar..."
@@@ -17642,7 -17642,7 +18108,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Grandaria de fuent"
@@@ -17871,12 -17871,12 +18341,20 @@@ msgstr "Error en alzar metadatos
msgid "VLC was unable to save the meta data."
msgstr "VLC estió incapaz d'alzar os metadatos."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Preferencias"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Restaurar tot"
@@@ -18055,129 -18055,125 +18533,237 @@@ msgstr "Habilitar notificacions Growl (
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Codificación predeterminada"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Preferencias de pantalla"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Codificación predeterminada"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Preferencias de pantalla"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Color de fuent"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Fuent"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Habilitar OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Habilitar OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Opacidat"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Forzar negreta"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Forzar negreta"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Esquema de fondo"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Pantallas negras en modo pantalla completa"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Pantallas negras en modo pantalla completa"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Pantalla"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Modulo de salida"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Capturas de video"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Carpeta"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Formato"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefixo"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Numeración seqüencial"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Zaguera comprebación o: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "No se fació garra comprebación encara."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Modulo de salida"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Capturas de video"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Carpeta"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Formato"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefixo"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Numeración seqüencial"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Zaguera comprebación o: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "No se fació garra comprebación encara."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "A menor latencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Baixa latencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Alta latencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "A mayor latencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Restaurar preferencias"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18190,20 -18186,20 +18776,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Seleccionar a carpeta an alzar as suyas capturas de pantalla de video."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Seleccionar"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Seleccionar a carpeta u nombre de fichero an s'alzarán as gravacions."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Seleccionar a carpeta an alzar as suyas capturas de pantalla de video."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Seleccionar"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Seleccionar a carpeta u nombre de fichero an s'alzarán as gravacions."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18211,17 -18207,17 +18814,30 @@@ msgstr "
"Prete nuevas teclas para\n"
"«%@»"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Combinación no valida"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Combinación no valida"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"Lamentablement, ixas teclas no pueden asignar-se como alcorces de teclau."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Ista combinación ya ye usada por «%@»."
@@@ -20276,20 -20272,20 +20892,36 @@@ msgstr "Borrar o perfil seleccionau
msgid "Create a new profile"
msgstr "Creyar un nuevo perfil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Creyar"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Nombre de perfil ausent"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Nombre de perfil ausent"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Debe establir un nombre ta fichero ta o perfil."
@@@ -23771,23 -23767,23 +24403,43 @@@ msgstr "Transcodificar salida d'emisió
msgid "Overlays/Subtitles"
msgstr "Superposicions/SubtÃtulos"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Familia d'a fuent a usar"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Grandaria de fuent en pÃxels"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Familia d'a fuent a usar"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Grandaria de fuent en pÃxels"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23796,11 -23792,11 +24448,19 @@@ msgstr "
"Grandaria predeterminada d'as fuents a chenerar sobre o video. Si se mete "
"bella cosa distinto a 0, ista opción anulará a grandaria relativa de fuent."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Opacidat d'o texto"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Opacidat d'o texto"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -23808,12 -23804,12 +24468,20 @@@ msgstr "
"A opacidat (opuesto de transparencia) de texto a chenerar sobre o video. 0 = "
"transparent, 255 = totalment opaco."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Color de texto predeterminau"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23822,12 -23818,12 +24490,20 @@@
"(red + green), #FFFFFF = white"
msgstr "A color d'o texto que se chenerará en o video."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Grandaria relativa d'a fuent"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -23837,59 -23833,59 +24513,111 @@@ msgstr "
"s'estableix una grandaria de fuent absoluto, a grandaria relativa será "
"anulau."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Opacidat de fondo"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Color de fondo"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Esquema d'opacidat"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Opacidat de uembra"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Color de uembra"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Anglo de uembra"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Distancia de uembra"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Opacidat de fondo"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Color de fondo"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Esquema d'opacidat"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Opacidat de uembra"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Color de uembra"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Anglo de uembra"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Distancia de uembra"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Mas chicota"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Chicota"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Gran"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Mas gran"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Usar generador YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Usar generador YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -23897,23 -23893,23 +24625,43 @@@ msgstr "
"Isto chenera a fuent usando «YUV paletizado». Ista opción solament "
"s'ameneste si quiere codificar con subtÃtulos DVB"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Fina"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Grueso"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Generador de texto"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Generador de fuent Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Fina"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Grueso"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Generador de texto"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Generador de fuent Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/ar.po
index 1bb22a0,0110dd7..5b8e70c
--- a/po/ar.po
+++ b/po/ar.po
@@@ -13,7 -13,7 +13,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-10-13 14:11+0000\n"
"Last-Translator: fbourai <fbourai at gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -143,7 -143,7 +147,11 @@@ msgstr "إعدادات ووØدات اÙ
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -467,10 -467,10 +475,17 @@@ msgid "&About
msgstr "&عن"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -509,17 -509,17 +524,29 @@@ msgid "Save...
msgstr "اØÙظ..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "تكرار الكل"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "تكرار تشغيل"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -622,7 -622,7 +649,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "تعطيل"
@@@ -1288,20 -1288,20 +1319,36 @@@ msgstr "تدÙÙ‚ الصور
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "دخلكم لا يمكن ÙتØÙ‡"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "دخلكم لا يمكن ÙتØÙ‡"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ".ÙØص سجل للاطلاع على التÙاصيل. '%s' MRL غير قادر على ÙØªØ VLC "
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "لم يستطع VLC التعر٠على نسق الدخل."
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "لم يستطع VLC التعر٠على نسق الدخل."
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1714,7 -1714,7 +1761,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1796,7 -1796,7 +1847,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "لا شيء"
@@@ -1827,7 -1827,7 +1882,11 @@@ msgstr "
".سلوك الإÙتراضي هو الإختيار التلقائيا الأÙضل كطريقة متاØØ©.VLC هذا هو طريقة "
"ناتج الÙيديو التي يستخدمها"
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "تمكين الÙيديو"
@@@ -2026,7 -2026,7 +2085,11 @@@ msgstr "
"قدرة أجهزة تسريع لبطاقه الÙيديو Overlay "
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "دائما ÙÙŠ المقدمة"
@@@ -2077,7 -2077,7 +2140,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2086,7 -2086,7 +2153,11 @@@ msgstr "الغاء التشويش
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "نمط الغاء التشويش"
@@@ -2142,7 -2142,7 +2213,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "زخار٠الناÙذة"
@@@ -2328,7 -2328,7 +2403,11 @@@ msgstr "
".هذه القوات ترصد نسبة الجانب. معظم المراقبين لديهم مربع بكسل (1:1). إذا كانت "
"لديكم شاشة 16:9ØŒ Ùإنك قد تØتاج إلى تغيير هذا إلى 4:3 من أجل إبقاء النسب"
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "تجاهل اطارات"
@@@ -2465,12 -2465,12 +2544,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2478,7 -2478,7 +2566,11 @@@ msgid "Default
msgstr "المبدئي"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2795,7 -2795,7 +2887,11 @@@ msgid "You can completely disable the s
msgstr ".من الممكن تعطيل كلية إمكانية إضاÙØ© صور Ùرعية"
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3661,7 -3661,7 +3757,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr " (« hotkeys ») إعداد الإختصارات"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "تجاهل"
@@@ -3685,8 -3685,8 +3785,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3766,10 -3766,10 +3871,17 @@@ msgid "Slower (fine)
msgstr "أبطأ (قليلًا)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3782,10 -3782,10 +3894,17 @@@ msgid "Select the hotkey to use to ski
msgstr "اختر المÙØªØ§Ø Ø§Ù„Ø³Ø§Ø®Ù† الذي يتجاوز إلى العنصر التالي ÙÙŠ قائمة التشغيل."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "السابق"
@@@ -3794,9 -3794,9 +3913,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "اختر المÙØªØ§Ø Ø§Ù„Ø³Ø§Ø®Ù† الذي يتجاوز إلى العنصر السابق ÙÙŠ قائمة التشغيل."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4031,9 -4031,9 +4156,15 @@@ msgid "Select the key to decrease audi
msgstr "اختر المÙØªØ§Ø Ø§Ù„Ø³Ø§Ø®Ù† الذي ÙŠÙقلّل مقدار الصوت."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "كتم"
@@@ -4447,7 -4447,7 +4578,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "التقاط صورة"
@@@ -4646,12 -4646,12 +4781,21 @@@ msgstr "جاري التØميل ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "الغاء"
@@@ -5409,7 -5409,7 +5553,11 @@@ msgstr "اقتص
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "نسبة الأبعاد"
@@@ -7735,7 -7735,7 +7883,11 @@@ msgstr "نمط إلتقاط الشاشØ
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "الشاشة"
@@@ -8467,7 -8467,7 +8619,11 @@@ msgstr "أعلى Øد للصوت
msgid "Volume Set"
msgstr "اعداد الصوت"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9592,7 -9592,7 +9748,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "خرج سمعي ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Ùشل اخراج الصوت"
@@@ -9623,7 -9623,7 +9783,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9631,30 -9631,30 +9795,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "خرج HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "خرج HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ".الناتج السمعي المختار Ù…Ùستخدم من طر٠برنامج آخر"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (خرج مشÙر)"
@@@ -10872,46 -10872,46 +11060,74 @@@ msgstr "ظل
msgid "Outline"
msgstr "رسم تخطيطي"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "أسود"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "رمادي"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Ùضي"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "أبيض"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "كستنائي"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Ø£Øمر"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10919,61 -10919,61 +11135,97 @@@ msgid "Fuchsia
msgstr "ارجواني Ø£Øمر"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "أصÙر"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "زيتوني"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "أخضر"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "أزرق مخضر"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "ليموني"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "أرجواني"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "بØري"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "أزرق"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11103,7 -11103,7 +11355,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12959,10 -12959,10 +13215,17 @@@ msgid "Fast
msgstr "سريع"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "عادي"
@@@ -13067,8 -13067,8 +13330,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus واجهات السيطرة "
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13416,9 -13416,9 +13684,15 @@@ msgstr "
msgid "Opening"
msgstr "ÙŠÙتØ"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "ألبÙØ«"
@@@ -15321,7 -15321,7 +15595,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "demuxer MPEG جدول النقل "
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15500,7 -15500,7 +15778,11 @@@ msgid "VLC media player Help
msgstr "مساعدة مشغل الوسائط VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Ùهرس‎"
@@@ -15588,9 -15588,9 +15870,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "ØÙظ"
@@@ -15733,7 -15733,7 +16021,11 @@@ msgstr "لم يوجد دخل
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ".تيار يجب اللعب أو توقÙت عن العمل شرائط"
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "القÙز على الزمن"
@@@ -15753,7 -15753,7 +16045,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15763,7 -15763,7 +16059,11 @@@ msgstr "
msgid "Forward"
msgstr "أرسل"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15783,84 -15783,84 +16083,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15896,7 -15896,7 +16267,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16079,8 -16079,8 +16454,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -16173,36 -16173,36 +16553,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "لم يوجد سجل اتهيار"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "لم يوجد سجل اتهيار"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "استئناÙ"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr " يمكن العثور على اي اثر Ù„Øادث سابق."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr " يمكن العثور على اي اثر Ù„Øادث سابق."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16356,7 -16356,7 +16768,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "اقÙÙ„ نسبة الأبعاد"
@@@ -16485,7 -16485,7 +16901,11 @@@ msgstr "اخÙاء VLC
msgid "Hide Others"
msgstr "اخÙاء البقية"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "اظهار الجميع"
@@@ -16570,15 -16570,15 +16990,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "غادر بعد التشغيل"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "تقديم للأمام"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "غادر بعد التشغيل"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "تقديم للأمام"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "تقديم للخل٠"
@@@ -16594,30 -16594,30 +17026,56 @@@ msgstr "اخÙض الصوت
msgid "Audio Device"
msgstr "جهاز الصوت"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "نص٠الØجم"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Øجم عادي"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Øجم مضاعÙ"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "ÙŠØµÙ„Ø Ù„Ùرز "
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "نص٠الØجم"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Øجم عادي"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Øجم مضاعÙ"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "ÙŠØµÙ„Ø Ù„Ùرز "
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Float on Top"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "جهاز Ùيديو ملء الشاشة"
@@@ -16626,7 -16626,7 +17084,11 @@@
msgid "Post processing"
msgstr "نوعية بعد المعالجة"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16854,7 -16854,7 +17316,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "...إختيار"
@@@ -17027,7 -17027,7 +17493,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Øجم الخط"
@@@ -17256,12 -17256,12 +17726,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "التÙضيلات"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "أعد ضبط الكل"
@@@ -17438,129 -17438,125 +17916,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "الترميز المبدئي"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "الترميز المبدئي"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "لون الخط"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "الخط"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Ø´ÙاÙية"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "عرض"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "ÙˆØدة الخرج"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "لقطات الÙيديو"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "ØاÙظه "
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "ÙˆØدة الخرج"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "لقطات الÙيديو"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "ØاÙظه "
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "أعد ضبط التÙضيلات"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17573,35 -17569,35 +18159,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "إختيار"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "إختيار"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19602,20 -19598,20 +20218,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "أنشئ"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22978,23 -22974,23 +23610,43 @@@ msgstr "جدول الانتاج عبر
msgid "Overlays/Subtitles"
msgstr "يعلو / العناوين الثانوية "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Øجم الخط بالبكسل"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Øجم الخط بالبكسل"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23003,11 -22999,11 +23655,19 @@@ msgstr "
"هذا هو Øجم الخطوط بالÙتراض التي ستقدم على الÙيديو. اذا Øددت على شيء اختلا٠"
"0 Ùان هذا الخيار تجاوز Øجم الخط النسبي."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -23015,12 -23011,12 +23675,20 @@@ msgstr "
"عدم الشÙاÙية (معكوس الشÙاÙيه) من النص الذي تقدم على الÙيديو. 0 =Ø´ÙاÙØ© , 255 "
"=تماما الوضوØ."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "نص التقصير اللون "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23033,71 -23029,71 +23701,131 @@@ msgstr "
"اسود , #FF0000 =اØمر , #00FF00 = الاخضر ,#FFFF00 = اصÙر (Ø£Øمر + اخضر), "
"#FFFFFF = الابيض "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr " Øجم الخطّ القريب "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "أصغر"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "صغير"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "كبير"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "أكبر"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "جاعل الشيء YUVP إستخدام"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "جاعل الشيء YUVP إستخدام"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -23105,23 -23101,23 +23833,43 @@@ msgstr "
"وهذا يجعل إستخدامالخط / \"باليتيزيد يو٠/\". هذا هو الخيار الوØيد اذا اردتم "
"Øاجة الى ترميز رقمي الى العناوين الÙرعية "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "تَصْيÙر النص "
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 جعل خط "
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "تَصْيÙر النص "
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 جعل خط "
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/ast.po
index 4ba6f92,59e6530..6aedf49
--- a/po/ast.po
+++ b/po/ast.po
@@@ -9,7 -9,7 +9,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-05-04 07:53+0000\n"
"Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -138,7 -138,7 +142,11 @@@ msgstr "Preferencies varies d'audio y m
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -477,10 -477,10 +485,17 @@@ msgid "&About
msgstr "&Tocante a"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -519,17 -519,17 +534,29 @@@ msgid "Save...
msgstr "Guardar..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Repetir too"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Repetir unu"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -636,7 -636,7 +663,11 @@@ msgstr "Algamóse'l númberu máximu d
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Desactivar"
@@@ -1335,21 -1335,21 +1366,37 @@@ msgstr "Tasa de fotogrames
msgid "Decoded format"
msgstr "Formatu decodificáu"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Nun pue abrise la to entrada"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Nun pue abrise la to entrada"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC ye incapaz d'abrir el MRL «%s». Comprueba'l rexistru pa más detalles."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC nun pue reconocer el formatu d'entrada"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC nun pue reconocer el formatu d'entrada"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1779,7 -1779,7 +1826,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1868,7 -1868,7 +1919,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Nengún"
@@@ -1898,7 -1898,7 +1953,11 @@@ msgstr "
"Métodu de salida de videu usáu por VLC. El mou predetermináu ye escoyer "
"automáticamente el meyor métodu posible."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Habilitar videu"
@@@ -2107,7 -2107,7 +2166,11 @@@ msgstr "
"(capacidá de xenerar videu direutamente). VLC va intentar usala por defeutu."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Siempres enriba"
@@@ -2161,7 -2161,7 +2224,11 @@@ msgstr "Anubrir cursor y controlador d
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2170,7 -2170,7 +2237,11 @@@ msgstr "Desentellazar
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Mou de desentellazáu"
@@@ -2228,7 -2228,7 +2299,11 @@@ msgstr "
"Inhibe l'alministrador d'enerxÃa mientres cualquier reproducción, pa evitar "
"que l'equipu se suspenda por inactividá."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Decoraciones de ventana"
@@@ -2431,7 -2431,7 +2506,11 @@@ msgstr "
"pÃxeles cuadraos (1:1). Si tienes pantalla de 16:9, podrÃa precisar camudase "
"a 4:3 pa caltener proporciones."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Saltu de fotogrames"
@@@ -2577,12 -2577,12 +2656,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2590,7 -2590,7 +2678,11 @@@ msgid "Default
msgstr "Predetermináu"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2940,7 -2940,7 +3032,11 @@@ msgid "You can completely disable the s
msgstr "Pues desactivar dafechu'l procesu de subimáxenes."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3877,7 -3877,7 +3973,11 @@@ msgstr "
"Estes opciones son les tecles enllazaes globales de VLC, conocÃes como "
"«atayos de tecláu»."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Inorar"
@@@ -3901,8 -3901,8 +4001,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3982,10 -3982,10 +4087,17 @@@ msgid "Slower (fine)
msgstr "Más lentu (precisu)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4000,10 -4000,10 +4112,17 @@@ msgstr "
"reproducción."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Anterior"
@@@ -4014,9 -4014,9 +4133,15 @@@ msgstr "
"Escueyi l'atayu de tecláu pa saltar al oxetu previu na llista de "
"reproducción."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4251,9 -4251,9 +4376,15 @@@ msgid "Select the key to decrease audi
msgstr "Escoyer tecla pa baxar el volume"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Silenciu"
@@@ -4668,7 -4668,7 +4799,11 @@@ msgstr "Rotar polos preseos d'audio dis
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Captura de pantalla"
@@@ -4873,12 -4873,12 +5008,21 @@@ msgstr "Descargando ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Encaboxar"
@@@ -5643,7 -5643,7 +5787,11 @@@ msgstr "Retayar
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Proporción"
@@@ -8033,7 -8033,7 +8181,11 @@@ msgstr "Entrada de pantalla
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Pantalla"
@@@ -8775,7 -8775,7 +8927,11 @@@ msgstr "Vol máx #
msgid "Volume Set"
msgstr "Conxuntu de volume"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9928,7 -9928,7 +10084,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "Salida d'audio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Falló salida d'audio"
@@@ -9961,7 -9961,7 +10121,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9969,31 -9969,31 +10133,55 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Salida AudioUnit HAL"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Salida AudioUnit HAL"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"El preséu de salida d'audio escoyÃu ta usándose puramente por otru programa."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "El preséu d'audio nun ta configuráu"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "El preséu d'audio nun ta configuráu"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Salida codificada)"
@@@ -11231,46 -11231,46 +11419,74 @@@ msgstr "Solombra
msgid "Outline"
msgstr "Perfil"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Negru"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Buxu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Plata"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Blancu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Granate"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Bermeyu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11278,61 -11278,61 +11494,97 @@@ msgid "Fuchsia
msgstr "Fucsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Mariellu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Verde oliva"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Verde"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Verde azuláu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Llima"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Púrpura"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Azul marÃn"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Azul"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11480,7 -11480,7 +11732,11 @@@ msgstr "SubtÃtulu (avanzáu)
msgid "Subtitle renderers using libass"
msgstr "Xeneradores de subtÃtulos usando libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Construyendo caxé de fontes"
@@@ -13365,10 -13365,10 +13621,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -13477,8 -13477,8 +13740,13 @@@ msgid "D-Bus control interface
msgstr "Interfaz de control D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13828,9 -13828,9 +14096,15 @@@ msgstr "Anicializando
msgid "Opening"
msgstr "Abriendo"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Posar"
@@@ -15759,7 -15759,7 +16033,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Demuxor d'emisión de tresporte MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletestu"
@@@ -15938,7 -15938,7 +16216,11 @@@ msgid "VLC media player Help
msgstr "Ayuda del reproductor multimedia VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Ãndiz"
@@@ -16026,9 -16026,9 +16308,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Guardar"
@@@ -16173,7 -16173,7 +16461,11 @@@ msgstr "
"La emisión tien de tar reproduciéndose o en posa por que funcionen los "
"favoritos."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Saltar a tiempu"
@@@ -16193,7 -16193,7 +16485,11 @@@ msgstr "
msgid "Backward"
msgstr "Atrás"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16203,7 -16203,7 +16499,11 @@@ msgstr "
msgid "Forward"
msgstr "Meyora"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16223,84 -16223,84 +16523,155 @@@ msgstr "Intercambiar pantalla completa
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Amosar/anubrir llista de reproducción"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Amosar/anubrir llista de reproducción"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Repetir"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Al debalu"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Al debalu"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Volume completu"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Volume completu"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efeutos"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16336,7 -16336,7 +16707,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16521,8 -16521,8 +16896,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Personalizar"
@@@ -16624,37 -16624,37 +17004,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Nun s'atopó rexistru d'fallos"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Nun s'atopó rexistru d'fallos"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Siguir"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Nun pudo atopase nenguna traza de fallos previos."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "¿Desaniciar preferencies antigües?"
+
+#: modules/gui/macosx/intf.m:1937
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Nun pudo atopase nenguna traza de fallos previos."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "¿Desaniciar preferencies antigües?"
+
+ #: modules/gui/macosx/intf.m:1922
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "We just found an older version of VLC's preferences files."
msgstr ""
"Atopóse una versión más antigua de los ficheros de preferencies de VLC."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Mover a la papelera y reaniciar VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Mover a la papelera y reaniciar VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16819,7 -16819,7 +17231,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Bloquiar proporción"
@@@ -16948,7 -16948,7 +17364,11 @@@ msgstr "Anubrir VLC
msgid "Hide Others"
msgstr "Anubrir otros"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Amosar too"
@@@ -17033,15 -17033,15 +17453,27 @@@ msgstr "Sincronización de pista
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Salir dempués de reproducir"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Saltu alantre"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Salir dempués de reproducir"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Saltu alantre"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Saltu atrás"
@@@ -17057,30 -17057,30 +17489,56 @@@ msgstr "Baxar volume
msgid "Audio Device"
msgstr "Preséu d'audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Metá de tamañu"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Tamañu normal"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Tamañu doble"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Axustar a pantalla"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Metá de tamañu"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Tamañu normal"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Tamañu doble"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Axustar a pantalla"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Flotar sobre too"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Preséu de videu a pantalla completa"
@@@ -17089,7 -17089,7 +17547,11 @@@
msgid "Post processing"
msgstr "Post-Procesáu"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -17317,7 -17317,7 +17779,11 @@@ msgid "Play another media synchronously
msgstr "Reproducir otru mediu de forma sincronizada"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Escoyer..."
@@@ -17496,7 -17496,7 +17962,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Tamañu de fonte"
@@@ -17725,12 -17725,12 +18195,20 @@@ msgstr "Fallu al guardar metadatos
msgid "VLC was unable to save the meta data."
msgstr "VLC foi incapaz de guardar los metadatos."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Preferencies"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Restaurar too"
@@@ -17909,129 -17909,125 +18387,237 @@@ msgstr "Habilitar notificaciones Growl
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Codificación predeterminada"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Preferencies de pantalla"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Codificación predeterminada"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Preferencies de pantalla"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Color de fonte"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Fonte"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Habilitar OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Habilitar OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Opacidá"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Forciar negrina"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Forciar negrina"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Color de fondu"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Grosor de contornu"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Pantalles prietes en mou pantalla completa"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Pantalles prietes en mou pantalla completa"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Pantalla"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Módulu de salida"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Captures de videu"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Carpeta"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Formatu"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefixu"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Numberación secuencial"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Cabera comprobación el: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Nun se fixo nenguna comprobación entá."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Módulu de salida"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Captures de videu"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Carpeta"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Formatu"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefixu"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Numberación secuencial"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Cabera comprobación el: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Nun se fixo nenguna comprobación entá."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "La menor llatencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Baxa llatencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Alta llatencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "La mayor llatencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Restaurar preferencies"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18044,35 -18040,35 +18630,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Escoyer la carpeta au guardar les tos captures de pantalla de videu."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Escoyer"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Escoyer la carpeta o nome de ficheru au van guardase les grabaciones."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Escoyer la carpeta au guardar les tos captures de pantalla de videu."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Escoyer"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Escoyer la carpeta o nome de ficheru au van guardase les grabaciones."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr "Pulsie nueves tecles p"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Combinación non válida"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Llamentablemente, eses tecles nun puen asignase como atayos de tecláu."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Combinación non válida"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Llamentablemente, eses tecles nun puen asignase como atayos de tecláu."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Esta combinación yá ta usada por «%@»."
@@@ -20092,20 -20088,20 +20708,36 @@@ msgstr "Desaniciar el perfil escoyÃu
msgid "Create a new profile"
msgstr "Crear un nuevu perfil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Crear"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Nome de perfil ausente"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Nome de perfil ausente"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Tienes d'afitar un nome pa ficheru pal perfil."
@@@ -23576,23 -23572,23 +24208,43 @@@ msgstr "Trescodificar salida d'emisión
msgid "Overlays/Subtitles"
msgstr "Superposiciones/SubtÃtulu"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Familia de la fonte a usar"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Tamañu de fonte en pÃxels"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Familia de la fonte a usar"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Tamañu de fonte en pÃxels"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23601,11 -23597,11 +24253,19 @@@ msgstr "
"Tamañu predetermináu de les fontes a xenerar sobre'l videu. Si pones daqué "
"distinto a 0, esta opción va anular el tamañu relativu de fonte."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Opacidá del testu"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Opacidá del testu"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -23613,12 -23609,12 +24273,20 @@@ msgstr "
"La opacidá (opuestu de tresparencia) de testu a xenerar sobre'l videu. 0 = "
"tresparente, 255 = totalmente opacu."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Color de testu predetermináu"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23627,12 -23623,12 +24295,20 @@@
"(red + green), #FFFFFF = white"
msgstr "El color del testu que se va xenerar nel videu."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Tamañu relativu de la fonte"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -23641,59 -23637,59 +24317,111 @@@ msgstr "
"Tamañu relativu predetermináu de les fontes que se xeneren nel videu. Si "
"afites un tamañu de fonte absolutu, el tamañu relativu va ser anuláu."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Opacidá de fondu"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Color de fondu"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Esquema d'opacidá"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Opacidá de solombra"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Color de solombra"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Ãngulu de solombra"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Distancia de solombra"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Opacidá de fondu"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Color de fondu"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Esquema d'opacidá"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Opacidá de solombra"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Color de solombra"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Ãngulu de solombra"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Distancia de solombra"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Más pequeña"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Pequeña"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Grande"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Más grande"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Usar xenerador YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Usar xenerador YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -23701,23 -23697,23 +24429,43 @@@ msgstr "
"Esto xenera la fonte usando «YUV paletizáu». Esta opción namái precÃsase si "
"quies codificar con subtÃtulos DVB"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Fina"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Gruesu"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Xenerador de testu"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Xenerador de fonte Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Fina"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Gruesu"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Xenerador de testu"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Xenerador de fonte Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/az.po
index 19d8675,18b7056..cdcb865
--- a/po/az.po
+++ b/po/az.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-05-04 07:53+0000\n"
"Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -133,7 -133,7 +137,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -440,10 -440,10 +448,17 @@@ msgid "&About
msgstr ""
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -482,17 -482,17 +497,29 @@@ msgid "Save...
msgstr ""
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr ""
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr ""
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -572,7 -572,7 +599,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr ""
@@@ -1229,20 -1229,20 +1260,36 @@@ msgstr "
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1633,7 -1633,7 +1680,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1715,7 -1715,7 +1766,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr ""
@@@ -1739,7 -1739,7 +1794,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -1929,7 -1929,7 +1988,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr ""
@@@ -1980,7 -1980,7 +2043,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -1989,7 -1989,7 +2056,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2045,7 -2045,7 +2116,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2214,7 -2214,7 +2289,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2342,12 -2342,12 +2421,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2355,7 -2355,7 +2443,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2658,7 -2658,7 +2750,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3470,7 -3470,7 +3566,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3494,8 -3494,8 +3594,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3575,10 -3575,10 +3680,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3591,10 -3591,10 +3703,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr ""
@@@ -3603,9 -3603,9 +3722,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3840,9 -3840,9 +3965,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4256,7 -4256,7 +4387,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4453,12 -4453,12 +4588,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr ""
@@@ -5214,7 -5214,7 +5358,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7510,7 -7510,7 +7658,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8242,7 -8242,7 +8394,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9353,7 -9353,7 +9509,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9384,7 -9384,7 +9544,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9392,30 -9392,30 +9556,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10581,46 -10581,46 +10769,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10628,61 -10628,61 +10844,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10812,7 -10812,7 +11064,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12599,10 -12599,10 +12855,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -12707,8 -12707,8 +12970,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13044,9 -13044,9 +13312,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -14924,7 -14924,7 +15198,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15103,7 -15103,7 +15381,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15191,9 -15191,9 +15473,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr ""
@@@ -15332,7 -15332,7 +15620,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15352,7 -15352,7 +15644,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15362,7 -15362,7 +15658,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15382,84 -15382,84 +15682,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15495,7 -15495,7 +15866,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15678,8 -15678,8 +16053,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -15772,36 -15772,36 +16152,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15953,7 -15953,7 +16365,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16082,7 -16082,7 +16498,11 @@@ msgstr "
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr ""
@@@ -16167,15 -16167,15 +16587,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16191,30 -16191,30 +16623,56 @@@ msgstr "
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16223,7 -16223,7 +16681,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16451,7 -16451,7 +16913,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -16622,7 -16622,7 +17088,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -16851,12 -16851,12 +17321,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17033,129 -17033,125 +17511,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17168,35 -17164,35 +17754,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19134,20 -19130,20 +19750,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22450,45 -22446,45 +23082,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22497,93 -22493,93 +23165,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/be.po
index 17306ed,b65df69..07d8a63
--- a/po/be.po
+++ b/po/be.po
@@@ -10,7 -10,7 +10,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-10-27 08:40+0000\n"
"Last-Translator: nesterow <nestserau at me.com>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -141,7 -141,7 +145,11 @@@ msgstr "Ð†Ð½ÑˆÑ‹Ñ Ð³ÑƒÐºÐ°Ð²Ñ‹Ñ Ð½Ð°Ñ
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -482,10 -482,10 +490,17 @@@ msgid "&About
msgstr "&Пра праграму"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -524,17 -524,17 +539,29 @@@ msgid "Save...
msgstr "Захаваць..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Паўтараць уÑÑ‘"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Паўтараць адзін"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -641,7 -641,7 +668,11 @@@ msgstr "ДаÑÑгнута макÑім
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Ðдключыць"
@@@ -1348,20 -1348,20 +1379,36 @@@ msgstr "ЧаÑтата кадраў
msgid "Decoded format"
msgstr "ДÑкадаваны фармат"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "ГÑÑ‚Ñ‹ ўвод немагчыма адкрыць"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "ГÑÑ‚Ñ‹ ўвод немагчыма адкрыць"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC не можа адкрыць MRL \"%s\". ПадрабÑзнаÑці Ñž чаÑапіÑе."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC не можа вызначыць фармат даных уводу"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC не можа вызначыць фармат даных уводу"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1787,7 -1787,7 +1834,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1874,7 -1874,7 +1925,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "ÐÑма"
@@@ -1904,7 -1904,7 +1959,11 @@@ msgstr "
"Метад вываду відÑа, што ўжывае VLC. Ðўтаматычна выбіраецца найлепшы даÑтупны "
"метад, калі не зададзена іншае."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Уключыць відÑа"
@@@ -2110,7 -2110,7 +2169,11 @@@ msgstr "
"карыÑтацца гÑтай функцыÑй."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "ЗаÑтавацца наверÑе"
@@@ -2165,7 -2165,7 +2228,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2174,7 -2174,7 +2241,11 @@@ msgstr "Лікв. празрадковÐ
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Ð Ñжым ліквідаваннÑ"
@@@ -2232,7 -2232,7 +2303,11 @@@ msgstr "
"Ðдключаць кіраванне Ñілкаваннем Ð¿Ð°Ð´Ñ‡Ð°Ñ Ð¿Ñ€Ð°Ð¹Ð³Ñ€Ð°Ð²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ñа, каб прадухіліць "
"пераход камп'ютара Ñž Ñ€Ñжым Ñ‡Ð°ÐºÐ°Ð½Ð½Ñ Ð¿Ñ€Ð°Ð· неактыўнаÑць."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Ðздабленне акна"
@@@ -2427,7 -2427,7 +2502,11 @@@ msgstr "
"(1:1). Ð”Ð»Ñ Ñкрана 16:9, магчыма, варта выÑтавіць гÑÑ‚Ñ‹ параметр у 4:3 Ð´Ð·ÐµÐ»Ñ "
"Ð·Ð°Ñ…Ð°Ð²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð°Ð¿Ð¾Ñ€Ñ†Ñ‹Ð¹."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "ПрапуÑкаць кадры"
@@@ -2571,12 -2571,12 +2650,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2584,7 -2584,7 +2672,11 @@@ msgid "Default
msgstr "Стандартна"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2929,7 -2929,7 +3021,11 @@@ msgid "You can completely disable the s
msgstr "Можна цалкам адключыць апрацоўку Ñлаёў."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3874,7 -3874,7 +3970,11 @@@ msgid "These settings are the global VL
msgstr ""
"ГÑÑ‚Ñ‹Ñ Ð½Ð°Ñтаўленні задаюць Ð°Ð³ÑƒÐ»ÑŒÐ½Ñ‹Ñ ÑпалучÑнні клавіш (вÑдомых Ñк Ñкароты)."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ðічым"
@@@ -3900,8 -3900,8 +4000,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3981,10 -3981,10 +4086,17 @@@ msgid "Slower (fine)
msgstr "Крыху павольней"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3997,10 -3997,10 +4109,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Задайце Ñкарот Ð´Ð»Ñ Ð¿ÐµÑ€Ð°Ñ…Ð¾Ð´Ñƒ на наÑтупны аб'екта плÑйліÑту."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "ПапÑÑ€Ñдні"
@@@ -4009,9 -4009,9 +4128,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "Задайце Ñкарот Ð´Ð»Ñ Ð¿ÐµÑ€Ð°Ñ…Ð¾Ð´Ñƒ на папÑÑ€Ñдні аб'ект плÑйліÑту."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4246,9 -4246,9 +4371,15 @@@ msgid "Select the key to decrease audi
msgstr "Задайце Ñкарот Ð´Ð»Ñ Ð¿Ð°Ð¼ÑншÑÐ½Ð½Ñ Ð³ÑƒÑ‡Ð½Ð°Ñці."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Ðдключыць гук"
@@@ -4672,7 -4672,7 +4803,11 @@@ msgstr "Цыклічна пераклю
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Здымак"
@@@ -4879,12 -4879,12 +5014,21 @@@ msgstr "СцÑгваецца ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "СкаÑаваць"
@@@ -5647,7 -5647,7 +5791,11 @@@ msgstr "Кадраванне
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "СтаÑунак бакоў"
@@@ -8132,7 -8132,7 +8280,11 @@@ msgstr "Увод з Ñкрана
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Ðкран"
@@@ -8883,7 -8883,7 +9035,11 @@@ msgstr "МакÑ. чаÑтка #
msgid "Volume Set"
msgstr "Ðабор чаÑтак"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10058,7 -10058,7 +10214,11 @@@ msgstr "Гук 7.1
msgid "ALSA audio output"
msgstr "Вывад гуку цераз ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Памылка вываду гуку"
@@@ -10091,7 -10091,7 +10251,11 @@@ msgstr "Вывад гуку цераз
msgid "Android AudioTrack audio output"
msgstr "Вывад гуку цераз Android AudioTrack"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "Вывад цераз AudioUnit Ð´Ð»Ñ iOS"
@@@ -10099,22 -10099,22 +10263,38 @@@
msgid "Last audio device"
msgstr "ÐпошнÑÑ Ð°ÑžÐ´Ñ‹Ñ‘Ð¿Ñ€Ñ‹Ð»Ð°Ð´Ð°"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Вывад цераз HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Вывад цераз HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð°Ñ Ð¿Ñ€Ñ‹Ð»Ð°Ð´Ð° вываду гуку знаходзіцца Ñž выключным карыÑтанні іншай "
"праграмы."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Ðўдыёпрылада не Ñканфігуравана"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Ðўдыёпрылада не Ñканфігуравана"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10122,11 -10122,11 +10302,19 @@@ msgstr "
"ТрÑба наÑтавіць Ñхему дынамікаў цераз Audio Midi Setup у /Applications/"
"Utilities. Пакуль гук выводзіцца толькі Ñž Ñ€Ñжыме ÑÑ‚ÑÑ€Ñа."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "СіÑÑ‚ÑÐ¼Ð½Ð°Ñ Ð¿Ñ€Ñ‹Ð»Ð°Ð´Ð° вываду гуку"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "СіÑÑ‚ÑÐ¼Ð½Ð°Ñ Ð¿Ñ€Ñ‹Ð»Ð°Ð´Ð° вываду гуку"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Закадаваны вывад)"
@@@ -11418,46 -11418,46 +11606,74 @@@ msgstr "Цень
msgid "Outline"
msgstr "Контур"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Чорны"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "ШÑры"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "СрÑбны"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Белы"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Бардовы"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Чырвоны"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11465,61 -11465,61 +11681,97 @@@ msgid "Fuchsia
msgstr "Ружовы"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Жоўты"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Ðліўкавы"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "ЗÑлёны"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Бірузовы"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Ярка-зÑлёны"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Пурпуровы"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Цёмна-Ñіні"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Сіні"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11671,7 -11671,7 +11923,11 @@@ msgstr "Субтытры (пашыраÐ
msgid "Subtitle renderers using libass"
msgstr "Візуалізатары Ñубтытраў, што ўжываюць libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "СтварÑнне кÑшу шрыфтоў"
@@@ -13678,10 -13678,10 +13934,17 @@@ msgid "Fast
msgstr "Хуткі"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Звычайн."
@@@ -13791,8 -13791,8 +14054,13 @@@ msgid "D-Bus control interface
msgstr "ІнтÑÑ€Ñ„ÐµÐ¹Ñ ÐºÑ–Ñ€Ð°Ð²Ð°Ð½Ð½Ñ D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14147,9 -14147,9 +14415,15 @@@ msgstr "ІніцыÑлізацыÑ
msgid "Opening"
msgstr "Ðдкрыццё"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Паўза"
@@@ -16103,7 -16103,7 +16377,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "ДÑмультыплекÑар MPEG TS"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "ТÑлетÑкÑÑ‚"
@@@ -16292,7 -16292,7 +16570,11 @@@ msgid "VLC media player Help
msgstr "Даведка медыÑплÑера VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "ІндÑкÑ"
@@@ -16380,9 -16380,9 +16662,15 @@@ msgstr "УвÑдзіце назву нÐ
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Захаваць"
@@@ -16526,7 -16526,7 +16814,11 @@@ msgid "The stream must be playing or pa
msgstr ""
"Каб працавалі закладкі, паток павінен прайгравацца альбо ÑтаÑць на паўзе."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "ПерайÑці да чаÑу"
@@@ -16547,7 -16547,7 +16839,11 @@@ msgstr "
msgid "Backward"
msgstr "Ðазад"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16559,7 -16559,7 +16855,11 @@@ msgstr "
msgid "Forward"
msgstr "Ðаперад"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16583,23 -16583,15 +16883,35 @@@ msgstr "Укл./выкл. поўнаÑÐ
msgid "Click to enable fullscreen video playback."
msgstr "ПÑтрыкніце, каб актывізаваць поўнаÑкранны Ñ€Ñжым прайграваннÑ."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "ПÑтрыкніце Ñ– ўтрымлівайце, каб пераматаць назад бÑгучы медыÑаб'ект."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "ПÑтрыкніце Ñ– ўтрымлівайце, каб пераматаць наперад бÑгучы медыÑаб'ект."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "ПÑтрыкніце, каб Ñпыніць прайграванне."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Паказаць/Ñхаваць плÑйліÑÑ‚"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "ПÑтрыкніце, каб Ñпыніць прайграванне."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Паказаць/Ñхаваць плÑйліÑÑ‚"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -16607,12 -16599,12 +16919,20 @@@ msgstr "
"ДазвалÑе пераключацца паміж відÑа Ñ– плÑйліÑтом. Калі аÑноўнае акно не "
"паказвае відÑа, гÑтай кнопкай можна Ñхаваць плÑйліÑÑ‚."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Паўтор"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -16620,16 -16612,16 +16940,28 @@@ msgstr "
"ПÑтрыкніце, каб змÑніць Ñ€Ñжым паўтору. УÑÑго Ñ€Ñжымаў 3: паўтараць адзін "
"медыÑаб'ект, паўтараць уÑе Ñ– выкл."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "ПерамÑшаць"
+
+#: modules/gui/macosx/ControlsBar.m:484
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "ПерамÑшаць"
+
+ #: modules/gui/macosx/ControlsBar.m:450
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Click to enable or disable random playback."
msgstr ""
"ПÑтрыкніце, каб уключыць альбо адключыць прайграванне Ñž выпадковым парадку."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -16637,24 -16629,24 +16969,44 @@@ msgstr "
"ПÑтрыкніце Ñ–, утрымліваючы кнопку мышы, пераÑоўвайце паўзунок, каб змÑніць "
"гучнаÑць."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "ПÑтрыкніце, каб выключыць альбо ўключыць гук."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "МакÑÑ–Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð³ÑƒÑ‡Ð½Ð°Ñць"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "ПÑтрыкніце, каб выÑтавіць макÑімальную гучнаÑць."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "ПÑтрыкніце, каб выключыць альбо ўключыць гук."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "МакÑÑ–Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð³ÑƒÑ‡Ð½Ð°Ñць"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "ПÑтрыкніце, каб выÑтавіць макÑімальную гучнаÑць."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Ðфекты"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -16662,14 -16654,22 +17014,33 @@@ msgstr "
"ПÑтрыкніце, каб адкрыць панÑль ÐўдыёÑфектаў, што ўключае Ñквалайзер Ñ– Ñ–Ð½ÑˆÑ‹Ñ "
"фільтры."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "ПÑтрыкніце, каб перайÑці на папÑÑ€ÑднÑга аб'екта плÑйліÑта."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "ПÑтрыкніце, каб перайÑці да наÑтупнага аб'екта плÑйліÑта."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "ПÑтрыкніце, каб перайÑці на папÑÑ€ÑднÑга аб'екта плÑйліÑта."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "ПÑтрыкніце, каб перайÑці да наÑтупнага аб'екта плÑйліÑта."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "ПÑтрыкніце Ñ– ўтрымлівайце, каб пераматаць назад бÑгучы медыÑаб'ект."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "ПÑтрыкніце Ñ– ўтрымлівайце, каб пераматаць наперад бÑгучы медыÑаб'ект."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Канвертаваць Ñ– вÑшчаць"
@@@ -16705,7 -16705,7 +17076,11 @@@ msgstr "Выберыце Ð°Ð´Ñ€Ð°Ñ Ð¿Ñ
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16892,8 -16892,8 +17267,13 @@@ msgid "A SDP export is requested, but n
msgstr "Запытаны SDP-ÑкÑпарт, але не зададзены URL."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Іншае"
@@@ -16995,36 -16995,36 +17375,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "Больш не пытаць"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "Прайграванне медыÑаб'ектаў у VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "ЧаÑÐ°Ð¿Ñ–Ñ Ð·Ð±Ð¾ÑÑž не знойдзены"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "Прайграванне медыÑаб'ектаў у VLC"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "ЧаÑÐ°Ð¿Ñ–Ñ Ð·Ð±Ð¾ÑÑž не знойдзены"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "ПрацÑгнуць"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "ÐÑ–Ñкіх прыкмет папÑÑ€ÑднÑга збою не выÑўлена."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Выдаліць ÑÑ‚Ð°Ñ€Ñ‹Ñ Ð½Ð°Ñтаўленні?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Знойдзена ÑтарÑÐ¹ÑˆÐ°Ñ Ð²ÐµÑ€ÑÑ–Ñ Ñ„Ð°Ð¹Ð»Ð°Ñž наÑтаўленнÑÑž VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "ПераÑунуць у Ñметніцу Ñ– перазапуÑціць VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "ÐÑ–Ñкіх прыкмет папÑÑ€ÑднÑга збою не выÑўлена."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Выдаліць ÑÑ‚Ð°Ñ€Ñ‹Ñ Ð½Ð°Ñтаўленні?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Знойдзена ÑтарÑÐ¹ÑˆÐ°Ñ Ð²ÐµÑ€ÑÑ–Ñ Ñ„Ð°Ð¹Ð»Ð°Ñž наÑтаўленнÑÑž VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "ПераÑунуць у Ñметніцу Ñ– перазапуÑціць VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "ЧаÑÐ°Ð¿Ñ–Ñ Ð°Ð´Ð»Ð°Ð´ÐºÑ– VLC (%s).rtf"
@@@ -17200,7 -17200,7 +17612,11 @@@ msgid "
msgstr ""
"ГÑÑ‚Ñ‹ параметр дазвалÑе VLC мÑнÑць значок інтÑрфейÑу Ñž розных ÑітуацыÑÑ…."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "ФікÑаваны ÑтаÑунак бакоў"
@@@ -17333,7 -17333,7 +17749,11 @@@ msgstr "Схаваць VLC
msgid "Hide Others"
msgstr "Схаваць аÑтатніÑ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Паказаць уÑÑ‘"
@@@ -17418,15 -17418,15 +17838,27 @@@ msgstr "Ð¡Ñ–Ð½Ñ…Ñ€Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ‹Ñ Ð´Ð°
msgid "A→B Loop"
msgstr "Цыкл A→B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "ВыйÑці паÑÐ»Ñ Ð¿Ñ€Ð°Ð¹Ð³Ñ€Ð°Ð²Ð°Ð½Ð½Ñ"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Ðаперад"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "ВыйÑці паÑÐ»Ñ Ð¿Ñ€Ð°Ð¹Ð³Ñ€Ð°Ð²Ð°Ð½Ð½Ñ"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Ðаперад"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Ðазад"
@@@ -17442,30 -17442,30 +17874,56 @@@ msgstr "Зменшыць гучнаÑц
msgid "Audio Device"
msgstr "Ðўдыёпрылада"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Палавінны памер"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Ðармальны памер"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Двайны памер"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Падагнаць пад Ñкран"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Палавінны памер"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Ðармальны памер"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Двайны памер"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Падагнаць пад Ñкран"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Па-над уÑімі вокнамі"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Прылада поўнаÑкраннага відÑа"
@@@ -17474,7 -17474,7 +17932,11 @@@
msgid "Post processing"
msgstr "ПоÑтапрацоўка"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Дадаць файл Ñубтытраў..."
@@@ -17714,7 -17714,7 +18176,11 @@@ msgid "Play another media synchronously
msgstr "Сінхронна граць іншы медыÑаб'ект"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Выбраць..."
@@@ -17901,7 -17901,7 +18367,11 @@@ msgstr "к/Ñек
msgid "Subtitle encoding"
msgstr "Кадзіроўка Ñубтытраў"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Памер шрыфту"
@@@ -18130,12 -18130,12 +18600,20 @@@ msgstr "Памылка пры захаÐ
msgid "VLC was unable to save the meta data."
msgstr "VLC не можа захаваць гÑÑ‚Ñ‹Ñ Ð¼ÐµÑ‚Ð°Ð´Ð°Ð½Ñ‹Ñ"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "ÐаÑтаўленні"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Скінуць ÑžÑÑ‘"
@@@ -18314,130 -18314,125 +18792,238 @@@ msgstr "Уключыць паведам
msgid "Lua HTTP"
msgstr "HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Ставіць iTunes на паўзу на Ñ‡Ð°Ñ Ð³Ñ€Ð°Ð½Ð½Ñ VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Ð¡Ñ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð°Ñ ÐºÐ°Ð´Ð·Ñ–Ñ€Ð¾ÑžÐºÐ°"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "ÐаÑтаўленні адлюÑтраваннÑ"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Ð¡Ñ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð°Ñ ÐºÐ°Ð´Ð·Ñ–Ñ€Ð¾ÑžÐºÐ°"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "ÐаÑтаўленні адлюÑтраваннÑ"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Колер шрыфту"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Шрыфт"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Мовы Ñубтытраў"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Мовы Ñубтытраў"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "ÐŸÐ°Ð¶Ð°Ð´Ð°Ð½Ð°Ñ Ð¼Ð¾Ð²Ð° Ñубтытраў"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Уключыць Ñкранную індыкацыю"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Уключыць Ñкранную індыкацыю"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "ÐепразрыÑтаÑць"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "ТоўÑÑ‚Ñ‹"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "ТоўÑÑ‚Ñ‹"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Колер контуру"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Ð¢Ð°ÑžÑˆÑ‡Ñ‹Ð½Ñ ÐºÐ¾Ð½Ñ‚ÑƒÑ€Ñƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Зачарніць Ñкран у поўнаÑкранным Ñ€Ñжыме"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Зачарніць Ñкран у поўнаÑкранным Ñ€Ñжыме"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "ÐдлюÑтраванне"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Модуль вываду"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "ВідÑаздымкі"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Папка"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Фармат"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "ПрÑфікÑ"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "ПаÑлÑÐ´Ð¾ÑžÐ½Ð°Ñ Ð½ÑƒÐ¼Ð°Ñ€Ð°Ñ†Ñ‹Ñ"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "ÐпошнÑÑ Ð¿Ñ€Ð°Ð²ÐµÑ€ÐºÐ°: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Праверка ÑÑˆÑ‡Ñ Ð½Ðµ выконвалаÑÑ."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Модуль вываду"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "ВідÑаздымкі"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Папка"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Фармат"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "ПрÑфікÑ"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "ПаÑлÑÐ´Ð¾ÑžÐ½Ð°Ñ Ð½ÑƒÐ¼Ð°Ñ€Ð°Ñ†Ñ‹Ñ"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "ÐпошнÑÑ Ð¿Ñ€Ð°Ð²ÐµÑ€ÐºÐ°: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Праверка ÑÑˆÑ‡Ñ Ð½Ðµ выконвалаÑÑ."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "ÐайніжÑÐ¹ÑˆÐ°Ñ Ð»Ð°Ñ‚ÑнтнаÑць"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "ÐÑ–Ð·ÐºÐ°Ñ Ð»Ð°Ñ‚ÑнтнаÑць"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Ð’ÑÐ»Ñ–ÐºÐ°Ñ Ð»Ð°Ñ‚ÑнтнаÑць"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "ÐÐ°Ð¹Ð±Ð¾Ð»ÑŒÑˆÐ°Ñ Ð»Ð°Ñ‚ÑнтнаÑць"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Скінуць наÑтаўленні"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18459,20 -18454,20 +19045,37 @@@ msgstr "
"\n"
"Ðапраўду жадаеце працÑгнуць?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Выберыце каталог Ð´Ð»Ñ Ð·Ð°Ñ…Ð°Ð²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ñаздымкаў"
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Выбраць"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Ðазва каталога або файла Ð´Ð»Ñ Ð·Ð°Ñ…Ð°Ð²Ð°Ð½Ð½Ñ Ð·Ð°Ð¿Ñ–Ñаў"
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Выберыце каталог Ð´Ð»Ñ Ð·Ð°Ñ…Ð°Ð²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ñаздымкаў"
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Выбраць"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Ðазва каталога або файла Ð´Ð»Ñ Ð·Ð°Ñ…Ð°Ð²Ð°Ð½Ð½Ñ Ð·Ð°Ð¿Ñ–Ñаў"
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18480,16 -18475,16 +19083,29 @@@ msgstr "
"ÐаціÑніце ÑпалучÑнне клавіш длÑ\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Ð¥Ñ–Ð±Ð½Ð°Ñ ÐºÐ°Ð¼Ð±Ñ–Ð½Ð°Ñ†Ñ‹Ñ"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "ГÑÑ‚Ñ‹Ñ ÐºÐ»Ð°Ð²Ñ–ÑˆÑ‹ не могуць быць ужыты Ñž ÑкаÑці Ñкаротаў."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Ð¥Ñ–Ð±Ð½Ð°Ñ ÐºÐ°Ð¼Ð±Ñ–Ð½Ð°Ñ†Ñ‹Ñ"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "ГÑÑ‚Ñ‹Ñ ÐºÐ»Ð°Ð²Ñ–ÑˆÑ‹ не могуць быць ужыты Ñž ÑкаÑці Ñкаротаў."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "ГÑÑ‚Ð°Ñ ÐºÐ°Ð¼Ð±Ñ–Ð½Ð°Ñ†Ñ‹Ñ ÑžÐ¶Ð¾ прызначана Ð´Ð»Ñ \"%@\"."
@@@ -20555,20 -20550,20 +21171,36 @@@ msgstr "Выдаліць выбранÑ
msgid "Create a new profile"
msgstr "Стварыць новы профіль"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Стварыць"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "МультыплекÑар не паÑтаўлÑецца разам з VLC: ён можа адÑутнічаць."
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "ÐÑма назвы профілю"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr "МультыплекÑар не паÑтаўлÑецца разам з VLC: ён можа адÑутнічаць."
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "ÐÑма назвы профілю"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Профіль павінен мець назву."
@@@ -24088,23 -24083,23 +24720,43 @@@ msgstr "Перакадаванне вы
msgid "Overlays/Subtitles"
msgstr "ПлаÑÑ‚Ñ‹/Субтытры"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Роўнашырокі шрыфт"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Ðазва ÑÑмейÑтва шрыфту, Ñкі вы жадаеце выкарыÑтоўваць"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Файл шрыфту, Ñкі вы жадаеце выкарыÑтоўваць"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Памер шрыфту Ñž пікÑелÑÑ…"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Роўнашырокі шрыфт"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Ðазва ÑÑмейÑтва шрыфту, Ñкі вы жадаеце выкарыÑтоўваць"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Файл шрыфту, Ñкі вы жадаеце выкарыÑтоўваць"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Памер шрыфту Ñž пікÑелÑÑ…"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24113,11 -24108,11 +24765,19 @@@ msgstr "
"Стандартны памер шрыфтоў, ÑÐºÑ–Ñ Ð±ÑƒÐ´ÑƒÑ†ÑŒ выводзіцца паўзверх відÑа. Калі "
"значÑнне гÑтага параметра не 0, то Ñно замеÑціць адноÑны памер шрыфту."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "ПразрыÑтаÑць Ñ‚ÑкÑту"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "ПразрыÑтаÑць Ñ‚ÑкÑту"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24125,12 -24120,12 +24785,20 @@@ msgstr "
"ПразрыÑтаÑць Ñ‚ÑкÑту, Ñкі будзе выводзіцца паўзверх відÑа (0 = празрыÑÑ‚Ñ‹, 255 "
"= цалкам непразрыÑÑ‚Ñ‹)."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Колер Ñ‚ÑкÑту"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24143,12 -24138,12 +24811,20 @@@ msgstr "
"Ñіні. #000000=чорны, #FF0000=чырвоны, #00FF00=зÑлёны, #FFF00=жоўты (чырвоны "
"+ зÑлёны), #FFFFFF=белы"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "ÐдноÑны памер шрыфту"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24157,59 -24152,59 +24833,111 @@@ msgstr "
"ÐдноÑны памер шрыфтоў, ÑÐºÑ–Ñ Ð±ÑƒÐ´ÑƒÑ†ÑŒ выводзіцца паўзверх відÑа. Калі вызначаны "
"абÑалютны памер шрыфту, адноÑны будзе праігнараваны."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "ПразрыÑтаÑць фону"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Колер фону"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "ПразрыÑтаÑць контуру"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "ПразрыÑтаÑць ценю"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Колер ценю"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Вугал ценю"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Зрух ценю"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "ПразрыÑтаÑць фону"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Колер фону"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "ПразрыÑтаÑць контуру"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "ПразрыÑтаÑць ценю"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Колер ценю"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Вугал ценю"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Зрух ценю"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Ðайменшы"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Малы"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Ð’Ñлікі"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Ðайбольшы"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "ВыкарыÑтоўваць візуалізатар YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "ВыкарыÑтоўваць візуалізатар YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24217,23 -24212,23 +24945,43 @@@ msgstr "
"Ð’Ñ–Ð·ÑƒÐ°Ð»Ñ–Ð·Ð°Ñ†Ñ‹Ñ ÑˆÑ€Ñ‹Ñ„Ñ‚Ñƒ з выкарыÑтаннем \"палітры YUV\". ГÑÑ‚Ñ‹ параметр неабходны "
"толькі калі вы жадаеце закадаваць у DVB-Ñубтытры"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Тонкі"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "ТоўÑÑ‚Ñ‹"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Візуалізатар Ñ‚ÑкÑту"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Візуалізатар шрыфтоў Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Тонкі"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "ТоўÑÑ‚Ñ‹"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Візуалізатар Ñ‚ÑкÑту"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Візуалізатар шрыфтоў Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/bg.po
index fe909d2,d580217..97f9ef3
--- a/po/bg.po
+++ b/po/bg.po
@@@ -5,16 -5,14 +5,26 @@@
# Translators:
# nask0 <arrtedone at gmail.com>, 2013
# Ivo Ivanov, 2008,2010
++<<<<<<< HEAD
+# ivopetkov <ivopetkov at krutt.org>, 2013
+# cybercop <cybercop_montana at abv.bg>, 2013
+# alexdimitrov <kvikmen at gmail.com>, 2013
++=======
+ # ivopetkov <ivopetkov7 at hotmail.com>, 2013
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-12-05 12:25+0000\n"
+"Last-Translator: alexdimitrov <kvikmen at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-09-16 11:04+0000\n"
+ "Last-Translator: ivopetkov <ivopetkov7 at hotmail.com>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Bulgarian (http://www.transifex.com/projects/p/vlc-trans/"
"language/bg/)\n"
"Language: bg\n"
@@@ -141,7 -139,7 +151,11 @@@ msgstr "Различни наÑтрой
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -198,8 -196,8 +212,13 @@@ msgid "
"Settings related to the various access methods. Common settings you may want "
"to alter are HTTP proxy or caching settings."
msgstr ""
++<<<<<<< HEAD
+"ÐаÑтройки Ñвързани Ñ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ð¸Ñ‚Ðµ методи на доÑтъп.\n"
+"Обикновенно Ñе променÑÑ‚ наÑтройките на HTTP прокÑито или кеширането."
++=======
+ "ÐаÑтройки за различните методи на въвеждане използвани от VLC.\n"
+ "Обикновенно Ñе променÑÑ‚ наÑтройките на HTTP прокÑи или кеширането."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:103
msgid "Stream filters"
@@@ -245,7 -243,7 +264,11 @@@ msgstr "Кодеци за ÑубтитÑ
#: include/vlc_config_cat.h:118
msgid "Settings for subtitle, teletext and CC decoders and encoders."
++<<<<<<< HEAD
+msgstr "ÐаÑтройки за Ñубтитри, телетекÑÑ‚ и CC декодери и енкодери."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:120
msgid "General input settings. Use with care..."
@@@ -345,7 -343,7 +368,11 @@@ msgstr "
#: include/vlc_config_cat.h:164
msgid "VOD"
++<<<<<<< HEAD
+msgstr "Видео по \"поръчка\" /Video on demand/"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:165
msgid "VLC's implementation of Video On Demand"
@@@ -410,7 -408,7 +437,11 @@@ msgstr "Тези модули обезÐ
#: include/vlc_config_cat.h:196
msgid "These are general settings for video/audio/subtitle encoding modules."
++<<<<<<< HEAD
+msgstr "Това Ñа общи наÑтройки за кодиране на видео / аудио / модулите."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:199
msgid "Dialog providers can be configured here."
@@@ -421,8 -419,6 +452,11 @@@ msgid "
"In this section you can force the behavior of the subtitle demuxer, for "
"example by setting the subtitle type or file name."
msgstr ""
++<<<<<<< HEAD
+"Ð’ тази ÑекциÑ, можете да форÑирате поведението на Ñубтитрите, например за "
+"поÑочване на типа или файла на Ñубтитрите ."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_interface.h:134
msgid ""
@@@ -492,10 -488,10 +526,17 @@@ msgid "&About
msgstr "ОтноÑно"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -534,17 -530,17 +575,29 @@@ msgid "Save...
msgstr "ЗапиÑ..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Повторение на вÑички"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Повторение на един"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -624,7 -620,7 +677,11 @@@ msgstr "ДоÑтигнати Ñа маÐ
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Изключване"
@@@ -660,7 -656,7 +717,11 @@@ msgstr "ИзравнÑване Ñила
#: src/audio_output/output.c:377 modules/gui/macosx/MainMenu.m:383
#: modules/gui/macosx/MainMenu.m:384
msgid "Stereo audio mode"
++<<<<<<< HEAD
+msgstr "Стерео аудио режим"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/audio_output/output.c:412 src/libvlc-module.c:189
msgid "Dolby Surround"
@@@ -716,7 -712,7 +777,11 @@@ msgstr "Ðвтоматично
#: src/config/file.c:458
msgid "boolean"
++<<<<<<< HEAD
+msgstr "булев"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/file.c:458 src/config/help.c:468
msgid "integer"
@@@ -773,11 -769,11 +838,19 @@@ msgstr "
#: src/config/help.c:514
msgid " (default enabled)"
++<<<<<<< HEAD
+msgstr "(включено по подразбиране)"
+
+#: src/config/help.c:515
+msgid " (default disabled)"
+msgstr "(изключено по подразбиране)"
++=======
+ msgstr "(по подразбиране е включено)"
+
+ #: src/config/help.c:515
+ msgid " (default disabled)"
+ msgstr "(по подразбиране е изключено)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/help.c:680 src/config/help.c:683 src/config/help.c:690
#: src/config/help.c:692
@@@ -838,11 -834,11 +911,19 @@@ msgstr "
#: src/config/keys.c:56
msgid "Backspace"
++<<<<<<< HEAD
+msgstr "Ðазад /Backspace/"
+
+#: src/config/keys.c:57
+msgid "Brightness Down"
+msgstr "Ðамали ÑркоÑта"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:57
+ msgid "Brightness Down"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:58
msgid "Brightness Up"
@@@ -881,15 -877,15 +962,27 @@@ msgstr "
#: modules/gui/qt4/ui/podcast_configuration.h:104
#: modules/gui/qt4/ui/streampanel.h:172
msgid "Delete"
++<<<<<<< HEAD
+msgstr "Delete"
+
+#: src/config/keys.c:67
+msgid "Down"
+msgstr "Down"
+
+#: src/config/keys.c:68 modules/control/rc.c:74
+msgid "End"
+msgstr "End"
++=======
+ msgstr "Изтриване"
+
+ #: src/config/keys.c:67
+ msgid "Down"
+ msgstr "Ðадолу"
+
+ #: src/config/keys.c:68 modules/control/rc.c:74
+ msgid "End"
+ msgstr "Край"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:69
msgid "Enter"
@@@ -901,59 -897,59 +994,115 @@@ msgstr "Esc
#: src/config/keys.c:71
msgid "F1"
++<<<<<<< HEAD
+msgstr "F1"
+
+#: src/config/keys.c:72
+msgid "F10"
+msgstr "F10"
+
+#: src/config/keys.c:73
+msgid "F11"
+msgstr "F11"
+
+#: src/config/keys.c:74
+msgid "F12"
+msgstr "F12"
+
+#: src/config/keys.c:75
+msgid "F2"
+msgstr "F2"
+
+#: src/config/keys.c:76
+msgid "F3"
+msgstr "F3"
+
+#: src/config/keys.c:77
+msgid "F4"
+msgstr "F4"
+
+#: src/config/keys.c:78
+msgid "F5"
+msgstr "F5"
+
+#: src/config/keys.c:79
+msgid "F6"
+msgstr "F6"
+
+#: src/config/keys.c:80
+msgid "F7"
+msgstr "F7"
+
+#: src/config/keys.c:81
+msgid "F8"
+msgstr "F8"
+
+#: src/config/keys.c:82
+msgid "F9"
+msgstr "F9"
+
+#: src/config/keys.c:83
+msgid "Home"
+msgstr "Ðачало"
+
+#: src/config/keys.c:84
+msgid "Insert"
+msgstr "Вмъкване"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:72
+ msgid "F10"
+ msgstr ""
+
+ #: src/config/keys.c:73
+ msgid "F11"
+ msgstr ""
+
+ #: src/config/keys.c:74
+ msgid "F12"
+ msgstr ""
+
+ #: src/config/keys.c:75
+ msgid "F2"
+ msgstr ""
+
+ #: src/config/keys.c:76
+ msgid "F3"
+ msgstr ""
+
+ #: src/config/keys.c:77
+ msgid "F4"
+ msgstr ""
+
+ #: src/config/keys.c:78
+ msgid "F5"
+ msgstr ""
+
+ #: src/config/keys.c:79
+ msgid "F6"
+ msgstr ""
+
+ #: src/config/keys.c:80
+ msgid "F7"
+ msgstr ""
+
+ #: src/config/keys.c:81
+ msgid "F8"
+ msgstr ""
+
+ #: src/config/keys.c:82
+ msgid "F9"
+ msgstr ""
+
+ #: src/config/keys.c:83
+ msgid "Home"
+ msgstr ""
+
+ #: src/config/keys.c:84
+ msgid "Insert"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:86
msgid "Media Angle"
@@@ -969,7 -965,7 +1118,11 @@@ msgstr "
#: src/config/keys.c:89
msgid "Media Menu"
++<<<<<<< HEAD
+msgstr "Медийно меню"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:90
msgid "Media Next Frame"
@@@ -1049,19 -1045,19 +1202,35 @@@ msgstr "
#: src/config/keys.c:109
msgid "Page Down"
++<<<<<<< HEAD
+msgstr "Долна Ñтраница"
+
+#: src/config/keys.c:110
+msgid "Page Up"
+msgstr "Горна Ñтраница"
+
+#: src/config/keys.c:112 modules/demux/mp4/id3genres.h:76
+msgid "Space"
+msgstr "Space"
+
+#: src/config/keys.c:113
+msgid "Tab"
+msgstr "Таб"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:110
+ msgid "Page Up"
+ msgstr ""
+
+ #: src/config/keys.c:112 modules/demux/mp4/id3genres.h:76
+ msgid "Space"
+ msgstr ""
+
+ #: src/config/keys.c:113
+ msgid "Tab"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:114 src/libvlc-module.c:187
#: modules/gui/qt4/components/preferences_widgets.cpp:1425
@@@ -1071,7 -1067,7 +1240,11 @@@ msgstr "Ðе е зададен
#: src/config/keys.c:115
msgid "Up"
++<<<<<<< HEAD
+msgstr "Ðагоре"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:116 modules/gui/macosx/MainMenu.m:469
msgid "Volume Down"
@@@ -1079,7 -1075,7 +1252,11 @@@ msgstr "Звук - ÐамалÑване
#: src/config/keys.c:117
msgid "Volume Mute"
++<<<<<<< HEAD
+msgstr "Заглушаване на звука"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:118 modules/gui/macosx/MainMenu.m:468
msgid "Volume Up"
@@@ -1087,31 -1083,31 +1264,59 @@@ msgstr "Звук - Увеличаван
#: src/config/keys.c:119
msgid "Zoom In"
++<<<<<<< HEAD
+msgstr "Увеличаване"
+
+#: src/config/keys.c:120
+msgid "Zoom Out"
+msgstr "ÐамалÑване"
+
+#: src/config/keys.c:248
+msgid "Ctrl+"
+msgstr "Ctrl+"
+
+#: src/config/keys.c:249
+msgid "Alt+"
+msgstr "Alt+"
+
+#: src/config/keys.c:250
+msgid "Shift+"
+msgstr "Shift+"
+
+#: src/config/keys.c:251
+msgid "Meta+"
+msgstr "Meta+"
+
+#: src/config/keys.c:252
+msgid "Command+"
+msgstr "Command+"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:120
+ msgid "Zoom Out"
+ msgstr ""
+
+ #: src/config/keys.c:248
+ msgid "Ctrl+"
+ msgstr ""
+
+ #: src/config/keys.c:249
+ msgid "Alt+"
+ msgstr ""
+
+ #: src/config/keys.c:250
+ msgid "Shift+"
+ msgstr ""
+
+ #: src/config/keys.c:251
+ msgid "Meta+"
+ msgstr ""
+
+ #: src/config/keys.c:252
+ msgid "Command+"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/control.c:226
#, c-format
@@@ -1238,7 -1234,7 +1443,11 @@@ msgstr "ЧеÑтота на диÑкрÐ
#: src/input/es_out.c:2915
#, c-format
msgid "%u Hz"
++<<<<<<< HEAD
+msgstr "%u Херца"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/es_out.c:2925
msgid "Bits per sample"
@@@ -1255,7 -1251,7 +1464,11 @@@ msgstr "Битрейт
#: src/input/es_out.c:2930
#, c-format
msgid "%u kb/s"
++<<<<<<< HEAD
+msgstr "%u кб/Ñ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/es_out.c:2942
msgid "Track replay gain"
@@@ -1268,7 -1264,7 +1481,11 @@@ msgstr "ИзравнÑване Ñила
#: src/input/es_out.c:2945
#, c-format
msgid "%.2f dB"
++<<<<<<< HEAD
+msgstr "%.2f децибела"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/es_out.c:2954 modules/gui/macosx/ConvertAndSave.m:180
#: modules/gui/qt4/ui/profiles.h:732
@@@ -1291,20 -1287,20 +1508,36 @@@ msgstr "ЧеÑтота на кадри
msgid "Decoded format"
msgstr "Формат на декодирани"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Потокът не може да Ñе отвори"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Потокът не може да Ñе отвори"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC не може да отвори MRL '%s'. Вижте отчета за подробноÑти."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC не може да разпознае Ð²ÑŠÐ²ÐµÐ¶Ð´Ð°Ð½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC не може да разпознае Ð²ÑŠÐ²ÐµÐ¶Ð´Ð°Ð½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1464,7 -1460,7 +1697,11 @@@ msgstr "Уеб
#: src/interface/interface.c:98
msgid "Debug logging"
++<<<<<<< HEAD
+msgstr "Дебъг лог"
++=======
+ msgstr "Отчет за дебъг"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/interface/interface.c:101
msgid "Mouse Gestures"
@@@ -1739,7 -1735,7 +1976,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1829,7 -1825,7 +2070,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "ÐÑма"
@@@ -1859,7 -1855,7 +2104,11 @@@ msgstr "
"Метод за извеждане на видеото, който да Ñе използва от VLC. По подразбиране "
"автоматично Ñе избира най-Ð´Ð¾Ð±Ñ€Ð¸Ñ Ð´Ð¾Ñтъпен метод."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Включване на видеото"
@@@ -2064,7 -2060,7 +2313,11 @@@ msgstr "
"VLC ще Ñе опита да го използва по подразбиране."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Винаги най-отгоре"
@@@ -2123,7 -2119,7 +2376,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2132,7 -2128,7 +2389,11 @@@ msgstr "ДеинтерлейÑ
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Режим на деинтерлейÑа"
@@@ -2191,7 -2187,7 +2452,11 @@@ msgstr "
"избегне компютара да премине в режим на изчакване, заради отÑÑŠÑтвие на "
"активноÑÑ‚."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Оформление на прозореца"
@@@ -2397,7 -2393,7 +2662,11 @@@ msgstr "
"квадратни пикÑели (1:1). Ðко имате екран 16:9, Ñ‚Ñ€Ñбва да го промените на 4:3 "
"за да запазите пропорциите."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "ПропуÑкане на кадри"
@@@ -2545,12 -2541,12 +2814,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2558,7 -2554,7 +2836,11 @@@ msgid "Default
msgstr "По подразбиране"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2910,7 -2906,7 +3192,11 @@@ msgid "You can completely disable the s
msgstr "Можете напълно да изключите обработката на Ñлоевете."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3854,7 -3850,7 +4140,11 @@@ msgstr "
"Тези наÑтройки Ñа глобални клавиши на VLC, извеÑтни като \"клавишни "
"комбинации\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Игнориране"
@@@ -3880,8 -3876,8 +4170,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3893,7 -3889,7 +4188,11 @@@ msgstr "Избор на клавишнÐ
#: src/libvlc-module.c:1205
msgid "Exit fullscreen"
++<<<<<<< HEAD
+msgstr "Изход от цÑл екран"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1206
msgid "Select the hotkey to use to exit fullscreen state."
@@@ -3964,10 -3960,10 +4263,17 @@@ msgid "Slower (fine)
msgstr "По-бавно (поÑтепенно)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3981,10 -3977,10 +4287,17 @@@ msgstr "
"Избор на клавишна ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ Ð·Ð° избор на ÑÐ»ÐµÐ´Ð²Ð°Ñ‰Ð¸Ñ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚ в плейлиÑта."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Предишен"
@@@ -3994,9 -3990,9 +4307,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"Избор на клавишна ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ Ð·Ð° избор на Ð¿Ñ€ÐµÐ´Ð¸ÑˆÐ½Ð¸Ñ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚ в плейлиÑта."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4237,9 -4233,9 +4556,15 @@@ msgid "Select the key to decrease audi
msgstr "Избор на клавишна ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ Ð·Ð° намалÑване на звука."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Без звук"
@@@ -4419,11 -4415,11 +4744,19 @@@ msgstr "
#: src/libvlc-module.c:1346
#: modules/gui/qt4/components/playlist/standardpanel.cpp:234
msgid "Clear the playlist"
++<<<<<<< HEAD
+msgstr "ИзчиÑтване на ÑпиÑъка"
+
+#: src/libvlc-module.c:1347
+msgid "Select the key to clear the current playlist."
+msgstr "Избор на клавиш за изчиÑтване на текущиÑÑ‚ ÑпиÑък."
++=======
+ msgstr ""
+
+ #: src/libvlc-module.c:1347
+ msgid "Select the key to clear the current playlist."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1349
msgid "Playlist bookmark 1"
@@@ -4563,11 -4559,11 +4896,19 @@@ msgstr "Скриване на интеÑ
#: src/libvlc-module.c:1387
msgid "Context menu"
++<<<<<<< HEAD
+msgstr "КонтекÑтно меню"
+
+#: src/libvlc-module.c:1388
+msgid "Show the contextual popup menu."
+msgstr "Показване на изÑкачащо контекÑтно меню."
++=======
+ msgstr ""
+
+ #: src/libvlc-module.c:1388
+ msgid "Show the contextual popup menu."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1389
msgid "Take video snapshot"
@@@ -4654,7 -4650,7 +4995,11 @@@ msgstr "Превключване меж
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Снимане на кадър"
@@@ -4862,12 -4858,12 +5207,21 @@@ msgstr "ИзтеглÑне ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Отказ"
@@@ -5033,7 -5029,7 +5387,11 @@@ msgstr "
#: src/text/iso-639_def.h:59
msgid "Bulgarian"
++<<<<<<< HEAD
+msgstr "БългарÑки"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:60
msgid "Burmese"
@@@ -5633,7 -5629,7 +5991,11 @@@ msgstr "ИзрÑзване
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Съотношение на Ñтраните"
@@@ -6801,7 -6797,7 +7163,11 @@@ msgstr "
#: modules/access/fs.c:42
msgid "Expand"
++<<<<<<< HEAD
+msgstr "РазтÑгане"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/fs.c:44
msgid "Ignored extensions"
@@@ -6833,11 -6829,11 +7199,19 @@@ msgstr "
#: modules/access/fs.c:55
msgid "Do not sort the items."
++<<<<<<< HEAD
+msgstr "Ðе подреждай елементите."
+
+#: modules/access/fs.c:57
+msgid "Directory sort order"
+msgstr "Подредба на директориите"
++=======
+ msgstr ""
+
+ #: modules/access/fs.c:57
+ msgid "Directory sort order"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/fs.c:59
msgid "Define the sort algorithm used when adding items from a directory."
@@@ -7501,11 -7497,11 +7875,19 @@@ msgstr "
#: modules/access_output/file.c:203
msgid "Keep existing file"
++<<<<<<< HEAD
+msgstr "Запазване на ÑъщеÑÑ‚Ð²ÑƒÐ²Ð°Ñ‰Ð¸Ñ Ñ„Ð°Ð¹Ð»"
+
+#: modules/access_output/file.c:204
+msgid "Overwrite"
+msgstr "ПрезапиÑ"
++=======
+ msgstr ""
+
+ #: modules/access_output/file.c:204
+ msgid "Overwrite"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/http.c:51 modules/access/vnc.c:46
#: modules/misc/audioscrobbler.c:114 modules/stream_out/rtp.c:177
@@@ -7571,7 -7567,7 +7953,11 @@@ msgstr "Брой Ñегменти, ко
#: modules/access_output/livehttp.c:79
msgid "Allow cache"
++<<<<<<< HEAD
+msgstr "Позволи кеширане"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/livehttp.c:80
msgid "Add EXT-X-ALLOW-CACHE:NO directive in playlist-file if this is disabled"
@@@ -8046,7 -8042,7 +8432,11 @@@ msgstr "Въвеждане от екрÐ
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Екран"
@@@ -8789,7 -8785,7 +9179,11 @@@ msgstr "МакÑимална Ñила Ð
msgid "Volume Set"
msgstr "ÐаÑтройка Ñилата на звука"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -8989,7 -8985,7 +9383,11 @@@ msgstr "
#: modules/access/vnc.c:61
msgid "Compression level"
++<<<<<<< HEAD
+msgstr "Ðиво на компреÑиÑ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:62
msgid "Transfer compression level from 0 (none) to 9 (max)"
@@@ -8997,11 -8993,11 +9395,19 @@@ msgstr "
#: modules/access/vnc.c:63
msgid "Image quality"
++<<<<<<< HEAD
+msgstr "КачеÑтво на изображението"
+
+#: modules/access/vnc.c:64
+msgid "Image quality 1 to 9 (max)"
+msgstr "КачеÑтво на изображението от 1 до 9 (макÑимално)"
++=======
+ msgstr ""
+
+ #: modules/access/vnc.c:64
+ msgid "Image quality 1 to 9 (max)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:78
msgid "VNC"
@@@ -9959,7 -9955,7 +10365,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "Ðудио извеждане ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "ÐеуÑпех при аудио извеждането"
@@@ -9992,7 -9988,7 +10402,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -10000,31 -9996,31 +10414,55 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Въвеждане на звука чрез HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Въвеждане на звука чрез HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Избраното изходно аудио уÑтройÑтво Ñе използва единÑтвено от друга програма."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Ðудио уÑтройÑтвото не е наÑтроено"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Ðудио уÑтройÑтвото не е наÑтроено"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Кодирано извеждане)"
@@@ -11276,46 -11272,46 +11714,74 @@@ msgstr "СÑнка
msgid "Outline"
msgstr "Контур"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Черен"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Сив"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "СребриÑÑ‚"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "БÑл"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "КеÑтенÑв"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Червен"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11323,61 -11319,61 +11789,97 @@@ msgid "Fuchsia
msgstr "Виолетов"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Жълт"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "МаÑлинено зелен"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Зелен"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Тъмно зелен"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Жълто-зелен"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Лилав"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "МорÑко Ñин"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Син"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11529,7 -11525,7 +12031,11 @@@ msgstr "Субтитри (допълнÐ
msgid "Subtitle renderers using libass"
msgstr "Извеждане на Ñубтитри, като Ñе използва libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Създаване на кеша Ñ ÑˆÑ€Ð¸Ñ„Ñ‚Ð°"
@@@ -13461,20 -13457,20 +13967,34 @@@ msgstr "
#: modules/codec/x264.c:429
msgid "Fast"
++<<<<<<< HEAD
+msgstr "Бързо"
+
+#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ msgstr ""
+
+ #: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Ðормален"
#: modules/codec/x264.c:429
msgid "Slow"
++<<<<<<< HEAD
+msgstr "Бавно"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:434
msgid "Spatial"
@@@ -13575,8 -13571,8 +14095,13 @@@ msgid "D-Bus control interface
msgstr "УправлÑващ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13690,7 -13686,7 +14215,11 @@@ msgstr "
#: modules/control/hotkeys.c:424 modules/control/hotkeys.c:493
msgid "No active subtitle"
++<<<<<<< HEAD
+msgstr "ÐÑма активни Ñубтитри"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:430
msgid "Sub sync: bookmarked subtitle time"
@@@ -13929,9 -13925,9 +14458,15 @@@ msgstr "
msgid "Opening"
msgstr "ОтварÑне"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Пауза"
@@@ -15869,7 -15865,7 +16404,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "ДемултиплекÑор MPEG TS (Transport Stream)"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "ТелетекÑÑ‚"
@@@ -16048,7 -16044,7 +16587,11 @@@ msgid "VLC media player Help
msgstr "Помощ за VLC media player"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "ИндекÑ"
@@@ -16136,9 -16132,9 +16679,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "ЗапиÑ"
@@@ -16284,7 -16280,7 +16833,11 @@@ msgstr "
"Ðе е намерен входÑщ поток. Потокът Ñ‚Ñ€Ñбва да Ñе възпроизвежда или прекъÑнат "
"за да работÑÑ‚ отметките."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Преход до време"
@@@ -16304,7 -16300,7 +16857,11 @@@ msgstr "
msgid "Backward"
msgstr "Стъпка назад"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16314,7 -16310,7 +16871,11 @@@ msgstr "
msgid "Forward"
msgstr "Стъпка напред"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16334,84 -16330,84 +16895,155 @@@ msgstr "Превключване на Ñ
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "ПлейлиÑÑ‚"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "ПлейлиÑÑ‚"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Повторение"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Разбъркано"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Разбъркано"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "МакÑимална Ñила на звука"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "МакÑимална Ñила на звука"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Ефекти"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16447,7 -16443,7 +17079,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16632,8 -16628,8 +17268,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "ПотребителÑки избор"
@@@ -16736,36 -16732,36 +17377,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Ðе е намерен отчет за Ñрив"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Ðе е намерен отчет за Ñрив"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Продължаване"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Ðикакви признаци за предишен Ñрив не Ñа намерени."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Да Ñе изтриÑÑ‚ ли Ñтарите наÑтройки?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Ðамерени Ñа файлове Ñ Ð½Ð°Ñтройки на VLC за Ñтари верÑии."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Изпращане в кошчето и реÑтартиране на VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Ðикакви признаци за предишен Ñрив не Ñа намерени."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Да Ñе изтриÑÑ‚ ли Ñтарите наÑтройки?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Ðамерени Ñа файлове Ñ Ð½Ð°Ñтройки на VLC за Ñтари верÑии."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Изпращане в кошчето и реÑтартиране на VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16939,7 -16935,7 +17612,11 @@@ msgid "
msgstr ""
"Тази Ð¾Ð¿Ñ†Ð¸Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñва на интерфейÑа да Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð° Ñи при различни Ñлучаи."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Заключване Ñъотношението на Ñтраните"
@@@ -17068,7 -17064,7 +17745,11 @@@ msgstr "Скриване на VLC
msgid "Hide Others"
msgstr "Скриване на другите"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Показване на вÑички"
@@@ -17153,15 -17149,15 +17834,27 @@@ msgstr "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Изход Ñлед възпроизвеждането"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Стъпка напред"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Изход Ñлед възпроизвеждането"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Стъпка напред"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Стъпка назад"
@@@ -17177,30 -17173,30 +17870,56 @@@ msgstr "ÐамалÑване на звÑ
msgid "Audio Device"
msgstr "Ðудио уÑтройÑтво"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Половин размер"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Ðормален размер"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Двоен размер"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Ðагаждане към екрана"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Половин размер"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Ðормален размер"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Двоен размер"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Ðагаждане към екрана"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Задържане отгоре"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Видео уÑтройÑтво за цÑл екран"
@@@ -17209,9 -17205,9 +17928,15 @@@
msgid "Post processing"
msgstr "Допълнителна обработка"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
+msgid "Add Subtitle File..."
+msgstr "ДобавÑне на файл ÑÑŠÑ Ñубтитри..."
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
+ msgid "Add Subtitle File..."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:415 modules/gui/macosx/MainMenu.m:416
msgid "Subtitles Track"
@@@ -17219,11 -17215,11 +17944,19 @@@ msgstr "Пътечка ÑÑŠÑ ÑубтÐ
#: modules/gui/macosx/MainMenu.m:417
msgid "Text Size"
++<<<<<<< HEAD
+msgstr "Размер на текÑта"
+
+#: modules/gui/macosx/MainMenu.m:418
+msgid "Text Color"
+msgstr "ЦвÑÑ‚ на текÑта"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:418
+ msgid "Text Color"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:419
msgid "Outline Thickness"
@@@ -17231,11 -17227,11 +17964,19 @@@ msgstr "
#: modules/gui/macosx/MainMenu.m:421 modules/gui/macosx/MainMenu.m:422
msgid "Background Opacity"
++<<<<<<< HEAD
+msgstr "ÐепрозрачноÑÑ‚ на фона"
+
+#: modules/gui/macosx/MainMenu.m:423
+msgid "Background Color"
+msgstr "ЦвÑÑ‚ на фона"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:423
+ msgid "Background Color"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:425
msgid "Transparent"
@@@ -17439,7 -17435,7 +18180,11 @@@ msgid "Play another media synchronously
msgstr "Синхронно възпроизвеждане на друга медиÑ"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Изберете..."
@@@ -17601,7 -17597,7 +18346,11 @@@ msgstr "ВиÑочина на изобÑ
#: modules/gui/macosx/open.m:361
msgid "Add Subtitle File:"
++<<<<<<< HEAD
+msgstr "ДобавÑне на файл ÑÑŠÑ Ñубтитри:"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:366
msgid "Click to setup subtitle playback in full detail."
@@@ -17623,7 -17619,7 +18372,11 @@@ msgstr "Кадри в Ñекунда (F
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Размер на шрифта"
@@@ -17852,12 -17848,12 +18605,20 @@@ msgstr "Грешка при запиÑ
msgid "VLC was unable to save the meta data."
msgstr "Мета-данните не могат да Ñе запишат"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "ÐаÑтройки..."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "ВъзÑтановÑване"
@@@ -18036,129 -18032,125 +18797,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Кодиране по подразбиране"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "ÐаÑтройки на начина на показване"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Кодиране по подразбиране"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "ÐаÑтройки на начина на показване"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "ЦвÑÑ‚ на шрифта"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Шрифт"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Включване на екранно меню"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Включване на екранно меню"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "ÐепрозрачноÑÑ‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Удебелен шрифт"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Удебелен шрифт"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "ЦвÑÑ‚ на контура"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "УдебелÑване на контура"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Черни екрани в пълноекранен режим"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Черни екрани в пълноекранен режим"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Показване"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Модул за извеждане"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Снимки на кадри"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Папка"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Формат"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "ПредÑтавка"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Поредни чиÑла"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "ПоÑледна проверка на: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Ðе е правена проверка доÑега."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Модул за извеждане"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Снимки на кадри"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Папка"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Формат"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "ПредÑтавка"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Поредни чиÑла"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "ПоÑледна проверка на: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Ðе е правена проверка доÑега."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Ðай-малко задържане"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Малко задържане"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "ГолÑмо задържане"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Ðай-голÑмо задържане"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Стандартни наÑтройки"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18171,20 -18163,20 +19040,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Избор на папка, където да Ñе ÑъхранÑват Ñнимките на кадри."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Избор"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð¸Ð»Ð¸ име на файла, където запиÑите ще бъдат ÑъхранÑвани."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Избор на папка, където да Ñе ÑъхранÑват Ñнимките на кадри."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Избор"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð¸Ð»Ð¸ име на файла, където запиÑите ще бъдат ÑъхранÑвани."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18192,16 -18184,16 +19078,29 @@@ msgstr "
"ÐатиÑнете нов клавиш за \n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Ðевалидна комбинациÑ"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Тези клавиши не могат да приемат дейÑтвие за клавишни комбинации"
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Ðевалидна комбинациÑ"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Тези клавиши не могат да приемат дейÑтвие за клавишни комбинации"
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Тази ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ Ð²ÐµÑ‡Ðµ е зададена за \"%@\"."
@@@ -20259,20 -20251,20 +21158,36 @@@ msgstr "Изтриване на избÑ
msgid "Create a new profile"
msgstr "Създаване на нов профил"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "ДобавÑне"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "ЛипÑва име на профила"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "ЛипÑва име на профила"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "ТрÑбва да зададете име на профила"
@@@ -20480,8 -20472,9 +21395,14 @@@ msgid "Network Access Policy
msgstr "Управление доÑтъпа до мрежата"
#: modules/gui/qt4/dialogs/firstrun.cpp:98
++<<<<<<< HEAD
+msgid "Automatically retrieve media info"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Automatically retrieve media info"
+ msgstr "Ðвтоматично наÑтройване уÑилването на видеото."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:103
msgid "Regularly check for VLC updates"
@@@ -20786,15 -20779,15 +21707,27 @@@ msgstr "ОтварÑне на ÑубтÐ
#: modules/gui/qt4/dialogs_provider.hpp:40
msgid "Media Files"
++<<<<<<< HEAD
+msgstr "Файлове Ñ Ð¼ÐµÐ´Ð¸Ñ"
+
+#: modules/gui/qt4/dialogs_provider.hpp:44
+msgid "Subtitle Files"
+msgstr "Файлове ÑÑŠÑ Ñубтитри"
+
+#: modules/gui/qt4/dialogs_provider.hpp:45
+msgid "All Files"
+msgstr "Ð’Ñички файлове"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs_provider.hpp:44
+ msgid "Subtitle Files"
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs_provider.hpp:45
+ msgid "All Files"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/sout.cpp:45 modules/gui/qt4/ui/sout.h:201
msgid "Stream Output"
@@@ -20932,7 -20925,7 +21865,11 @@@ msgstr "Допълнителни бут
#: modules/gui/qt4/dialogs/toolbar.cpp:449
msgid "Playback Buttons"
++<<<<<<< HEAD
+msgstr "Бутони за възпроизвеждане"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/toolbar.cpp:453
msgid "Aspect ratio selector"
@@@ -21037,7 -21030,7 +21974,11 @@@ msgstr "Субтитри
#: modules/gui/qt4/menus.cpp:335 modules/gui/qt4/menus.cpp:1068
msgid "T&ools"
++<<<<<<< HEAD
+msgstr "И&нÑтрументи"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:338 modules/gui/qt4/menus.cpp:1103
msgid "V&iew"
@@@ -21053,7 -21046,7 +21994,11 @@@ msgstr "ОтварÑне на файл.
#: modules/gui/qt4/menus.cpp:355
msgid "&Open Multiple Files..."
++<<<<<<< HEAD
+msgstr "&ОтварÑне на нÑколко файла..."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:359 modules/gui/qt4/menus.cpp:920
msgid "Open &Disc..."
@@@ -21189,7 -21182,7 +22134,11 @@@ msgstr "Визуализации
#: modules/gui/qt4/menus.cpp:637
msgid "Add &Subtitle File..."
++<<<<<<< HEAD
+msgstr "ДобавÑне на &файл ÑÑŠÑ Ñубтитри..."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:639
msgid "Sub &Track"
@@@ -21553,7 -21546,7 +22502,11 @@@ msgstr "
#: modules/gui/qt4/qt4.cpp:184
msgid "Never"
++<<<<<<< HEAD
+msgstr "Ðикога"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:184
msgid "When minimized"
@@@ -21561,7 -21554,7 +22514,11 @@@ msgstr "
#: modules/gui/qt4/qt4.cpp:184
msgid "Always"
++<<<<<<< HEAD
+msgstr "Винаги"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:189
msgid "Qt interface"
@@@ -21939,7 -21932,7 +22896,11 @@@ msgstr "
#: modules/misc/gnutls.c:295 modules/misc/gnutls.c:314
msgid "Abort"
++<<<<<<< HEAD
+msgstr "ОтхвърлÑне"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/gnutls.c:295
msgid "View certificate"
@@@ -23777,23 -23770,23 +24738,43 @@@ msgstr "Прекодиране на иÐ
msgid "Overlays/Subtitles"
msgstr "Слоеве/Субтитри"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Избор на шрифт"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Шрифт, който иÑкате да използвате"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Стандартен размер на шрифта, в пикÑели"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Избор на шрифт"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Шрифт, който иÑкате да използвате"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Стандартен размер на шрифта, в пикÑели"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23802,11 -23795,11 +24783,19 @@@ msgstr "
"Задаване на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ð½Ð¸Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€ на шрифта. Ðко Ñе наÑтрои на нещо различно от "
"нула тази Ð¾Ð¿Ñ†Ð¸Ñ Ñ‰Ðµ подмени отноÑÐ¸Ñ‚ÐµÐ»Ð½Ð¸Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€ на шрифта."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "ÐепрозрачноÑÑ‚ на текÑта"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "ÐепрозрачноÑÑ‚ на текÑта"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -23814,12 -23807,12 +24803,20 @@@ msgstr "
"ÐепрозрачноÑÑ‚ (обратно на прозрачноÑÑ‚) на текÑта, който ще бъде извеждан във "
"видеото. 0 = прозрачен, 255 = напълно непрозрачен."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "ЦвÑÑ‚ на текÑта"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23828,12 -23821,12 +24825,20 @@@
"(red + green), #FFFFFF = white"
msgstr "ЦвÑÑ‚ на текÑта, който ще бъде извеждан във видеото."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "ОтноÑителен размер на шрифта"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -23842,59 -23835,59 +24847,111 @@@ msgstr "
"Задаване на отноÑÐ¸Ñ‚ÐµÐ»Ð½Ð¸Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€ на шрифта. Ðко ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€ \n"
"на шрифта е различен от нула, той ще подмени отноÑÐ¸Ñ‚ÐµÐ»Ð½Ð¸Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "ÐепрозрачноÑÑ‚ на фона"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "ЦвÑÑ‚ на фона"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "ÐепрозрачноÑÑ‚ на контура"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "ÐепрозрачноÑÑ‚ на ÑÑнката"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "ЦвÑÑ‚ на ÑÑнката"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Ъгъл на ÑÑнката"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "РазÑтоÑние на ÑÑнката"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "ÐепрозрачноÑÑ‚ на фона"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "ЦвÑÑ‚ на фона"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "ÐепрозрачноÑÑ‚ на контура"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "ÐепрозрачноÑÑ‚ на ÑÑнката"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "ЦвÑÑ‚ на ÑÑнката"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Ъгъл на ÑÑнката"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "РазÑтоÑние на ÑÑнката"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "По-малък"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Малък"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "ГолÑм"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "По-голÑм"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Използване на YUVP извеждане"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Използване на YUVP извеждане"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -23902,23 -23895,23 +24959,43 @@@ msgstr "
"Извеждане на шрифт, като Ñе използва \"YUV Ñ Ð¿Ð°Ð»Ð¸Ñ‚Ñ€Ð°\". Тази Ð¾Ð¿Ñ†Ð¸Ñ Ðµ "
"необходима, Ñамо ако иÑкате да кодирате Ñубтитрите в DVB."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Тънък"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Удебелен"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Извеждане на текÑÑ‚"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Извеждане на шрифтове Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Тънък"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Удебелен"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Извеждане на текÑÑ‚"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Извеждане на шрифтове Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -26121,7 -26114,7 +27198,11 @@@ msgstr "
#: modules/video_filter/panoramix.c:125
msgid "Gamma (Green) correction"
++<<<<<<< HEAD
+msgstr "ÐšÐ¾Ñ€ÐµÐºÑ†Ð¸Ñ Ð½Ð° гамата (зелено)"
++=======
+ msgstr "Гама ÐºÐ¾Ñ€ÐµÐºÑ†Ð¸Ñ (Зелено)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/panoramix.c:126
msgid ""
@@@ -28857,6 -28850,9 +29938,12 @@@ msgstr "
msgid "Media Manager List"
msgstr "Управление на ÑпиÑъка Ñ Ð¼ÐµÐ´Ð¸Ð¸"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Показване на подробноÑти"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -30439,12 -30435,8 +31526,17 @@@
#~ msgstr "ОК"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "ПодробноÑти за кодека"
+
+#, fuzzy
+#~ msgid "Add a subtitle file"
+#~ msgstr "ДобавÑне на файл ÑÑŠÑ Ñубтитри:"
++=======
+ #~ msgid "Add a subtitle file"
+ #~ msgstr "Използване на файл ÑÑŠÑ Ñубтитри"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Subtitles/OSD"
@@@ -30894,7 -30886,7 +31986,11 @@@
#, fuzzy
#~ msgid "Commands"
++<<<<<<< HEAD
+#~ msgstr "Command+"
++=======
+ #~ msgstr "Коментари"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "GNU/Linux osd/overlay framebuffer interface"
@@@ -31102,7 -31094,7 +32198,11 @@@
#, fuzzy
#~ msgid "&Tools"
++<<<<<<< HEAD
+#~ msgstr "И&нÑтрументи"
++=======
+ #~ msgstr "ИнÑтрумент"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "&Open (advanced)..."
@@@ -31573,7 -31565,7 +32673,11 @@@
#, fuzzy
#~ msgid "Clear Menu"
++<<<<<<< HEAD
+#~ msgstr "Медийно меню"
++=======
+ #~ msgstr "ИзчиÑтване"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Fullscreen controller width toggle"
@@@ -32399,7 -32391,7 +33503,11 @@@
#, fuzzy
#~ msgid "General editing filters"
++<<<<<<< HEAD
+#~ msgstr "Запазване на ÑъщеÑÑ‚Ð²ÑƒÐ²Ð°Ñ‰Ð¸Ñ Ñ„Ð°Ð¹Ð»"
++=======
+ #~ msgstr "ОÑновни наÑтройки на аудиото"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Distortion filters"
diff --combined po/bn.po
index 45de102,4a42827..7588d08
--- a/po/bn.po
+++ b/po/bn.po
@@@ -15,7 -15,7 +15,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2011-04-04 12:45+0600\n"
"Last-Translator: israt <israt at ankur.org.bd>\n"
"Language-Team: Bengali <ankur-bd-l10n at googlegroups.com>\n"
@@@ -142,7 -142,7 +146,11 @@@ msgstr "বিবিধ অডিও à¦
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -491,10 -491,10 +499,17 @@@ msgid "&About
msgstr "পরিচিতি (&A)"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -533,17 -533,17 +548,29 @@@ msgid "Save...
msgstr "সংরকà§à¦·à¦£..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "সমসà§à¦¤ পà§à¦¨à¦°à¦¾à¦¬à§ƒà¦¤à§à¦¤ কর"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "à¦à¦•à¦¬à¦¾à¦° পà§à¦¨à¦°à¦¾à¦¬à§ƒà¦¤à§à¦¤ করা"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -648,7 -648,7 +675,11 @@@ msgstr "পরিশোধকের স
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "নিষà§à¦•à§à¦°à¦¿à§Ÿ করা হবে"
@@@ -1396,20 -1396,20 +1427,36 @@@ msgstr "ফà§à¦°à§‡à¦®à§‡à¦° রেট
msgid "Decoded format"
msgstr "ডিকোডকৃত"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "আপনার ইনপà§à¦Ÿ খোলা যাচà§à¦›à§‡ না"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "আপনার ইনপà§à¦Ÿ খোলা যাচà§à¦›à§‡ না"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC '%s' MRL খà§à¦²à¦¤à§‡ বà§à¦¯à¦°à§à¦¥à¥¤ বিসà§à¦¤à¦¾à¦°à¦¿à¦¤ তথà§à¦¯à§‡à¦° জনà§à¦¯ লগ পরীকà§à¦·à¦¾ করà§à¦¨à¥¤"
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC ইনপà§à¦Ÿà§‡à¦° ফরমà§à¦¯à¦¾à¦Ÿ চিনতে পারছে না"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC ইনপà§à¦Ÿà§‡à¦° ফরমà§à¦¯à¦¾à¦Ÿ চিনতে পারছে না"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1847,7 -1847,7 +1894,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1936,7 -1936,7 +1987,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "কোনটি না"
@@@ -1966,7 -1966,7 +2021,11 @@@ msgstr "
"à¦à¦Ÿà¦¿ VLC দà§à¦¬à¦¾à¦°à¦¾ বà§à¦¯à¦¬à¦¹à§ƒà¦¤ à¦à¦¿à¦¡à¦¿à¦“ আউটপà§à¦Ÿ মেথড। পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ আচরন হলো বিদà§à¦¯à¦®à¦¾à¦¨ সেরা "
"মেথডটিকে সà§à¦¬à§Ÿà¦‚কà§à¦°à¦¿à§Ÿà¦à¦¾à¦¬à§‡ নিরà§à¦¬à¦¾à¦šà¦¨ করা।"
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "à¦à¦¿à¦¡à¦¿à¦“ সকà§à¦°à¦¿à§Ÿ করা"
@@@ -2172,7 -2172,7 +2231,11 @@@ msgstr "
"রেনà§à¦¡à¦¾à¦° করার কà§à¦·à¦®à¦¤à¦¾)। VLC à¦à¦Ÿà¦¿ পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ হিসেবে বà§à¦¯à¦¬à¦¹à¦¾à¦° করার চেষà§à¦Ÿà¦¾ করবে।"
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "সরà§à¦¬à¦¦à¦¾ উপরে থাকবে"
@@@ -2229,7 -2229,7 +2292,11 @@@ msgstr "x মিলিসেকেনà§
# à¦à¦Ÿà¦¾ ঠিক থাকা সতà§à¦¤à§à¦¬à§‡à¦“ vlc তে ইংরেজি দেখায়। -সাজà§à¦œà¦¾à¦¦
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2238,7 -2238,7 +2305,11 @@@ msgstr "ডিইনà§à¦Ÿà¦¾à¦°à¦²à§‡à
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "ডিইনà§à¦Ÿà¦¾à¦°à¦²à§‡à¦¸ মোড"
@@@ -2296,7 -2296,7 +2367,11 @@@ msgstr "
"যেকোনো পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦•à§‡à¦° সময় পাওয়ার মà§à¦¯à¦¾à¦¨à§‡à¦œà¦®à§‡à¦¨à§à¦Ÿ ডেমন সংযত করা হবে, যেন করà§à¦®à¦¹à§€à¦¨à¦¤à¦¾à¦° জনà§à¦¯ "
"কমà§à¦ªà¦¿à¦‰à¦Ÿà¦¾à¦° বনà§à¦§ হয়ে না যায়।"
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "উইনà§à¦¡à§‹ সজà§à¦œà¦¾"
@@@ -2498,7 -2498,7 +2573,11 @@@ msgstr "
"থাকে। আপনার পরà§à¦¦à¦¾à¦Ÿà¦¿ যদি ১৬:৯ হয়, অনà§à¦ªà¦¾à¦¤ ঠিক রাখার জনà§à¦¯ আপনি à¦à¦Ÿà¦¾à¦•à§‡ ৪:৩ করতে "
"পারেন।"
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "ফà§à¦°à§‡à¦® à¦à§œà¦¿à§Ÿà§‡ যাওয়া"
@@@ -2649,12 -2649,12 +2728,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2662,7 -2662,7 +2750,11 @@@ msgid "Default
msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -3003,7 -3003,7 +3095,11 @@@ msgid "You can completely disable the s
msgstr "আপনি সমà§à¦ªà§‚রà§à¦£à¦°à§‚পে উপ-ছবি পà§à¦°à¦¸à§‡à¦¸à¦¿à¦‚ নিষà§à¦•à§à¦°à¦¿à§Ÿ করতে পারেন।"
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3946,7 -3946,7 +4042,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "à¦à¦‡ সেটিংগà§à¦²à§‹ গà§à¦²à§‹à¦¬à¦¾à¦² VLC কী বাইনà§à¦¡à¦¿à¦‚, যা \"হট কী\" নামে পরিচিত।"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "উপেকà§à¦·à¦¾ করা হবে"
@@@ -3974,8 -3974,8 +4074,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4058,10 -4058,10 +4163,17 @@@ msgid "Slower (fine)
msgstr "ধীরতম (à¦à¦¾à¦²)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4074,10 -4074,10 +4186,17 @@@ msgid "Select the hotkey to use to ski
msgstr "পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿà§‡à¦° পরবরà§à¦¤à§€ আইটেমে যাওয়ার জনà§à¦¯ হট কী নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে।"
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "পূরà§à¦¬à¦¬à¦°à§à¦¤à§€"
@@@ -4086,9 -4086,9 +4205,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿà§‡à¦° পূরà§à¦¬à¦¬à¦°à§à¦¤à§€ আইটেমে যাওয়ার জনà§à¦¯ হট কী নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে।"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4323,9 -4323,9 +4448,15 @@@ msgid "Select the key to decrease audi
msgstr "অডিও à¦à¦²à¦¿à¦‰à¦® কমানোর জনà§à¦¯ কী নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে।"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "শবà§à¦¦ বনà§à¦§ করা হবে"
@@@ -4759,7 -4759,7 +4890,11 @@@ msgstr "বিদà§à¦¯à¦®à¦¾à¦¨ অড
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "সà§à¦¨à§à¦¯à¦¾à¦ªà¦¶à¦Ÿ"
@@@ -4965,12 -4965,12 +5100,21 @@@ msgstr "ডাউনলোড করà¦
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "বাতিল"
@@@ -5743,7 -5743,7 +5887,11 @@@ msgstr "ছাà¦à¦Ÿà¦¾
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "দৃশà§à¦¯à¦®à¦¾à¦¨ অনà§à¦ªà¦¾à¦¤"
@@@ -8273,7 -8273,7 +8421,11 @@@ msgstr "পরà§à¦¦à¦¾à¦° ইনপà§
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "পরà§à¦¦à¦¾"
@@@ -9091,7 -9091,7 +9243,11 @@@ msgstr "সরà§à¦¬à§‹à¦šà§à¦š à¦à¦²
msgid "Volume Set"
msgstr "à¦à¦²à¦¿à¦‰à¦® সেট"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10328,7 -10328,7 +10484,11 @@@ msgstr "পারিপারà§à¦¶à§à
msgid "ALSA audio output"
msgstr "ALSA অডিও আউটপà§à¦Ÿ"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "অডিও আউটপà§à¦Ÿ বà§à¦¯à¦°à§à¦¥"
@@@ -10363,7 -10363,7 +10523,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "গà§à¦°à§‡à¦¸à§à¦•à§‡à¦² à¦à¦¿à¦¡à¦¿à¦“ আউটপà§à¦Ÿ"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "HAL AudioUnit আউটপà§à¦Ÿ"
@@@ -10373,21 -10373,21 +10537,37 @@@
msgid "Last audio device"
msgstr "অডিও ডিà¦à¦¾à¦‡à¦¸"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit আউটপà§à¦Ÿ"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit আউটপà§à¦Ÿ"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ অডিও আউটপà§à¦Ÿ ডিà¦à¦¾à¦‡à¦¸à¦Ÿà¦¿ অনà§à¦¯ à¦à¦•à¦Ÿà¦¿ পà§à¦°à§‹à¦—à§à¦°à¦¾à¦® দà§à¦¬à¦¾à¦°à¦¾ বিশেষà¦à¦¾à¦¬à§‡ বà§à¦¯à¦¬à¦¹à§ƒà¦¤ হচà§à¦›à§‡à¥¤"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "অডিও ডিà¦à¦¾à¦‡à¦¸à¦Ÿà¦¿ কনফিগার করা হয়নি"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "অডিও ডিà¦à¦¾à¦‡à¦¸à¦Ÿà¦¿ কনফিগার করা হয়নি"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
@@@ -10396,12 -10396,12 +10576,20 @@@ msgstr "
"আপনার /অà§à¦¯à¦¾à¦ªà§à¦²à¦¿à¦•à§‡à¦¶à¦¨/ইউটিলিটি থেকে \"অডিও মিডি সেটআপ\" ইউটিলিটি দà§à¦¬à¦¾à¦°à¦¾ সà§à¦ªà¦¿à¦•à¦¾à¦°à§‡à¦° "
"বহিরà§à¦¬à¦¿à¦¨à§à¦¯à¦¾à¦¸ কনফিগার করা উচিত। à¦à¦–ন সà§à¦Ÿà§‡à¦°à¦¿à¦“ মোড বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হচà§à¦›à§‡à¥¤"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "অডিও আউটপà§à¦Ÿ ডিà¦à¦¾à¦‡à¦¸ নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (à¦à¦¨à¦•à§‹à¦¡ করা আউটপà§à¦Ÿ)"
@@@ -11697,46 -11697,46 +11885,74 @@@ msgstr "ছায়া
msgid "Outline"
msgstr "রূপরেখা"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "কালো"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "ধূসর"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "রà§à¦ªà¦¾à¦²à§€"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "সাদা"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "মেরà§à¦¨"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "লাল"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11744,61 -11744,61 +11960,97 @@@ msgid "Fuchsia
msgstr "গোলাপী"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "হলà§à¦¦"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "জলপাই রং"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "সবà§à¦œ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "টিল"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "লাইম"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "পারà§à¦ªà¦²"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "নেà¦à§€"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "নীল"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11941,7 -11941,7 +12193,11 @@@ msgstr "সাবটাইটেল (à¦
msgid "Subtitle renderers using libass"
msgstr "libass বà§à¦¯à¦¬à¦¹à¦¾à¦° করে সাবটাইটেল রেনà§à¦¡à¦¾à¦° করে"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "ফনà§à¦Ÿ কà§à¦¯à¦¾à¦¶ তৈরি হচà§à¦›à§‡"
@@@ -13953,10 -13953,10 +14209,17 @@@ msgid "Fast
msgstr "দà§à¦°à§à¦¤à¦¤à¦°"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "সাধারণ"
@@@ -14075,8 -14075,8 +14338,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus কনà§à¦Ÿà§à¦°à§‹à¦² ইনà§à¦Ÿà¦¾à¦°à¦«à§‡à¦¸"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14438,9 -14438,9 +14706,15 @@@ msgstr "শà§à¦°à§ করা হচà§
msgid "Opening"
msgstr "খোলা হচà§à¦›à§‡"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "বিরতি"
@@@ -16466,7 -16466,7 +16740,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG টà§à¦°à¦¾à¦¨à§à¦¸à¦ªà§‹à¦°à§à¦Ÿ সà§à¦Ÿà§à¦°à§€à¦® ডিমাকà§à¦¸à¦¾à¦°"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "টেলিটেকà§à¦¸à¦Ÿ"
@@@ -16646,7 -16646,7 +16924,11 @@@ msgid "VLC media player Help
msgstr "VLC মিডিয়া পà§à¦²à§‡à§Ÿà¦¾à¦° সহায়তা"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "সূচী"
@@@ -16743,9 -16743,9 +17025,15 @@@ msgstr "নতà§à¦¨ ফোলà§à¦¡à¦¾
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "সংরকà§à¦·à¦£"
@@@ -16894,7 -16894,7 +17182,11 @@@ msgstr "কোনো ইনপà§à¦Ÿ à¦
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "বà§à¦•à¦®à¦¾à¦°à§à¦• কাজ করার জনà§à¦¯ সà§à¦Ÿà§à¦°à¦¿à¦®à¦Ÿà¦¿à¦•à§‡ অবশà§à¦¯à¦‡ চালাতে বা বিরতিতে থাকতে হবে।"
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "সরাসরি à¦à¦‡ সময়ে সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à¦°"
@@@ -16915,7 -16915,7 +17207,11 @@@ msgstr "
msgid "Backward"
msgstr "পেছনে যান"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16926,7 -16926,7 +17222,11 @@@ msgstr "
msgid "Forward"
msgstr "সামনে à¦à¦—িয়ে যান"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16948,92 -16948,92 +17248,163 @@@ msgstr "পূরà§à¦£à¦ªà¦°à§à¦¦à¦¾à
msgid "Click to enable fullscreen video playback."
msgstr "à¦à¦¿à¦¡à¦¿à¦“ পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦•à§‡à¦° সময় সà§à¦•à§à¦°à¦¿à¦¨à¦¸à§‡à¦à¦¾à¦° নিষà§à¦•à§à¦°à¦¿à§Ÿ করা হবে।"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦• বনà§à¦§ করার জনà§à¦¯ হট কী নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে।"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "পà§à¦²à§‡-লিসà§à¦Ÿ পà§à¦°à¦¦à¦°à§à¦¶à¦¨ করা হবে"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "পà§à¦¨à¦°à¦¾à¦¬à§ƒà¦¤à§à¦¤ করা হবে:"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "অডিওর শবà§à¦¦ বনà§à¦§ করার জনà§à¦¯ কী নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে।"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "ছোট আকারের à¦à¦²à¦¿à¦‰à¦® সà§à¦²à¦¾à¦‡à¦¡à¦¾à¦°"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to play the audio at maximum volume."
msgstr "পà§à¦°à¦¸à§à¦¥ à¦à¦¬à¦‚ উচà§à¦šà¦¤à¦¾à¦° মানকে সরà§à¦¬à§‹à¦šà§à¦š বিবেচনা করা হবে।"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "আবহ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr "পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿà§‡à¦° পূরà§à¦¬à¦¬à¦°à§à¦¤à§€ আইটেমে যাওয়ার জনà§à¦¯ হট কী নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে।"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the next playlist item."
msgstr "VLC বরà§à¦¤à¦®à¦¾à¦¨ পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿà§‡à¦° আইটেমগà§à¦²à§‹ চালাতে থাকবে।"
++<<<<<<< HEAD
++=======
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -17075,7 -17075,7 +17446,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17274,8 -17274,8 +17649,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "সà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤"
@@@ -17377,37 -17377,37 +17757,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "VLC মিডিয়া পà§à¦²à§‡à§Ÿà¦¾à¦°"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "কোনো CrashLog পাওয়া যায়নি"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "কোনো CrashLog পাওয়া যায়নি"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "চালিয়ে যান"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "পূরà§à¦¬à¦¬à¦°à§à¦¤à§€ কà§à¦°à§à¦¯à¦¾à¦¶à§‡à¦° কোনো পà§à¦°à¦®à¦¾à¦£ পাওয়া যায়নি।"
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "পà§à¦°à¦¨à§‹ পছনà§à¦¦à¦¸à¦®à§‚হ মà§à¦›à§‡ ফেলা হবে?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "আমরা à¦à¦‡à¦®à¦¾à¦¤à§à¦° VLC à¦à¦° পছনà§à¦¦à¦¸à¦®à§‚হ ফাইলের à¦à¦•à¦Ÿà¦¿ পà§à¦°à¦¾à¦¤à¦¨ সংসà§à¦•à¦°à¦¨ খà§à¦œà§‡ পেয়েছি।"
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "টà§à¦°à§à¦¯à¦¾à¦¶à§‡ সরিয়ে নিন à¦à¦¬à¦‚ VLC পà§à¦¨à¦°à¦¾à§Ÿ চালৠকরা"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "পূরà§à¦¬à¦¬à¦°à§à¦¤à§€ কà§à¦°à§à¦¯à¦¾à¦¶à§‡à¦° কোনো পà§à¦°à¦®à¦¾à¦£ পাওয়া যায়নি।"
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "পà§à¦°à¦¨à§‹ পছনà§à¦¦à¦¸à¦®à§‚হ মà§à¦›à§‡ ফেলা হবে?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "আমরা à¦à¦‡à¦®à¦¾à¦¤à§à¦° VLC à¦à¦° পছনà§à¦¦à¦¸à¦®à§‚হ ফাইলের à¦à¦•à¦Ÿà¦¿ পà§à¦°à¦¾à¦¤à¦¨ সংসà§à¦•à¦°à¦¨ খà§à¦œà§‡ পেয়েছি।"
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "টà§à¦°à§à¦¯à¦¾à¦¶à§‡ সরিয়ে নিন à¦à¦¬à¦‚ VLC পà§à¦¨à¦°à¦¾à§Ÿ চালৠকরা"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC ডিবাগ লগ (%s).rtfd"
@@@ -17576,7 -17576,7 +17988,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "দৃশà§à¦¯à¦®à¦¾à¦¨ অনà§à¦ªà¦¾à¦¤ লক করা হবে"
@@@ -17717,7 -17717,7 +18133,11 @@@ msgstr "VLC গোপন করা
msgid "Hide Others"
msgstr "অনà§à¦¯à¦¾à¦¨à§à¦¯ গোপন করা"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "সমসà§à¦¤ পà§à¦°à¦¦à¦°à§à¦¶à¦¨ করা"
@@@ -17808,15 -17808,15 +18228,27 @@@ msgstr "টà§à¦°à§à¦¯à¦¾à¦• সিন
msgid "A→B Loop"
msgstr "A->B পà§à¦¨à¦°à¦¾à¦¬à§ƒà¦¤à§à¦¤à¦¿"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦•à§‡à¦° পর পà§à¦°à¦¸à§à¦¥à¦¾à¦¨ করা হবে"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "সামনে à¦à¦—িয়ে যান"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦•à§‡à¦° পর পà§à¦°à¦¸à§à¦¥à¦¾à¦¨ করা হবে"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "সামনে à¦à¦—িয়ে যান"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "পেছনে যান"
@@@ -17832,30 -17832,30 +18264,56 @@@ msgstr "হà§à¦°à¦¾à¦¸à¦•à§ƒà¦¤ à¦à¦²
msgid "Audio Device"
msgstr "অডিও ডিà¦à¦¾à¦‡à¦¸"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "অরà§à¦§à§‡à¦• আকার"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "সাধারন আকার"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "দà§à¦¬à¦¿à¦—à§à¦¨ আকার"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "পরà§à¦¦à¦¾à¦° মাপসই করা হবে"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "অরà§à¦§à§‡à¦• আকার"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "সাধারন আকার"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "দà§à¦¬à¦¿à¦—à§à¦¨ আকার"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "পরà§à¦¦à¦¾à¦° মাপসই করা হবে"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "শীরà§à¦·à§‡ à¦à¦¾à¦¸à¦®à¦¾à¦¨"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "পূরà§à¦¨à¦ªà¦°à§à¦¦à¦¾ à¦à¦¿à¦¡à¦¿à¦“ ডিà¦à¦¾à¦‡à¦¸"
@@@ -17864,7 -17864,7 +18322,11 @@@
msgid "Post processing"
msgstr "পরবরà§à¦¤à§€ পà§à¦°à¦¸à§‡à¦¸à¦¿à¦‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "সাবটাইটেল ফাইল"
@@@ -18107,7 -18107,7 +18569,11 @@@ msgid "Play another media synchronously
msgstr "যà§à¦—পৎà¦à¦¾à¦¬à§‡ আরেকটি মিডিয়া চালানো হবে "
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "পছনà§à¦¦..."
@@@ -18303,7 -18303,7 +18769,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "সাবটাইটেল à¦à¦¨à¦•à§‹à¦¡à¦¿à¦‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "ফনà§à¦Ÿà§‡à¦° আকার"
@@@ -18535,12 -18535,12 +19005,20 @@@ msgstr "মেটা সংরকà§à¦·
msgid "VLC was unable to save the meta data."
msgstr "VLC মেটাডাটা সংরকà§à¦·à¦£ করতে বà§à¦¯à¦°à§à¦¥ হয়েছে।"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "পছনà§à¦¦à¦¸à¦®à§‚হ"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "সব পà§à¦¨à¦ƒà¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£"
@@@ -18728,136 -18728,131 +19206,244 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "পà§à¦²à§‡-বà§à¦¯à¦¾à¦•à§‡ বিরতি দিন"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦à¦¨à¦•à§‹à¦¡à¦¿à¦‚"
+
+#: modules/gui/macosx/simple_prefs.m:378
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦à¦¨à¦•à§‹à¦¡à¦¿à¦‚"
+
+ #: modules/gui/macosx/simple_prefs.m:377
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Display Settings"
msgstr "পà§à¦°à¦¦à¦°à§à¦¶à¦¨à§€ সেটিং"
# à¦à¦Ÿà¦¾ ঠিক থাকা সতà§à¦¤à§à¦¬à§‡à¦“ vlc তে ইংরেজি দেখায়। -সাজà§à¦œà¦¾à¦¦
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "ফনà§à¦Ÿà§‡à¦° রং"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "ফনà§à¦Ÿ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "সাবটাইটেলের à¦à¦¾à¦·à¦¾"
# à¦à¦Ÿà¦¾ ঠিক থাকা সতà§à¦¤à§à¦¬à§‡à¦“ vlc তে ইংরেজি দেখায়। -সাজà§à¦œà¦¾à¦¦
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "পছনà§à¦¦à¦¸à¦‡ সাবটাইটেল à¦à¦¾à¦·à¦¾"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OSD সকà§à¦°à¦¿à§Ÿ"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OSD সকà§à¦°à¦¿à§Ÿ"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "অসà§à¦¬à¦šà§à¦›à¦¤à¦¾"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Force bold"
msgstr "মোনো অডিও কারà§à¦¯à¦•à¦° করা হবে"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "রূপরেখা"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "পূরà§à¦£à¦ªà¦°à§à¦¦à¦¾à¦° মোডে কালো পরà§à¦¦à¦¾"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "পূরà§à¦£à¦ªà¦°à§à¦¦à¦¾à¦° মোডে কালো পরà§à¦¦à¦¾"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "ডিসপà§à¦²à§‡"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "আউটপà§à¦Ÿ মডিউল"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "à¦à¦¿à¦¡à¦¿à¦“ সà§à¦¨à§à¦¯à¦¾à¦ªà¦¶à¦Ÿ"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "ফোলà§à¦¡à¦¾à¦°"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "ফরমেট"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "পà§à¦°à¦¿à¦«à¦¿à¦•à§à¦¸"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "অনà§à¦•à§à¦°à¦®à¦¿à¦• সংখà§à¦¯à¦¾à§Ÿà¦¨"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "সরà§à¦¬à¦¶à§‡à¦· পরীকà§à¦·à¦¾ করা হয়েছে: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "à¦à¦–ন পরà§à¦¯à¦¨à§à¦¤ কোনো পরীকà§à¦·à¦¾ করা হয়নি।"
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "আউটপà§à¦Ÿ মডিউল"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "à¦à¦¿à¦¡à¦¿à¦“ সà§à¦¨à§à¦¯à¦¾à¦ªà¦¶à¦Ÿ"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "ফোলà§à¦¡à¦¾à¦°"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "ফরমেট"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "পà§à¦°à¦¿à¦«à¦¿à¦•à§à¦¸"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "অনà§à¦•à§à¦°à¦®à¦¿à¦• সংখà§à¦¯à¦¾à§Ÿà¦¨"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "সরà§à¦¬à¦¶à§‡à¦· পরীকà§à¦·à¦¾ করা হয়েছে: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "à¦à¦–ন পরà§à¦¯à¦¨à§à¦¤ কোনো পরীকà§à¦·à¦¾ করা হয়নি।"
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "সরà§à¦¬à¦¨à¦¿à¦®à§à¦¨ বিলমà§à¦¬"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "নিমà§à¦¨ বিলমà§à¦¬"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "উচà§à¦š বিলমà§à¦¬"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "উচà§à¦šà¦¤à¦° বিলমà§à¦¬"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "পছনà§à¦¦à¦¸à¦®à§‚হ পà§à¦¨à¦ƒà¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18870,21 -18865,21 +19456,38 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "আপনার à¦à¦¿à¦¡à¦¿à¦“ সà§à¦¨à§à¦¯à¦¾à¦ªà¦¶à¦Ÿ সংরকà§à¦·à¦£ করার জনà§à¦¯ ফোলà§à¦¡à¦¾à¦° নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে।"
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "বেছে নেয়া"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "আপনার à¦à¦¿à¦¡à¦¿à¦“ সà§à¦¨à§à¦¯à¦¾à¦ªà¦¶à¦Ÿ সংরকà§à¦·à¦£ করার জনà§à¦¯ ফোলà§à¦¡à¦¾à¦° নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে।"
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "বেছে নেয়া"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the directory or filename where the records will be stored."
msgstr "ডিরেকà§à¦Ÿà¦°à¦¿ বা ফাইলের নাম যেখানে রেকরà§à¦¡à¦—à§à¦²à§‹ সংরকà§à¦·à¦£ করা হবে"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18892,16 -18887,16 +19495,29 @@@ msgstr "
"à¦à¦° জনà§à¦¯ নতà§à¦¨ কী চাপà§à¦¨\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "অবৈধ সমাহার"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "আফসোস, à¦à¦‡ কী-গà§à¦²à§‹ হট-কী শরà§à¦Ÿà¦•à¦¾à¦Ÿ হিসেবে নিয়োগ করা যাবে না।"
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "অবৈধ সমাহার"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "আফসোস, à¦à¦‡ কী-গà§à¦²à§‹ হট-কী শরà§à¦Ÿà¦•à¦¾à¦Ÿ হিসেবে নিয়োগ করা যাবে না।"
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "à¦à¦‡ সমাহারটি ইতোমধà§à¦¯à§‡à¦‡ \"%@\" দà§à¦¬à¦¾à¦°à¦¾ সংগà§à¦°à¦¹ করা হয়েছে।"
@@@ -21074,20 -21069,20 +21690,36 @@@ msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ উ
msgid "Create a new profile"
msgstr "à¦à¦•à¦Ÿà¦¿ নতà§à¦¨ বৃতà§à¦¤à¦¾à¦¨à§à¦¤ তৈরি করা হবে"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "তৈরি করা হবে"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "বৃতà§à¦¤à¦¾à¦¨à§à¦¤ নাম অনà§à¦ªà¦¸à§à¦¥à¦¿à¦¤"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "বৃতà§à¦¤à¦¾à¦¨à§à¦¤ নাম অনà§à¦ªà¦¸à§à¦¥à¦¿à¦¤"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "আপনার অবশà§à¦¯à¦‡ বৃতà§à¦¤à¦¾à¦¨à§à¦¤à§‡à¦° জনà§à¦¯ à¦à¦•à¦Ÿà¦¿ নাম নিরà§à¦§à¦¾à¦°à¦£ করতে হবে ।"
@@@ -24695,24 -24690,24 +25327,44 @@@ msgstr "সà§à¦Ÿà§à¦°à§€à¦® আউট
msgid "Overlays/Subtitles"
msgstr "ওà¦à¦¾à¦°à¦²à§‡/সাবটাইটেল"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "আপনি যে ফনà§à¦Ÿà¦Ÿà¦¿ বà§à¦¯à¦¬à¦¹à¦¾à¦° করতে চান তার ফনà§à¦Ÿ ফà§à¦¯à¦¾à¦®à¦¿à¦²à¦¿"
+
+#: modules/text_renderer/freetype.c:159
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "আপনি যে ফনà§à¦Ÿà¦Ÿà¦¿ বà§à¦¯à¦¬à¦¹à¦¾à¦° করতে চান তার ফনà§à¦Ÿ ফà§à¦¯à¦¾à¦®à¦¿à¦²à¦¿"
+
+ #: modules/text_renderer/freetype.c:158
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font file for the font you want to use"
msgstr "আপনি যে ফনà§à¦Ÿà¦Ÿà¦¿ বà§à¦¯à¦¬à¦¹à¦¾à¦° করতে চান তার ফনà§à¦Ÿà¦«à¦¾à¦‡à¦²"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "পিকà§à¦¸à§‡à¦²à§‡ ফনà§à¦Ÿà§‡à¦° আকার"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "পিকà§à¦¸à§‡à¦²à§‡ ফনà§à¦Ÿà§‡à¦° আকার"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24721,12 -24716,12 +25373,20 @@@ msgstr "
"à¦à¦Ÿà¦¿ à¦à¦¿à¦¡à¦¿à¦“র ওপর রেনà§à¦¡à¦¾à¦° করা হবে à¦à¦®à¦¨ ফনà§à¦Ÿà¦—à§à¦²à§‹à¦° পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ আকার। যদি ০ ছাড়া à¦à¦¿à¦¨à§à¦¨ "
"কিছà§à¦¤à§‡ নিরà§à¦§à¦¾à¦°à¦£ করা হয় তাহলে à¦à¦‡ অপশনটি সমà§à¦ªà¦°à§à¦•à¦¿à¦¤ ফনà§à¦Ÿà§‡à¦° আকার উপেকà§à¦·à¦¾ করবে।"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "রূপরেখা"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24734,12 -24729,12 +25394,20 @@@ msgstr "
"যে লেখকে à¦à¦¿à¦¡à¦¿à¦“র ওপর রেনà§à¦¡à¦¾à¦° করা হবে তার অনচà§à¦›à¦¤à¦¾ (সà§à¦¬à¦šà§à¦›à¦¤à¦¾à¦° বিপরীত)। ০ = সà§à¦¬à¦šà§à¦›, "
"২৫৫ = সমà§à¦ªà§‚রà§à¦£ অনচà§à¦›à¥¤"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "লেখের পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ রং"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24751,12 -24746,12 +25419,20 @@@ msgstr "
"রঙের মত)। পà§à¦°à¦¥à¦® দà§à¦Ÿà¦¿ অকà§à¦·à¦° লাল, তারপর সবà§à¦œ, তারপর নীলের জনà§à¦¯à¥¤ #000000 = কালো, "
"#FF0000 = লাল, #00FF00 = সবà§à¦œ, #FFFF00 = হলà§à¦¦ (লাল+সবà§à¦œ), #FFFFFF = সাদা"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "আপেকà§à¦·à¦¿à¦• ফনà§à¦Ÿà§‡à¦° আকার"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24765,66 -24760,66 +25441,118 @@@ msgstr "
"à¦à¦Ÿà¦¿ ফনà§à¦Ÿà§‡à¦° আপেকà§à¦·à¦¿à¦• পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ আকার যা à¦à¦¿à¦¡à¦¿à¦“র ওপর রেনà§à¦¡à¦¾à¦° করা হবে। যদি ফনà§à¦Ÿà§‡à¦° "
"সমà§à¦ªà§‚রà§à¦£ মান নিরà§à¦§à¦¾à¦°à¦£ করা হয়, তাহলে আপেকà§à¦·à¦¿à¦• আকার উপেকà§à¦·à¦¿à¦¤ হবে।"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "পটà¦à§‚মি"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "পটà¦à§‚মি"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "রূপরেখা"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
++=======
+ #: modules/text_renderer/freetype.c:187
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow opacity"
msgstr "ছায়া অফসেট"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "ছায়া"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
++=======
+ #: modules/text_renderer/freetype.c:189
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow angle"
msgstr "ছায়া"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:191
++=======
+ #: modules/text_renderer/freetype.c:190
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow distance"
msgstr "ছায়া অফসেট"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "অপেকà§à¦·à¦¾à¦•à§ƒà¦¤ ছোট"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "ছোট"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "বড়"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "অপেকà§à¦·à¦¾à¦•à§ƒà¦¤ বড়"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "YUVP রেনà§à¦¡à¦¾à¦°à¦¾à¦° বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হবে"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "YUVP রেনà§à¦¡à¦¾à¦°à¦¾à¦° বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হবে"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24832,23 -24827,23 +25560,43 @@@ msgstr "
"à¦à¦Ÿà¦¿ \"paletized YUV\" বà§à¦¯à¦¬à¦¹à¦¾à¦° করে ফনà§à¦Ÿ রেনà§à¦¡à¦¾à¦° করে। à¦à¦‡ অপশনটি শà§à¦§à§à¦®à¦¾à¦¤à§à¦° তখনই "
"পà§à¦°à§Ÿà§‹à¦œà¦¨ যখন আপনি DVB সাবটাইটেলে à¦à¦¨à¦•à§‹à¦¡ করতে চান"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "লেখ রেনà§à¦¡à¦¾à¦°à¦¾à¦°"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "ফà§à¦°à¦¿à¦Ÿà¦¾à¦‡à¦ªà§¨ ফনà§à¦Ÿ রেনà§à¦¡à¦¾à¦°à¦¾à¦°"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "লেখ রেনà§à¦¡à¦¾à¦°à¦¾à¦°"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "ফà§à¦°à¦¿à¦Ÿà¦¾à¦‡à¦ªà§¨ ফনà§à¦Ÿ রেনà§à¦¡à¦¾à¦°à¦¾à¦°"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/bn_IN.po
index d677e75,39bb2a1..78a07e4
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@@ -10,7 -10,7 +10,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-05-04 08:00+0000\n"
"Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/vlc-"
@@@ -139,7 -139,7 +143,11 @@@ msgstr "বিবিধ অডিও à¦
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -476,10 -476,10 +484,17 @@@ msgid "&About
msgstr "à¦à¦¬à¦‚ সমà§à¦ªà¦°à§à¦•à§‡"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -518,17 -518,17 +533,29 @@@ msgid "Save...
msgstr "সংরকà§à¦·à¦£ করà§à¦¨..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "পà§à¦¨à¦°à¦¾à¦¬à§ƒà¦¤à§à¦¤à¦¿ সমসà§à¦¤"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "পà§à¦¨à¦°à¦¾à¦¬à§ƒà¦¤à§à¦¤à¦¿ à¦à¦•à¦Ÿà¦¿"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -633,7 -633,7 +660,11 @@@ msgstr "The maximum number of filters (
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "অকà§à¦·à¦®"
@@@ -1331,20 -1331,20 +1362,36 @@@ msgstr "ফà§à¦°à§‡à¦® হার
msgid "Decoded format"
msgstr "ডিকোডকৃত ফরমà§à¦¯à¦¾à¦Ÿ"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "আপনার ইনপà§à¦Ÿ খোলা যাবে না"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "আপনার ইনপà§à¦Ÿ খোলা যাবে না"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC হয় MRL '%s' খà§à¦²à¦¤à§‡ পারেনি. বিসà§à¦¤à¦¾à¦°à¦¿à¦¤ জানার জনà§à¦¯ লগ পরীকà§à¦·à¦¾ করà§à¦¨."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC ইনপà§à¦Ÿà§‡à¦° ফরমà§à¦¯à¦¾à¦Ÿ চিনতে পারতে পারে না"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC ইনপà§à¦Ÿà§‡à¦° ফরমà§à¦¯à¦¾à¦Ÿ চিনতে পারতে পারে না"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1771,7 -1771,7 +1818,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1855,7 -1855,7 +1906,11 @@@ msgstr "à¦à¦‡ অডিওটি পà¦
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "কেউ না"
@@@ -1885,7 -1885,7 +1940,11 @@@ msgstr "
"à¦à¦Ÿà¦¿ à¦à¦¿à¦¡à¦¿à¦“ আউটপà§à¦Ÿ পদà§à¦§à¦¤à¦¿ VLC দà§à¦¬à¦¾à¦°à¦¾ বà§à¦¯à¦¬à¦¹à§ƒà¦¤. ডিফলà§à¦Ÿ আচরণ সà§à¦¬à¦¯à¦¼à¦‚কà§à¦°à¦¿à¦¯à¦¼à¦à¦¾à¦¬à§‡ সেরা পদà§à¦§à¦¤à¦¿ "
"উপলবà§à¦§ নিরà§à¦¬à¦¾à¦šà¦¨ হয়."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "à¦à¦¿à¦¡à¦¿à¦“ সকà§à¦°à¦¿à§Ÿ করা"
@@@ -2091,7 -2091,7 +2150,11 @@@ msgstr "
"à¦à¦¿à¦¡à¦¿à¦“ রেনà§à¦¡à¦¾à¦°). VLC ডিফলà§à¦Ÿà¦°à§‚পে, à¦à¦Ÿà¦¿ বà§à¦¯à¦¬à¦¹à¦¾à¦° করার জনà§à¦¯ চেষà§à¦Ÿà¦¾ করা."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "সরà§à¦¬à¦¦à¦¾ শীরà§à¦·à§‡"
@@@ -2142,7 -2142,7 +2205,11 @@@ msgstr "মাউস কারà§à¦¸à¦¾
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2151,7 -2151,7 +2218,11 @@@ msgstr "ডিইনà§à¦Ÿà¦¾à¦°à¦²à¦¿à
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "ডিইনà§à¦Ÿà¦¾à¦°à¦²à§‡à¦¸ মোড"
@@@ -2209,7 -2209,7 +2280,11 @@@ msgstr "
"যে কোনো সময় পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦• বিদà§à¦¯à§à§Žà¦¸à¦‚যোগ পরিচালনার ডেমন Inhibits, কমà§à¦ªà¦¿à¦‰à¦Ÿà¦¾à¦° নিষà§à¦•à§à¦°à¦¿à¦¯à¦¼à¦¤à¦¾à¦° "
"কারণে সà§à¦¥à¦—িত করা হচà§à¦›à§‡ à¦à¦¡à¦¼à¦¾à¦¨à§‹."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "উইনà§à¦¡à§‹ সজà§à¦œà¦¾"
@@@ -2405,7 -2405,7 +2480,11 @@@ msgstr "
"যদি à¦à¦•à¦Ÿà¦¿ 16:9 পরà§à¦¦à¦¾ থাকে, তাহলে আপনি à¦à¦‡ 4:3 যাতে অনà§à¦ªà¦¾à¦¤ রাখা পরিবরà§à¦¤à¦¨ পà§à¦°à¦¯à¦¼à§‹à¦œà¦¨ "
"হতে পারে."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "ফà§à¦°à§‡à¦® কর"
@@@ -2549,12 -2549,12 +2628,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2562,7 -2562,7 +2650,11 @@@ msgid "Default
msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2904,7 -2904,7 +2996,11 @@@ msgid "You can completely disable the s
msgstr "আপনি সমà§à¦ªà§‚রà§à¦£à¦°à§‚পে উপ-ছবি পà§à¦°à¦¸à§‡à¦¸à¦¿à¦‚ নিষà§à¦•à§à¦°à¦¿à§Ÿ করতে পারেন।"
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3830,7 -3830,7 +3926,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "à¦à¦‡ সেটিংগà§à¦²à§‹ গà§à¦²à§‹à¦¬à¦¾à¦² VLC কী বাইনà§à¦¡à¦¿à¦‚, যা \"হট কী\" নামে পরিচিত।"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "উপেকà§à¦·à¦¾ করা হবে"
@@@ -3856,8 -3856,8 +3956,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3938,10 -3938,10 +4043,17 @@@ msgid "Slower (fine)
msgstr "ধীরতম (à¦à¦¾à¦²)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3954,10 -3954,10 +4066,17 @@@ msgid "Select the hotkey to use to ski
msgstr "পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿà§‡à¦° পরবরà§à¦¤à§€ আইটেমে যাওয়ার জনà§à¦¯ হট কী নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে।"
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "পূরà§à¦¬à¦¬à¦°à§à¦¤à§€"
@@@ -3966,9 -3966,9 +4085,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿà§‡à¦° পূরà§à¦¬à¦¬à¦°à§à¦¤à§€ আইটেমে যাওয়ার জনà§à¦¯ হট কী নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে।"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4203,9 -4203,9 +4328,15 @@@ msgid "Select the key to decrease audi
msgstr "অডিও à¦à¦²à¦¿à¦‰à¦® কমানোর জনà§à¦¯ কী নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে।"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "শবà§à¦¦ বনà§à¦§ করা হবে"
@@@ -4619,7 -4619,7 +4750,11 @@@ msgstr "বিদà§à¦¯à¦®à¦¾à¦¨ অড
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "সà§à¦¨à§à¦¯à¦¾à¦ªà¦¶à¦Ÿ"
@@@ -4825,12 -4825,12 +4960,21 @@@ msgstr "ডাউনলোড করà¦
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "বাতিল"
@@@ -5597,7 -5597,7 +5741,11 @@@ msgstr "ছাà¦à¦Ÿà¦¾
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "দৃশà§à¦¯à¦®à¦¾à¦¨ অনà§à¦ªà¦¾à¦¤"
@@@ -8034,7 -8034,7 +8182,11 @@@ msgstr "পরà§à¦¦à¦¾à¦° ইনপà§
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "পরà§à¦¦à¦¾"
@@@ -8778,7 -8778,7 +8930,11 @@@ msgstr "সরà§à¦¬à§‹à¦šà§à¦š à¦à¦²
msgid "Volume Set"
msgstr "à¦à¦²à¦¿à¦‰à¦® সেট"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9938,7 -9938,7 +10094,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "ALSA অডিও আউটপà§à¦Ÿ"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "অডিও আউটপà§à¦Ÿ বà§à¦¯à¦°à§à¦¥"
@@@ -9971,7 -9971,7 +10131,11 @@@ msgstr "অডিও সারি (iOS
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9979,31 -9979,31 +10143,55 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit আউটপà§à¦Ÿ"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit আউটপà§à¦Ÿ"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ অডিও আউটপà§à¦Ÿ ডিà¦à¦¾à¦‡à¦¸à¦Ÿà¦¿ অনà§à¦¯ à¦à¦•à¦Ÿà¦¿ পà§à¦°à§‹à¦—à§à¦°à¦¾à¦® দà§à¦¬à¦¾à¦°à¦¾ বিশেষà¦à¦¾à¦¬à§‡ বà§à¦¯à¦¬à¦¹à§ƒà¦¤ হচà§à¦›à§‡à¥¤"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "অডিও ডিà¦à¦¾à¦‡à¦¸à¦Ÿà¦¿ কনফিগার করা হয়নি"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "অডিও ডিà¦à¦¾à¦‡à¦¸à¦Ÿà¦¿ কনফিগার করা হয়নি"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (à¦à¦¨à¦•à§‹à¦¡ করা আউটপà§à¦Ÿ)"
@@@ -11252,46 -11252,46 +11440,74 @@@ msgstr "ছায়া
msgid "Outline"
msgstr "রূপরেখা"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "কালো"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "ধূসর"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "রà§à¦ªà¦¾à¦²à§€"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "সাদা"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "মেরà§à¦¨"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "লাল"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11299,61 -11299,61 +11515,97 @@@ msgid "Fuchsia
msgstr "গোলাপী"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "হলà§à¦¦"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "জলপাই রং"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "সবà§à¦œ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "টিল"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "লাইম"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "পারà§à¦ªà¦²"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "নেà¦à§€"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "নীল"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11497,7 -11497,7 +11749,11 @@@ msgstr "সাবটাইটেল (à¦
msgid "Subtitle renderers using libass"
msgstr "libass বà§à¦¯à¦¬à¦¹à¦¾à¦° করে সাবটাইটেল রেনà§à¦¡à¦¾à¦° করে"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "ফনà§à¦Ÿ কà§à¦¯à¦¾à¦¶ তৈরি হচà§à¦›à§‡"
@@@ -13432,10 -13432,10 +13688,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "সাধারণ"
@@@ -13543,8 -13543,8 +13806,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus কনà§à¦Ÿà§à¦°à§‹à¦² ইনà§à¦Ÿà¦¾à¦°à¦«à§‡à¦¸"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13895,9 -13895,9 +14163,15 @@@ msgstr "শà§à¦°à§ করা হচà§
msgid "Opening"
msgstr "খোলা হচà§à¦›à§‡"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "বিরতি"
@@@ -15828,7 -15828,7 +16102,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG টà§à¦°à¦¾à¦¨à§à¦¸à¦ªà§‹à¦°à§à¦Ÿ সà§à¦Ÿà§à¦°à§€à¦® ডিমাকà§à¦¸à¦¾à¦°"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "টেলিটেকà§à¦¸à¦Ÿ"
@@@ -16007,7 -16007,7 +16285,11 @@@ msgid "VLC media player Help
msgstr "VLC মিডিয়া পà§à¦²à§‡à§Ÿà¦¾à¦° সহায়তা"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "সূচী"
@@@ -16095,9 -16095,9 +16377,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "সংরকà§à¦·à¦£"
@@@ -16240,7 -16240,7 +16528,11 @@@ msgstr "কোনো ইনপà§à¦Ÿ à¦
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "বà§à¦•à¦®à¦¾à¦°à§à¦• কাজ করার জনà§à¦¯ সà§à¦Ÿà§à¦°à¦¿à¦®à¦Ÿà¦¿à¦•à§‡ অবশà§à¦¯à¦‡ চালাতে বা বিরতিতে থাকতে হবে।"
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "সরাসরি à¦à¦‡ সময়ে সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à¦°"
@@@ -16260,7 -16260,7 +16552,11 @@@ msgstr "
msgid "Backward"
msgstr "অনগà§à¦°à¦¸à¦°"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16270,7 -16270,7 +16566,11 @@@ msgstr "
msgid "Forward"
msgstr "অগà§à¦°à¦¬à¦°à§à¦¤à§€"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16290,84 -16290,84 +16590,155 @@@ msgstr "পরà§à¦¦à¦¾ জà§à¦¡à¦¼à§
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "দেখান / পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿ লà§à¦•à¦¾à¦¨"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "দেখান / পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿ লà§à¦•à¦¾à¦¨"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "পà§à¦¨à¦°à¦¾à¦¬à§ƒà¦¤à§à¦¤à¦¿"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "অদলবদল"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "অদলবদল"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "সমà§à¦ªà§‚রà§à¦£ à¦à¦²à¦¿à¦‰à¦®"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "সমà§à¦ªà§‚রà§à¦£ à¦à¦²à¦¿à¦‰à¦®"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "আবহ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16403,7 -16403,7 +16774,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16588,8 -16588,8 +16963,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "সà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤"
@@@ -16691,36 -16691,36 +17071,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "কোনো CrashLog পাওয়া যায়নি"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "কোনো CrashLog পাওয়া যায়নি"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "চালিয়ে যান"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "পূরà§à¦¬à¦¬à¦°à§à¦¤à§€ কà§à¦°à§à¦¯à¦¾à¦¶à§‡à¦° কোনো পà§à¦°à¦®à¦¾à¦£ পাওয়া যায়নি।"
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "পà§à¦°à¦¨à§‹ পছনà§à¦¦à¦¸à¦®à§‚হ মà§à¦›à§‡ ফেলা হবে?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "আমরা à¦à¦‡à¦®à¦¾à¦¤à§à¦° VLC à¦à¦° পছনà§à¦¦à¦¸à¦®à§‚হ ফাইলের à¦à¦•à¦Ÿà¦¿ পà§à¦°à¦¾à¦¤à¦¨ সংসà§à¦•à¦°à¦¨ খà§à¦œà§‡ পেয়েছি।"
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "টà§à¦°à§à¦¯à¦¾à¦¶à§‡ সরিয়ে নিন à¦à¦¬à¦‚ VLC পà§à¦¨à¦°à¦¾à§Ÿ চালৠকরা"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "পূরà§à¦¬à¦¬à¦°à§à¦¤à§€ কà§à¦°à§à¦¯à¦¾à¦¶à§‡à¦° কোনো পà§à¦°à¦®à¦¾à¦£ পাওয়া যায়নি।"
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "পà§à¦°à¦¨à§‹ পছনà§à¦¦à¦¸à¦®à§‚হ মà§à¦›à§‡ ফেলা হবে?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "আমরা à¦à¦‡à¦®à¦¾à¦¤à§à¦° VLC à¦à¦° পছনà§à¦¦à¦¸à¦®à§‚হ ফাইলের à¦à¦•à¦Ÿà¦¿ পà§à¦°à¦¾à¦¤à¦¨ সংসà§à¦•à¦°à¦¨ খà§à¦œà§‡ পেয়েছি।"
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "টà§à¦°à§à¦¯à¦¾à¦¶à§‡ সরিয়ে নিন à¦à¦¬à¦‚ VLC পà§à¦¨à¦°à¦¾à§Ÿ চালৠকরা"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16887,7 -16887,7 +17299,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr "à¦à¦‡ বিকলà§à¦ªà¦Ÿà¦¿ ইনà§à¦Ÿà¦¾à¦°à¦«à§‡à¦¸à§‡à¦° বিà¦à¦¿à¦¨à§à¦¨ অনà§à¦·à§à¦ ানে উপর আইকন পরিবরà§à¦¤à¦¨ করতে পারবেন."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "দৃশà§à¦¯à¦®à¦¾à¦¨ অনà§à¦ªà¦¾à¦¤ লক করা হবে"
@@@ -17016,7 -17016,7 +17432,11 @@@ msgstr "VLC গোপন করা
msgid "Hide Others"
msgstr "অনà§à¦¯à¦¾à¦¨à§à¦¯ গোপন করা"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "সমসà§à¦¤ পà§à¦°à¦¦à¦°à§à¦¶à¦¨ করা"
@@@ -17101,15 -17101,15 +17521,27 @@@ msgstr "সà§à¦‚সগতি সনà§
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦•à§‡à¦° পর পà§à¦°à¦¸à§à¦¥à¦¾à¦¨ করা হবে"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "সামনে à¦à¦—িয়ে যান"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦•à§‡à¦° পর পà§à¦°à¦¸à§à¦¥à¦¾à¦¨ করা হবে"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "সামনে à¦à¦—িয়ে যান"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "পেছনে যান"
@@@ -17125,30 -17125,30 +17557,56 @@@ msgstr "হà§à¦°à¦¾à¦¸à¦•à§ƒà¦¤ à¦à¦²
msgid "Audio Device"
msgstr "অডিও ডিà¦à¦¾à¦‡à¦¸"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "অরà§à¦§à§‡à¦• আকার"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "সাধারন আকার"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "দà§à¦¬à¦¿à¦—à§à¦¨ আকার"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "পরà§à¦¦à¦¾à¦° মাপসই করা হবে"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "অরà§à¦§à§‡à¦• আকার"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "সাধারন আকার"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "দà§à¦¬à¦¿à¦—à§à¦¨ আকার"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "পরà§à¦¦à¦¾à¦° মাপসই করা হবে"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "শীরà§à¦·à§‡ à¦à¦¾à¦¸à¦®à¦¾à¦¨"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "পূরà§à¦¨à¦ªà¦°à§à¦¦à¦¾ à¦à¦¿à¦¡à¦¿à¦“ ডিà¦à¦¾à¦‡à¦¸"
@@@ -17157,7 -17157,7 +17615,11 @@@
msgid "Post processing"
msgstr "পরবরà§à¦¤à§€ পà§à¦°à¦¸à§‡à¦¸à¦¿à¦‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -17387,7 -17387,7 +17849,11 @@@ msgid "Play another media synchronously
msgstr "যà§à¦—পৎà¦à¦¾à¦¬à§‡ আরেকটি মিডিয়া চালানো হবে "
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "পছনà§à¦¦..."
@@@ -17569,7 -17569,7 +18035,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "ফনà§à¦Ÿà§‡à¦° আকার"
@@@ -17798,12 -17798,12 +18268,20 @@@ msgstr "মেটা সংরকà§à¦·
msgid "VLC was unable to save the meta data."
msgstr "VLC মেটাডাটা সংরকà§à¦·à¦£ করতে বà§à¦¯à¦°à§à¦¥ হয়েছে।"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "পছনà§à¦¦à¦¸à¦®à§‚হ"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "সব পà§à¦¨à¦ƒà¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£"
@@@ -17982,129 -17982,125 +18460,237 @@@ msgstr "গজরানি বিজà§
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦à¦¨à¦•à§‹à¦¡à¦¿à¦‚"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "পà§à¦°à¦¦à¦°à§à¦¶à¦¨à§€ সেটিং"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦à¦¨à¦•à§‹à¦¡à¦¿à¦‚"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "পà§à¦°à¦¦à¦°à§à¦¶à¦¨à§€ সেটিং"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "ফনà§à¦Ÿà§‡à¦° রং"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "ফনà§à¦Ÿ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OSD সকà§à¦°à¦¿à§Ÿ"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OSD সকà§à¦°à¦¿à§Ÿ"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "অসà§à¦¬à¦šà§à¦›à¦¤à¦¾"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "ফোরà§à¦¸ সাহসী"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "ফোরà§à¦¸ সাহসী"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "পà§à¦°à¦¾à¦¨à§à¦¤à¦°à§‡à¦–ার রঙ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "রà§à¦ªà¦°à§‡à¦–া বেধ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "পূরà§à¦£à¦ªà¦°à§à¦¦à¦¾à¦° মোডে কালো পরà§à¦¦à¦¾"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "পূরà§à¦£à¦ªà¦°à§à¦¦à¦¾à¦° মোডে কালো পরà§à¦¦à¦¾"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "ডিসপà§à¦²à§‡"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "আউটপà§à¦Ÿ মডিউল"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "à¦à¦¿à¦¡à¦¿à¦“ সà§à¦¨à§à¦¯à¦¾à¦ªà¦¶à¦Ÿ"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "ফোলà§à¦¡à¦¾à¦°"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "ফরমেট"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "পà§à¦°à¦¿à¦«à¦¿à¦•à§à¦¸"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "অনà§à¦•à§à¦°à¦®à¦¿à¦• সংখà§à¦¯à¦¾à§Ÿà¦¨"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "সরà§à¦¬à¦¶à§‡à¦· পরীকà§à¦·à¦¾ করা হয়েছে: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "à¦à¦–ন পরà§à¦¯à¦¨à§à¦¤ কোনো পরীকà§à¦·à¦¾ করা হয়নি।"
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "আউটপà§à¦Ÿ মডিউল"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "à¦à¦¿à¦¡à¦¿à¦“ সà§à¦¨à§à¦¯à¦¾à¦ªà¦¶à¦Ÿ"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "ফোলà§à¦¡à¦¾à¦°"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "ফরমেট"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "পà§à¦°à¦¿à¦«à¦¿à¦•à§à¦¸"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "অনà§à¦•à§à¦°à¦®à¦¿à¦• সংখà§à¦¯à¦¾à§Ÿà¦¨"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "সরà§à¦¬à¦¶à§‡à¦· পরীকà§à¦·à¦¾ করা হয়েছে: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "à¦à¦–ন পরà§à¦¯à¦¨à§à¦¤ কোনো পরীকà§à¦·à¦¾ করা হয়নি।"
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "সরà§à¦¬à¦¨à¦¿à¦®à§à¦¨ বিলমà§à¦¬"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "নিমà§à¦¨ বিলমà§à¦¬"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "উচà§à¦š বিলমà§à¦¬"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "উচà§à¦šà¦¤à¦° বিলমà§à¦¬"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "পছনà§à¦¦à¦¸à¦®à§‚হ পà§à¦¨à¦ƒà¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18117,20 -18113,20 +18703,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "আপনার à¦à¦¿à¦¡à¦¿à¦“ সà§à¦¨à§à¦¯à¦¾à¦ªà¦¶à¦Ÿ সংরকà§à¦·à¦£ করার জনà§à¦¯ ফোলà§à¦¡à¦¾à¦° নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে।"
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "বেছে নেয়া"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "ডিরেকà§à¦Ÿà¦°à¦¿ বা ফাইলের নাম রেকরà§à¦¡ যেখানে সংরকà§à¦·à¦¿à¦¤ হবে চয়ন করà§à¦¨."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "আপনার à¦à¦¿à¦¡à¦¿à¦“ সà§à¦¨à§à¦¯à¦¾à¦ªà¦¶à¦Ÿ সংরকà§à¦·à¦£ করার জনà§à¦¯ ফোলà§à¦¡à¦¾à¦° নিরà§à¦¬à¦¾à¦šà¦¨ করা হবে।"
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "বেছে নেয়া"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "ডিরেকà§à¦Ÿà¦°à¦¿ বা ফাইলের নাম রেকরà§à¦¡ যেখানে সংরকà§à¦·à¦¿à¦¤ হবে চয়ন করà§à¦¨."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18138,16 -18134,16 +18741,29 @@@ msgstr "
"à¦à¦° জনà§à¦¯ নতà§à¦¨ কী চাপà§à¦¨\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "অবৈধ সমাহার"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "আফসোস, à¦à¦‡ কী-গà§à¦²à§‹ হট-কী শরà§à¦Ÿà¦•à¦¾à¦Ÿ হিসেবে নিয়োগ করা যাবে না।"
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "অবৈধ সমাহার"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "আফসোস, à¦à¦‡ কী-গà§à¦²à§‹ হট-কী শরà§à¦Ÿà¦•à¦¾à¦Ÿ হিসেবে নিয়োগ করা যাবে না।"
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "à¦à¦‡ সমাহারটি ইতোমধà§à¦¯à§‡à¦‡ \"%@\" দà§à¦¬à¦¾à¦°à¦¾ সংগà§à¦°à¦¹ করা হয়েছে।"
@@@ -20198,20 -20194,20 +20814,36 @@@ msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ উ
msgid "Create a new profile"
msgstr "à¦à¦•à¦Ÿà¦¿ নতà§à¦¨ বৃতà§à¦¤à¦¾à¦¨à§à¦¤ তৈরি করা হবে"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "তৈরি করা হবে"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "বৃতà§à¦¤à¦¾à¦¨à§à¦¤ নাম অনà§à¦ªà¦¸à§à¦¥à¦¿à¦¤"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "বৃতà§à¦¤à¦¾à¦¨à§à¦¤ নাম অনà§à¦ªà¦¸à§à¦¥à¦¿à¦¤"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "আপনার অবশà§à¦¯à¦‡ বৃতà§à¦¤à¦¾à¦¨à§à¦¤à§‡à¦° জনà§à¦¯ à¦à¦•à¦Ÿà¦¿ নাম নিরà§à¦§à¦¾à¦°à¦£ করতে হবে ।"
@@@ -23709,23 -23705,23 +24341,43 @@@ msgstr "সà§à¦Ÿà§à¦°à§€à¦® আউট
msgid "Overlays/Subtitles"
msgstr "ওà¦à¦¾à¦°à¦²à§‡/সাবটাইটেল"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "আপনি যে ফনà§à¦Ÿà¦Ÿà¦¿ বà§à¦¯à¦¬à¦¹à¦¾à¦° করতে চান তার ফনà§à¦Ÿ ফà§à¦¯à¦¾à¦®à¦¿à¦²à¦¿"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "ফনà§à¦Ÿ আপনির জনà§à¦¯ ফনà§à¦Ÿ ফাইল বà§à¦¯à¦¬à¦¹à¦¾à¦° করতে চান"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "পিকà§à¦¸à§‡à¦²à§‡ ফনà§à¦Ÿà§‡à¦° আকার"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "আপনি যে ফনà§à¦Ÿà¦Ÿà¦¿ বà§à¦¯à¦¬à¦¹à¦¾à¦° করতে চান তার ফনà§à¦Ÿ ফà§à¦¯à¦¾à¦®à¦¿à¦²à¦¿"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "ফনà§à¦Ÿ আপনির জনà§à¦¯ ফনà§à¦Ÿ ফাইল বà§à¦¯à¦¬à¦¹à¦¾à¦° করতে চান"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "পিকà§à¦¸à§‡à¦²à§‡ ফনà§à¦Ÿà§‡à¦° আকার"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23734,11 -23730,11 +24386,19 @@@ msgstr "
"à¦à¦Ÿà¦¿ à¦à¦¿à¦¡à¦¿à¦“র ওপর রেনà§à¦¡à¦¾à¦° করা হবে à¦à¦®à¦¨ ফনà§à¦Ÿà¦—à§à¦²à§‹à¦° পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ আকার। যদি ০ ছাড়া à¦à¦¿à¦¨à§à¦¨ "
"কিছà§à¦¤à§‡ নিরà§à¦§à¦¾à¦°à¦£ করা হয় তাহলে à¦à¦‡ অপশনটি সমà§à¦ªà¦°à§à¦•à¦¿à¦¤ ফনà§à¦Ÿà§‡à¦° আকার উপেকà§à¦·à¦¾ করবে।"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "শিরোনাম অসà§à¦¬à¦šà§à¦›à¦¤à¦¾"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "শিরোনাম অসà§à¦¬à¦šà§à¦›à¦¤à¦¾"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -23746,12 -23742,12 +24406,20 @@@ msgstr "
"যে লেখকে à¦à¦¿à¦¡à¦¿à¦“র ওপর রেনà§à¦¡à¦¾à¦° করা হবে তার অনচà§à¦›à¦¤à¦¾ (সà§à¦¬à¦šà§à¦›à¦¤à¦¾à¦° বিপরীত)। ০ = সà§à¦¬à¦šà§à¦›, "
"২৫৫ = সমà§à¦ªà§‚রà§à¦£ অনচà§à¦›à¥¤"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "লেখের পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ রং"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23763,12 -23759,12 +24431,20 @@@ msgstr "
"রঙের মত)। পà§à¦°à¦¥à¦® দà§à¦Ÿà¦¿ অকà§à¦·à¦° লাল, তারপর সবà§à¦œ, তারপর নীলের জনà§à¦¯à¥¤ #000000 = কালো, "
"#FF0000 = লাল, #00FF00 = সবà§à¦œ, #FFFF00 = হলà§à¦¦ (লাল+সবà§à¦œ), #FFFFFF = সাদা"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "আপেকà§à¦·à¦¿à¦• ফনà§à¦Ÿà§‡à¦° আকার"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -23777,59 -23773,59 +24453,111 @@@ msgstr "
"à¦à¦Ÿà¦¿ ফনà§à¦Ÿà§‡à¦° আপেকà§à¦·à¦¿à¦• পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ আকার যা à¦à¦¿à¦¡à¦¿à¦“র ওপর রেনà§à¦¡à¦¾à¦° করা হবে। যদি ফনà§à¦Ÿà§‡à¦° "
"সমà§à¦ªà§‚রà§à¦£ মান নিরà§à¦§à¦¾à¦°à¦£ করা হয়, তাহলে আপেকà§à¦·à¦¿à¦• আকার উপেকà§à¦·à¦¿à¦¤ হবে।"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "পৃষà§à¦ à¦à§‚মি অসà§à¦¬à¦šà§à¦›à¦¤à¦¾"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "পটà¦à§‚মির রঙ"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "অসà§à¦¬à¦šà§à¦›à¦¤à¦¾ রূপরেখা"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "শà§à¦¯à¦¾à¦¡à§‹ অসà§à¦¬à¦šà§à¦›à¦¤à¦¾"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "ছায়া রং"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "শà§à¦¯à¦¾à¦¡à§‹ কোণ"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "শà§à¦¯à¦¾à¦¡à§‹ দূরতà§à¦¬"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "পৃষà§à¦ à¦à§‚মি অসà§à¦¬à¦šà§à¦›à¦¤à¦¾"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "পটà¦à§‚মির রঙ"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "অসà§à¦¬à¦šà§à¦›à¦¤à¦¾ রূপরেখা"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "শà§à¦¯à¦¾à¦¡à§‹ অসà§à¦¬à¦šà§à¦›à¦¤à¦¾"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "ছায়া রং"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "শà§à¦¯à¦¾à¦¡à§‹ কোণ"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "শà§à¦¯à¦¾à¦¡à§‹ দূরতà§à¦¬"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "অপেকà§à¦·à¦¾à¦•à§ƒà¦¤ ছোট"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "ছোট"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "বড়"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "অপেকà§à¦·à¦¾à¦•à§ƒà¦¤ বড়"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "YUVP রেনà§à¦¡à¦¾à¦°à¦¾à¦° বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হবে"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "YUVP রেনà§à¦¡à¦¾à¦°à¦¾à¦° বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হবে"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -23837,23 -23833,23 +24565,43 @@@ msgstr "
"à¦à¦Ÿà¦¿ \"paletized YUV\" বà§à¦¯à¦¬à¦¹à¦¾à¦° করে ফনà§à¦Ÿ রেনà§à¦¡à¦¾à¦° করে। à¦à¦‡ অপশনটি শà§à¦§à§à¦®à¦¾à¦¤à§à¦° তখনই "
"পà§à¦°à§Ÿà§‹à¦œà¦¨ যখন আপনি DVB সাবটাইটেলে à¦à¦¨à¦•à§‹à¦¡ করতে চান"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "পাতলা"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "পà§à¦°à§"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "লেখ রেনà§à¦¡à¦¾à¦°à¦¾à¦°"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "ফà§à¦°à¦¿à¦Ÿà¦¾à¦‡à¦ªà§¨ ফনà§à¦Ÿ রেনà§à¦¡à¦¾à¦°à¦¾à¦°"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "পাতলা"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "পà§à¦°à§"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "লেখ রেনà§à¦¡à¦¾à¦°à¦¾à¦°"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "ফà§à¦°à¦¿à¦Ÿà¦¾à¦‡à¦ªà§¨ ফনà§à¦Ÿ রেনà§à¦¡à¦¾à¦°à¦¾à¦°"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/br.po
index 9eac8c1,241813a..65fc1cb
--- a/po/br.po
+++ b/po/br.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-05-04 07:53+0000\n"
"Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
"Language-Team: Breton (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -133,7 -133,7 +137,11 @@@ msgstr "Arventennoù aodio liesseurt h
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -440,10 -440,10 +448,17 @@@ msgid "&About
msgstr "&Diwar-benn"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -482,17 -482,17 +497,29 @@@ msgid "Save...
msgstr "Enrollañ..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr ""
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr ""
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -572,7 -572,7 +599,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Diweredekaat"
@@@ -1230,20 -1230,20 +1261,36 @@@ msgstr "
msgid "Decoded format"
msgstr "Mentrezh ezvoneget"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "N'haller ket digeriñ hoc'h ec'hankad"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "N'haller ket digeriñ hoc'h ec'hankad"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1634,7 -1634,7 +1681,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1716,7 -1716,7 +1767,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Tra ebet"
@@@ -1740,7 -1740,7 +1795,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Gweredekaat ar video"
@@@ -1930,7 -1930,7 +1989,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr ""
@@@ -1981,7 -1981,7 +2044,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -1990,7 -1990,7 +2057,11 @@@ msgstr "Digenweañ
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Mod digenweañ"
@@@ -2046,7 -2046,7 +2117,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Kinklañ ar prenestr"
@@@ -2215,7 -2215,7 +2290,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2343,12 -2343,12 +2422,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2356,7 -2356,7 +2444,11 @@@ msgid "Default
msgstr "Dre ziouer"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2659,7 -2659,7 +2751,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3471,7 -3471,7 +3567,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Leuskel a-gostez"
@@@ -3495,8 -3495,8 +3595,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3576,10 -3576,10 +3681,17 @@@ msgid "Slower (fine)
msgstr "Gorrekoc'h"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3592,10 -3592,10 +3704,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Kent"
@@@ -3604,9 -3604,9 +3723,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3841,9 -3841,9 +3966,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Mut"
@@@ -4257,7 -4257,7 +4388,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4456,12 -4456,12 +4591,21 @@@ msgstr "O pellgargañ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Nullañ"
@@@ -5221,7 -5221,7 +5365,11 @@@ msgstr "Didroc'hañ
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Kenfeur an neuze"
@@@ -7517,7 -7517,7 +7665,11 @@@ msgstr "Enankad ar skramm
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Skramm"
@@@ -8249,7 -8249,7 +8401,11 @@@ msgstr "
msgid "Volume Set"
msgstr "Arventenniñ an dregern"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9360,7 -9360,7 +9516,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "Ec'hankad an aodio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Sac'het eo an ec'hakad aodio"
@@@ -9391,7 -9391,7 +9551,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9399,30 -9399,30 +9563,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Ec'hankad an AudioUnit HAL"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Ec'hankad an AudioUnit HAL"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Ec'hankad enboneget)"
@@@ -10588,46 -10588,46 +10776,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Du"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Loued"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Arc'hant"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Gwenn"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Ruz"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10635,61 -10635,61 +10851,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Melen"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Gwer"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Gwer"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Glas"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10819,7 -10819,7 +11071,11 @@@ msgstr "Istitloù (Kempleshoc'h)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12613,10 -12613,10 +12869,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Reizh"
@@@ -12721,8 -12721,8 +12984,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13058,9 -13058,9 +13326,15 @@@ msgstr "
msgid "Opening"
msgstr "O tigeriñ"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Ehan"
@@@ -14939,7 -14939,7 +15213,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -15118,7 -15118,7 +15396,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Ibil"
@@@ -15206,9 -15206,9 +15488,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Enrollañ"
@@@ -15347,7 -15347,7 +15635,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Lammat betek"
@@@ -15367,7 -15367,7 +15659,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15377,7 -15377,7 +15673,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15397,84 -15397,84 +15697,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Diskouez/kuzhat ar roll-lenn"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Diskouez/kuzhat ar roll-lenn"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Adlenn"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efedoù"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15510,7 -15510,7 +15881,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15693,8 -15693,8 +16068,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Personelaat"
@@@ -15787,36 -15787,36 +16167,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Kenderc'hel"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15968,7 -15968,7 +16380,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Prennañ kenfeur an neuze"
@@@ -16097,7 -16097,7 +16513,11 @@@ msgstr "Kuzhañ VLC
msgid "Hide Others"
msgstr "Kuzhat ar re all"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr ""
@@@ -16182,15 -16182,15 +16602,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Kuitaat goude al lenn"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Kuitaat goude al lenn"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16206,30 -16206,30 +16638,56 @@@ msgstr "Izelaat ar son
msgid "Audio Device"
msgstr "Trobarzhell aodio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Ment reizh"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Ment reizh"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16238,7 -16238,7 +16696,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16466,7 -16466,7 +16928,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Dibab..."
@@@ -16637,7 -16637,7 +17103,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Ment an nodrezh"
@@@ -16866,12 -16866,12 +17336,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Gwellvezioù"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17048,129 -17048,125 +17526,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP Lua"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Enbonegañ dre ziouer"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Skrammañ an arventennoù"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Enbonegañ dre ziouer"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Skrammañ an arventennoù"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Liv an nodrezh"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Nodrezh"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Gweredekaat an OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Gweredekaat an OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Demerez"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Skrammañ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Mollad an ec'hankad"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Teuliad"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Mentrezh"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Mollad an ec'hankad"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Teuliad"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Mentrezh"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Adderaouekaat ar gwellvezioù"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17183,35 -17179,35 +17769,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Dibab"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Dibab"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19149,20 -19145,20 +19765,36 @@@ msgstr "Dilemel an aelad diuzet
msgid "Create a new profile"
msgstr "Krouiñ ur aelad nevez"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Krouiñ"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Anv an aelad a vank"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Anv an aelad a vank"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Ret eo deoc'h arventenniñ anv an aelad."
@@@ -22465,45 -22461,45 +23097,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Ment an nodrezh e pikselioù"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Ment an nodrezh e pikselioù"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Demerez an destenn"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Demerez an destenn"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22512,93 -22508,93 +23180,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Bihanoc'h"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Bihan"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Bras"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Brasoc'h"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/bs.po
index eb31caa,1287ec9..f7add82
--- a/po/bs.po
+++ b/po/bs.po
@@@ -9,8 -9,8 +9,13 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-08 22:52+0000\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-08-23 16:24+0000\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Last-Translator: Adnan Memija <sream_92 at live.com>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/vlc-trans/"
"language/bs/)\n"
@@@ -139,7 -139,7 +144,11 @@@ msgstr "Raznovrsne postavke zvuka i mod
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -483,10 -483,10 +492,17 @@@ msgid "&About
msgstr "&O nama"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -525,17 -525,17 +541,29 @@@ msgid "Save...
msgstr "Snimi..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Ponovi Sve"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Ponovi Jedno"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -641,7 -641,7 +669,11 @@@ msgstr "Maksimalni broj filtera (%u) j
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Onemogući"
@@@ -1308,20 -1308,20 +1340,36 @@@ msgstr "Brzina
msgid "Decoded format"
msgstr "Dekodirani format"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Vaš ulaz se ne može otvoriti"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Vaš ulaz se ne može otvoriti"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC nije u stanju da otvori MRL '%s'. Provjerite dnevnik za detalje."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC ne može prepoznati ulazni format"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC ne može prepoznati ulazni format"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1751,7 -1751,7 +1799,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1841,7 -1841,7 +1893,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Nijedno"
@@@ -1872,7 -1872,7 +1928,11 @@@ msgstr "
"Ovo je metoda izlaza videa koju koristi VLC. Zadano ponašanje je da se "
"automatski izabere najbolja metoda dostupna."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Omogući video"
@@@ -2082,7 -2082,7 +2142,11 @@@ msgstr "
"zadano."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Uvijek na vrhu"
@@@ -2134,7 -2134,7 +2198,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2143,7 -2143,7 +2211,11 @@@ msgstr "Raspletavanje
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Mod raspletavanja"
@@@ -2201,7 -2201,7 +2273,11 @@@ msgstr "
"SprjeÄava servis upravljanja energije tokom reprodukcije, da bi se izbjeglo "
"suspendiranje raÄunara zbog njegove neaktivnosti."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Dekoracije prozora"
@@@ -2401,7 -2401,7 +2477,11 @@@ msgstr "
"imate 16:9 ekran, možda ćete te morati izmijeniti to u 4:3 kako bi održali "
"proporcije."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "PreskoÄi okvire"
@@@ -2545,12 -2545,12 +2625,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2558,7 -2558,7 +2647,11 @@@ msgid "Default
msgstr "Zadano"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2815,7 -2815,7 +2908,11 @@@ msgstr "
#: src/libvlc-module.c:666
msgid "Prefer native stream recording"
++<<<<<<< HEAD
+msgstr "Preferiraj prirodno snimanje strujanja"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:668
msgid ""
@@@ -2881,7 -2881,7 +2978,11 @@@ msgid "You can completely disable the s
msgstr "Možete kompletno onemogućiti procesiranje pod-fotografije."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3110,6 -3110,8 +3211,11 @@@ msgid "
"This file contains an optional CRL to prevent remote clients from using "
"revoked certificates in TLS sessions."
msgstr ""
++<<<<<<< HEAD
++=======
+ "Ova datoteka sadrži opcionalni CRL za sprijeÄavanje brisanja klijenata od "
+ "korištenja opozvanih certifikata u TLS sesiji."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:845
msgid "SOCKS server"
@@@ -3714,7 -3716,7 +3820,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignoriši"
@@@ -3738,8 -3740,8 +3848,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3821,10 -3823,10 +3936,17 @@@ msgid "Slower (fine)
msgstr "Sporije (fino)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3838,10 -3840,10 +3960,17 @@@ msgstr "
"Izaberite vruću tipku za preskakanje na sljedeću stavku iz liste izvođenja."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Prethodno"
@@@ -3851,9 -3853,9 +3980,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"Izaberite vruću tipku za preskakanje na prethodnu stavku u listi izvođenja."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4088,9 -4090,9 +4223,15 @@@ msgid "Select the key to decrease audi
msgstr "Izaberi tipku za smanjivanje glasnoće zvuka."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Stišaj"
@@@ -4504,7 -4506,7 +4645,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Snimak"
@@@ -4701,12 -4703,12 +4846,21 @@@ msgstr "Preuzimanje...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Otkaži"
@@@ -5462,7 -5464,7 +5616,11 @@@ msgstr "Izreži
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Omjer"
@@@ -7758,7 -7760,7 +7916,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Ekran"
@@@ -8490,7 -8492,7 +8652,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9601,7 -9603,7 +9767,11 @@@ msgstr "Okruženje 7.1
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9632,7 -9634,7 +9802,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9640,30 -9642,30 +9814,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Kodirani Izlaz)"
@@@ -10829,46 -10831,46 +11027,74 @@@ msgstr "Sjena
msgid "Outline"
msgstr "Kontura"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Crna"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Siva"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Srebrena"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Bijela"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Kestenjasta"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Crvena"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10876,61 -10878,61 +11102,97 @@@ msgid "Fuchsia
msgstr "Fuksija"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Žuta"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Maslinasta"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Zelena"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Grogotovac"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Zelenog limuna"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "LjubiÄasta"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Mornarska"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Plava"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11060,7 -11062,7 +11322,11 @@@ msgstr "Titlovi (napredno)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Gradim font keširanje"
@@@ -12847,10 -12849,10 +13113,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -12955,8 -12957,8 +13228,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus kontrolno okruženje"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13292,9 -13294,9 +13570,15 @@@ msgstr "
msgid "Opening"
msgstr "Otvaranje"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -15174,7 -15176,7 +15458,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15353,7 -15355,7 +15641,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15441,9 -15443,9 +15733,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Snimi"
@@@ -15582,7 -15584,7 +15880,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15602,7 -15604,7 +15904,11 @@@ msgstr "
msgid "Backward"
msgstr "Nazad"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15612,7 -15614,7 +15918,11 @@@ msgstr "
msgid "Forward"
msgstr "Naprijed"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15632,84 -15634,84 +15942,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Pokaži/Sakrij Listu Izvođenja"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Pokaži/Sakrij Listu Izvođenja"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Ponovi"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efekti"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15745,7 -15747,7 +16126,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15928,8 -15930,8 +16313,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -16022,36 -16024,36 +16412,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Nastavi"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16203,7 -16205,7 +16625,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "ZakljuÄaj Omjer"
@@@ -16332,7 -16334,7 +16758,11 @@@ msgstr "Sakrij VLC
msgid "Hide Others"
msgstr "Sakrij Ostale"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Prikaži Sve"
@@@ -16417,15 -16419,15 +16847,27 @@@ msgstr "Sinkronizacija traga
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Zatvori nakon Reprodukcije"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Zatvori nakon Reprodukcije"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16441,30 -16443,30 +16883,56 @@@ msgstr "Smanji Glasnoću
msgid "Audio Device"
msgstr "Uređaj Zvuka"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "PoloviÄna VeliÄina"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Normalna VeliÄina"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dupla VeliÄina"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Uklopi u Ekran"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "PoloviÄna VeliÄina"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Normalna VeliÄina"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dupla VeliÄina"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Uklopi u Ekran"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16473,7 -16475,7 +16941,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Dodaj Datoteku Titla..."
@@@ -16701,7 -16703,7 +17173,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Izaberi..."
@@@ -16872,7 -16874,7 +17348,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "VeliÄina fonta"
@@@ -17101,12 -17103,12 +17581,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Podešavanja"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Resetuj Sve"
@@@ -17283,129 -17285,125 +17771,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Zadano Kodiranje"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Zadano Kodiranje"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Boja fonta"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Font"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Neprozirnost"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Prikaz"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Video snimci"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Mapa"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Format"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Video snimci"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Mapa"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Format"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Resetuj Podešavanja"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17418,35 -17416,35 +18014,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19384,20 -19382,20 +20010,36 @@@ msgstr "Izbriši odabrani profil
msgid "Create a new profile"
msgstr "Kreiraj novi profil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Kreiraj"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22700,45 -22698,45 +23342,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22747,93 -22745,93 +23425,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Manje"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Malo"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Veliko"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Veće"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Tanko"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Debelo"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Tanko"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Debelo"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -27091,8 -27089,9 +27849,14 @@@ msgid "Default caching policy
msgstr ""
#: modules/gui/qt4/ui/sprefs_interface.h:514
++<<<<<<< HEAD
+msgid "Menus language:"
+msgstr "Jezik menija:"
++=======
+ #, fuzzy
+ msgid "Menus language:"
+ msgstr "Jezik zvuka"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:515
msgid "Look and feel"
@@@ -27468,6 -27467,9 +28232,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr ""
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Pokaži Detalje"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "You can choose to disable some CPU accelerations here. Use with extreme "
#~ "care!"
@@@ -27663,10 -27665,6 +28433,13 @@@
#~ msgstr "Želite li ga preuzeti?"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Detalji Kodeka"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Greek, Modern ()"
#~ msgstr "GrÄki, Moderni"
diff --combined po/ca.po
index 9a847c6,42e0995..b450510
--- a/po/ca.po
+++ b/po/ca.po
@@@ -11,7 -11,7 +11,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-09 10:44+0000\n"
"Last-Translator: Pau Iranzo <paugnu at gmail.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -140,7 -140,7 +144,11 @@@ msgstr "Parà metres i mòduls diversos
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -497,10 -497,10 +505,17 @@@ msgid "&About
msgstr "Quant &a"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -539,17 -539,17 +554,29 @@@ msgid "Save...
msgstr "Desa..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Repeteix-ho tot"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Repeteix un"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -657,7 -657,7 +684,11 @@@ msgstr "S'ha arribat al nombre mà xim d
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Inhabilita"
@@@ -1359,20 -1359,20 +1390,36 @@@ msgstr "Fotogrames per segon
msgid "Decoded format"
msgstr "Format descodificat"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "No es pot obrir la vostra entrada"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "No es pot obrir la vostra entrada"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "El VLC no pot obrir l'MRL '%s'.Per a més detalls reviseu el registre."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "El VLC no reconeix el format de l'entrada"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "El VLC no reconeix el format de l'entrada"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1811,7 -1811,7 +1858,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1903,7 -1903,7 +1954,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Cap"
@@@ -1935,7 -1935,7 +1990,11 @@@ msgstr "
"pel VLC. El comportament per defecte és seleccionar automà ticament el millor "
"mètode disponible."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Habilita el vÃdeo"
@@@ -2146,7 -2146,7 +2205,11 @@@ msgstr "
"utilitzar-lo per defecte."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Sempre a dalt"
@@@ -2206,7 -2206,7 +2269,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2215,7 -2215,7 +2282,11 @@@ msgstr "Desentrellaça
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Mode de desentrellaçat"
@@@ -2274,7 -2274,7 +2345,11 @@@ msgstr "
"Inhibeix el dimoni del gestor d'energia durant la reproducció de vÃdeo per "
"evitar que l'ordinador entri en suspensió a causa de la inactivitat."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Decoracions de la finestra"
@@@ -2485,7 -2485,7 +2560,11 @@@ msgstr "
"de monitors tenen pÃxels quadrats (1:1). Si teniu una pantalla 16:9, potser "
"l'heu de canviar a 4:3 per tal de mantenir les proporcions."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Omet els fotogrames"
@@@ -2636,12 -2636,12 +2715,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2649,7 -2649,7 +2737,11 @@@ msgid "Default
msgstr "Per defecte"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -3015,7 -3015,7 +3107,11 @@@ msgstr "
"subimatges."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -4007,7 -4007,7 +4103,11 @@@ msgstr "
"Aquests són els parà metres relacionats amb les vinculacions de tecles "
"globals del VLC, conegudes com a «tecles de drecera»."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignora"
@@@ -4033,8 -4033,8 +4133,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4129,10 -4129,10 +4234,17 @@@ msgid "Slower (fine)
msgstr "Més lent (lleuger)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4147,10 -4147,10 +4259,17 @@@ msgstr "
"per passar al següent element de la llista de reproducció."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Anterior"
@@@ -4161,9 -4161,9 +4280,15 @@@ msgstr "
"Aquesta opció us permet seleccionar la tecla de drecera que voleu utilitzar "
"per passar a l'anterior element de la llista de reproducció."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4446,9 -4446,9 +4571,15 @@@ msgstr "
"l'Ã udio."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Silencia"
@@@ -4897,7 -4897,7 +5028,11 @@@ msgstr "Es mou pels dispositius d'Ã udi
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Instantà nia"
@@@ -5103,12 -5103,12 +5238,21 @@@ msgstr "S'està baixant...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Cancel·la"
@@@ -5874,7 -5874,7 +6018,11 @@@ msgstr "Escapça
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Relació d'aspecte"
@@@ -8434,7 -8434,7 +8582,11 @@@ msgstr "Entrada de la pantalla
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Pantalla"
@@@ -9203,7 -9203,7 +9355,11 @@@ msgstr "Volum mà xim #
msgid "Volume Set"
msgstr "Configuració del volum"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10395,7 -10395,7 +10551,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "Sortida d'Ã udio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "S'ha produït un error en la sortida d'à udio"
@@@ -10428,7 -10428,7 +10588,11 @@@ msgstr "Sortida d'Ã udio AudioQueue (iO
msgid "Android AudioTrack audio output"
msgstr "Sortida d'Ã udio AudioTrack Android"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "Sortida AudioUnit per iOS"
@@@ -10436,22 -10436,22 +10600,38 @@@
msgid "Last audio device"
msgstr "Darrer dispositiu d'Ã udio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Sortida HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Sortida HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Un altre programa està utilitzant de forma exclusiva el dispositiu de "
"sortida d'Ã udio seleccionat. "
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "El dispositiu d'à udio no està configurat."
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "El dispositiu d'à udio no està configurat."
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10460,11 -10460,11 +10640,19 @@@ msgstr "
"«Configuració d'à udio MIDI» a Aplicacions/Utilitats. Ara s'està utilitzant "
"el mode estèreo."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Dispositiu de sortida de so del sistema"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Dispositiu de sortida de so del sistema"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (sortida codificada)"
@@@ -11777,46 -11777,46 +11965,74 @@@ msgstr "Ombra
msgid "Outline"
msgstr "Contorn"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Negre"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Gris"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Plata"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Blanc"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Granat"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Vermell"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11824,61 -11824,61 +12040,97 @@@ msgid "Fuchsia
msgstr "Fúcsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Groc"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Oliva"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Verd"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Xarxet"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Llima"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Porpra"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Blau marÃ"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Blau"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -12032,7 -12032,7 +12284,11 @@@ msgstr "SubtÃtols (avançat)
msgid "Subtitle renderers using libass"
msgstr "Renderitzador de subtÃtols amb libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "S'està construint la memòria cau de la lletra"
@@@ -14078,10 -14078,10 +14334,17 @@@ msgid "Fast
msgstr "RÃ pid"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -14191,8 -14191,8 +14454,13 @@@ msgid "D-Bus control interface
msgstr "InterfÃcie del control del D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14548,9 -14548,9 +14816,15 @@@ msgstr "S'està iniciant
msgid "Opening"
msgstr "S'està obrint"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pausa"
@@@ -16511,7 -16511,7 +16785,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Desmultiplexor MPEG Transport Stream"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -16700,7 -16700,7 +16978,11 @@@ msgid "VLC media player Help
msgstr "Ajuda sobre el reproductor multimèdia VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Ãndex"
@@@ -16788,9 -16788,9 +17070,15 @@@ msgstr "Introduïu el nom del perfil no
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Desa"
@@@ -16935,7 -16935,7 +17223,11 @@@ msgid "The stream must be playing or pa
msgstr ""
"El flux ha d'estar en reproducció o en pausa perquè funcionin els preferits."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Salta al punt temporal"
@@@ -16955,7 -16955,7 +17247,11 @@@ msgstr "Feu clic per reproduir i posar
msgid "Backward"
msgstr "Enrere"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16967,7 -16967,7 +17263,11 @@@ msgstr "
msgid "Forward"
msgstr "Endavant"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16991,26 -16991,15 +17291,38 @@@ msgstr "Commuta el mode de pantalla com
msgid "Click to enable fullscreen video playback."
msgstr "Feu clic per habilitar la reproducció en pantalla completa."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+"Feu clic i manteniu premut per ometre en sentit invers a través de l'element "
+"actual."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+"Feu clic i manteniu premut per ometre endavant a través de l'element actual."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Feu clic per aturar la reproducció."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Mostra/amaga la llista de reproducció"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Feu clic per aturar la reproducció."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Mostra/amaga la llista de reproducció"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -17019,12 -17008,12 +17331,20 @@@ msgstr "
"Si no es mostra cap vÃdeo a la finestra principal, això us permet amagar la "
"llista de reproducció."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Repeteix"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -17032,15 -17021,15 +17352,27 @@@ msgstr "
"Feu clic per canviar el mode de repetició. Existeixen 3 estats: repeteix "
"una, repeteix-ho tot i desactivat."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Mescla"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "Feu clic per activar o desactivar la reproducció aleatòria."
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Mescla"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "Feu clic per activar o desactivar la reproducció aleatòria."
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -17048,24 -17037,24 +17380,44 @@@ msgstr "
"Feu clic i moveu el ratolà mentre manteniu premut el botó per utilitzar "
"aquest desplaçador per canviar el volum."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Feu clic per silenciar o activar el so."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Volum al 100%"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Feu clic per reproduir l'à udio al volum mà xim."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Feu clic per silenciar o activar el so."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Volum al 100%"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Feu clic per reproduir l'à udio al volum mà xim."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efectes"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -17073,14 -17062,25 +17425,36 @@@ msgstr "
"Feu clic per mostrar un tauler d'efectes de so que inclou un equalitzador i "
"més filtres."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Feu clic per anar a l'element anterior de la llista de reproducció."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Feu clic per anar a l'element següent de la llista de reproducció."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Feu clic per anar a l'element anterior de la llista de reproducció."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Feu clic per anar a l'element següent de la llista de reproducció."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+ "Feu clic i manteniu premut per ometre en sentit invers a través de l'element "
+ "actual."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+ "Feu clic i manteniu premut per ometre endavant a través de l'element actual."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Converteix i crea un flux de xarxa"
@@@ -17116,7 -17116,7 +17490,11 @@@ msgstr "Trieu una ubicació d'entrada
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17307,8 -17307,8 +17685,13 @@@ msgid "A SDP export is requested, but n
msgstr "S'ha requerit una exportació SDP, però no s'ha proveït cap url."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Personalitzat"
@@@ -17413,36 -17413,36 +17796,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "No ho tornis a demanar"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "Reproducció multimèdia VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "No s'ha trobat el registre de fallades"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "Reproducció multimèdia VLC"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "No s'ha trobat el registre de fallades"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Continua"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "No s'han pogut trobar indicis de fallades anteriors."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Voleu eliminar les preferències antigues?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "S'ha trobat una versió antiga dels fitxers de preferències del VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Mou a la paperera i torna a executar el VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "No s'han pogut trobar indicis de fallades anteriors."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Voleu eliminar les preferències antigues?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "S'ha trobat una versió antiga dels fitxers de preferències del VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Mou a la paperera i torna a executar el VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "Registre de depuració VLC (%s).rtf"
@@@ -17623,7 -17623,7 +18038,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr "Permet que la interfÃcie canviï la seva icona en diverses ocasions. "
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Bloqueja la relació d'aspecte"
@@@ -17757,7 -17757,7 +18176,11 @@@ msgstr "Oculta el VLC
msgid "Hide Others"
msgstr "Oculta els altres"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Mostra-ho tot"
@@@ -17842,15 -17842,15 +18265,27 @@@ msgstr "Sincronització de la pista
msgid "A→B Loop"
msgstr "Bucle A→B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Surt després de la reproducció"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Pas endavant"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Surt després de la reproducció"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Pas endavant"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Pas enrere"
@@@ -17866,30 -17866,30 +18301,56 @@@ msgstr "Baixa el volum
msgid "Audio Device"
msgstr "Dispositiu d'Ã udio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Meitat de la mida"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Mida normal"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Mida doble"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Ajusta a la pantalla"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Meitat de la mida"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Mida normal"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Mida doble"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Ajusta a la pantalla"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Flota a dalt"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Dispositiu de vÃdeo per a la pantalla completa"
@@@ -17898,7 -17898,7 +18359,11 @@@
msgid "Post processing"
msgstr "Postprocessament"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Afegeix un fitxer de subtÃtol..."
@@@ -18138,7 -18138,7 +18603,11 @@@ msgid "Play another media synchronously
msgstr "Reprodueix un altre element multimèdia de forma sÃncrona"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Tria..."
@@@ -18326,7 -18326,7 +18795,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Codificació del subtÃtol"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Mida de la lletra"
@@@ -18555,12 -18555,12 +19028,20 @@@ msgstr "S'ha produït un error mentre e
msgid "VLC was unable to save the meta data."
msgstr "El VLC no ha pogut desar les metadades."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Preferències"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Restableix-ho tot"
@@@ -18742,130 -18742,125 +19223,238 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP Lua"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Posa en pausa l'iTunes mentre el VLC està en reproducció"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Codificació per defecte"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Parà metres de visualització"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Codificació per defecte"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Parà metres de visualització"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Color de lletra"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Lletra"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Idiomes dels subtÃtols"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Idiomes dels subtÃtols"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Idioma preferit per als subtÃtols"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Habilita l'OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Habilita l'OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Opacitat"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Força la negreta"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Força la negreta"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Color del contorn"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Gruix del contorn"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Pantalles negres al mode de pantalla completa"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Pantalles negres al mode de pantalla completa"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Mostra"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Mòdul de sortida"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Captures del vÃdeo"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Carpeta"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Format"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefix"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Numeració seqüencial"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "L'última comprovació es va fer el:%@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Encara no s'ha realitzat cap comprovació."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Mòdul de sortida"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Captures del vÃdeo"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Carpeta"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Format"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefix"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Numeració seqüencial"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "L'última comprovació es va fer el:%@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Encara no s'ha realitzat cap comprovació."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "La latència més baixa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Latència baixa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Latència alta"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "La latència més alta"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Restableix les preferències"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18886,21 -18881,21 +19475,38 @@@ msgstr "
"Això no afectarà a la biblioteca multimèdia.\n"
"Esteu segur que voleu continuar?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Trieu el fitxer on desar les captures de vÃdeo."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Trieu"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Trieu el fitxer on desar les captures de vÃdeo."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Trieu"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Choose the directory or filename where the records will be stored."
msgstr ""
"Trieu el directori o nom del fitxer on s'emmagatzemaran els enregistraments."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18908,16 -18903,16 +19514,29 @@@ msgstr "
"Premeu noves tecles per\n"
"«%@»"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Combinació no và lida"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Aquestes tecles no poden assignar-se com a drecera."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Combinació no và lida"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Aquestes tecles no poden assignar-se com a drecera."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Aquesta combinació ja està agafada per \"%@\"."
@@@ -21029,21 -21024,21 +21648,37 @@@ msgstr "Elimina el perfil seleccionat
msgid "Create a new profile"
msgstr "Crea un nou perfil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Crea"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This muxer is not provided directly by VLC: It could be missing."
msgstr ""
"Aquest multiplexor no el proveeix directament el VLC: no es pot trobar."
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Falta el nom del perfil"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Falta el nom del perfil"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Heu de definir un nom per al perfil."
@@@ -24634,23 -24629,23 +25269,43 @@@ msgstr "Transcodifica la sortida de flu
msgid "Overlays/Subtitles"
msgstr "Superposicions / SubtÃtols"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Lletra monospace"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "FamÃlia de lletra que voleu utilitzar per a la lletra"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Fitxer de lletra que voleu utilitzar per a la lletra"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Cos de lletra en pÃxels"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Lletra monospace"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "FamÃlia de lletra que voleu utilitzar per a la lletra"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Fitxer de lletra que voleu utilitzar per a la lletra"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Cos de lletra en pÃxels"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24660,11 -24655,11 +25315,19 @@@ msgstr "
"amb algun número diferent a 0 aquesta opció substitueix el cos de lletra "
"relatiu."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Opacitat del text"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Opacitat del text"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24672,12 -24667,12 +25335,20 @@@ msgstr "
"L'opacitat (el contrari de la transparència) del text que es renderitzarà al "
"vÃdeo. 0 = transparent, 255 = totalment opac."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Color de text per defecte"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24690,12 -24685,12 +25361,20 @@@ msgstr "
"verd, després blau. Negre = #000000, #FF0000 = vermell, verd = #00FF00, "
"#FFFF00 = groc (vermell + verd), blanc = #FFFFFF"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Cos de lletra relatiu"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24704,59 -24699,59 +25383,111 @@@ msgstr "
"Mida per defecte de la lletra que es renderitza al vÃdeo. Si s'estableix un "
"cos de lletra absolut, es substitueix el cos relatiu."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Opacitat del fons"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Color de fons"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Opacitat del contorn"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Opacitat de l'ombra"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Color de l'ombra"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Angle de l'ombra"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Distà ncia de l'ombra"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Opacitat del fons"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Color de fons"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Opacitat del contorn"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Opacitat de l'ombra"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Color de l'ombra"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Angle de l'ombra"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Distà ncia de l'ombra"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Més petit"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Petit"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Gran"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Més gran"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Utilitza el renderitzador YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Utilitza el renderitzador YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24764,23 -24759,23 +25495,43 @@@ msgstr "
"Renderitza la font mitjançant «paletitzat YUV». Aquesta opció només és "
"necessà ria si es vol codificar amb subtÃtols DVB"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Prim"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Gruixut"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Renderitzador del text"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Renderitzador de la lletra Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Prim"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Gruixut"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Renderitzador del text"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Renderitzador de la lletra Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/cgg.po
index 21cc0a0,7957c4f..999af37
--- a/po/cgg.po
+++ b/po/cgg.po
@@@ -5,7 -5,7 +5,11 @@@ msgid "
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2011-04-18 13:01+0200\n"
"Last-Translator: Florence Tushabe <tushabe at cit.mak.ac.ug>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@@ -139,7 -139,7 +143,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -463,10 -463,10 +471,17 @@@ msgid "&About
msgstr ""
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -505,17 -505,17 +520,29 @@@ msgid "Save...
msgstr ""
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Garukamu byona"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Garukamu Kimwe"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -596,7 -596,7 +623,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Disable"
msgstr "Basiza"
@@@ -1303,20 -1303,20 +1334,36 @@@ msgstr "Furemu aha Furemu
msgid "Decoded format"
msgstr "Ebihindwirwe"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1730,7 -1730,7 +1777,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1816,7 -1816,7 +1867,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Hatariho"
@@@ -1841,7 -1841,7 +1896,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Basiza filimu"
@@@ -2041,7 -2041,7 +2100,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Ahamutwe bulikiire"
@@@ -2092,7 -2092,7 +2155,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2101,7 -2101,7 +2168,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Enkora ..."
@@@ -2159,7 -2159,7 +2230,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Timba Edirisa"
@@@ -2342,7 -2342,7 +2417,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Guruka furemu"
@@@ -2474,12 -2474,12 +2553,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2487,7 -2487,7 +2575,11 @@@ msgid "Default
msgstr "Ebiteirweho"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2808,7 -2808,7 +2900,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3664,7 -3664,7 +3760,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Otakifaho"
@@@ -3690,8 -3690,8 +3790,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3778,10 -3778,10 +3883,17 @@@ msgid "Slower (fine)
msgstr "Mpola mpola (kurungi)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3794,10 -3794,10 +3906,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Ekyenyima"
@@@ -3806,9 -3806,9 +3925,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4056,9 -4056,9 +4181,15 @@@ msgid "Select the key to decrease audi
msgstr "Toorana ekihandiiko ekyokubiikwamu"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Tetesa"
@@@ -4522,7 -4522,7 +4653,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Ekishushani kya'honaaho"
@@@ -4734,12 -4734,12 +4869,21 @@@ msgstr "Yaakira Ekyojwekamu
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Shazamu"
@@@ -5512,7 -5512,7 +5656,11 @@@ msgstr "Sharaho ekicweka
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "Gyeragyeranisa emyanya"
@@@ -7970,7 -7970,7 +8118,11 @@@ msgstr "Ebyateerwa aharutimbe
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Orutimbe"
@@@ -8778,7 -8778,7 +8930,11 @@@ msgstr "
msgid "Volume Set"
msgstr "Iraka"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9949,7 -9949,7 +10105,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "Ebihandiiko ebyamaraka"
@@@ -9985,7 -9985,7 +10145,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "Entekateeka yamaraka"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "Entekateeka yamaraka"
@@@ -9995,32 -9995,32 +10159,56 @@@
msgid "Last audio device"
msgstr "Akarikuhereza eiraka"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
++=======
+ #: modules/audio_output/auhal.c:578
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio device is not configured"
msgstr "Eiziina rye choma ekyebyeshongoro"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Entekateeka yamaraka"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -11247,46 -11247,46 +11435,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Ekirikwiragura"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Ekiri kwiraguramu kakye"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Siliva"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Mutare"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Ekirenda kushusha eshagama"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Kishagama"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11294,61 -11294,61 +11510,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Kinekye"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Kinyasi ekitakwasire"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Kinyasi"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Kijubwe-bururu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Ekikanaana"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Bururu ekwasire"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Bururu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11484,7 -11484,7 +11736,11 @@@ msgstr "Emitwe erimu
msgid "Subtitle renderers using libass"
msgstr "Emitwe ye'bisherekyirwe"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13340,10 -13340,10 +13596,17 @@@ msgid "Fast
msgstr "Rahukaho"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Ekyabuliijo"
@@@ -13460,8 -13460,8 +13723,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13821,9 -13821,9 +14089,15 @@@ msgstr "
msgid "Opening"
msgstr "Iguraho"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Yemerezaho kakye"
@@@ -15806,7 -15806,7 +16080,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Entambura ya MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Ebihandiko"
@@@ -15997,7 -15997,7 +16275,11 @@@ msgid "VLC media player Help
msgstr "Obuyambi bw'enzaana ya VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Okukarara rwebintu"
@@@ -16092,9 -16092,9 +16374,15 @@@ msgstr "Tamu eiziina lyeibiikiro ensya:
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Biika"
@@@ -16237,7 -16237,7 +16525,11 @@@ msgstr "Tihariho ekiteibwemu ekyalebekw
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Oburambe burakora haba hariho ekirazaana nainge ekyayemerezebwamu"
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Guruka oze aha shaaha"
@@@ -16258,7 -16258,7 +16550,11 @@@ msgstr "
msgid "Backward"
msgstr "Gyenda enyima"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16269,7 -16269,7 +16565,11 @@@ msgstr "
msgid "Forward"
msgstr "Gyenda omumeisho"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16290,89 -16290,89 +16590,160 @@@ msgstr "Entimbe ezikwiragura omunkora e
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "Toorana ekihandiiko ekyokubiikwamu"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "Yoreka orukarara rwebyokuzaana"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "Garukamu:"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "Toorana ekihandiiko ekyokubiikwamu"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "Eraka Rikye"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Ebyarugamu"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -16414,7 -16414,7 +16785,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16618,8 -16618,8 +16993,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Nkoku nookikunda"
@@@ -16712,37 -16712,37 +17092,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "Ekizani kya VLC"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "tihariho oburemwa obwarebeka bwona"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "tihariho oburemwa obwarebeka bwona"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Gumizamu"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Tikyabasika kureba enshobe yenyima"
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "yihamu ebikuru bitoreine "
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Niho twareba enshuura enkuru yebihandiiko byebitoreinwe bya VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Naga omukasasiro ogaruke otandike VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Tikyabasika kureba enshobe yenyima"
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "yihamu ebikuru bitoreine "
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Niho twareba enshuura enkuru yebihandiiko byebitoreinwe bya VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Naga omukasasiro ogaruke otandike VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "Karondorozi wenshobe ya VLC (%s).rtfd"
@@@ -16901,7 -16901,7 +17313,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Kyinga okuhangusya"
@@@ -17042,7 -17042,7 +17458,11 @@@ msgstr "Shereka VLC
msgid "Hide Others"
msgstr "Shereka ebindi"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Yoreka byona"
@@@ -17133,15 -17133,15 +17553,27 @@@ msgstr "Entwara omu rutimbe
msgid "A→B Loop"
msgstr "Ekifumuka A->B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Rugamu ahanyima yokuzanwa"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Gyenda omumeisho"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Rugamu ahanyima yokuzanwa"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Gyenda omumeisho"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Gyenda enyima"
@@@ -17157,30 -17157,30 +17589,56 @@@ msgstr "Kyendeza iraka
msgid "Audio Device"
msgstr "Akarikuhereza eiraka"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Ekicweeka kimwe kyekipimo"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Ekipimo ekishemerirwe"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Ekipimo kibazibwemu"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Kihikanise aharutimbe"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Ekicweeka kimwe kyekipimo"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Ekipimo ekishemerirwe"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Ekipimo kibazibwemu"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Kihikanise aharutimbe"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Zeelela ahamutwe"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Akoma akarereka filimu aharutimbe ryona"
@@@ -17189,7 -17189,7 +17647,11 @@@
msgid "Post processing"
msgstr "Kikoreho ahanyima"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Ekihandiiko kye'mitwe"
@@@ -17430,7 -17430,7 +17892,11 @@@ msgid "Play another media synchronously
msgstr "Zaana orutambi orundi"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Torana..."
@@@ -17617,7 -17617,7 +18083,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Emitwe ye'bisherekyirwe"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Sayizi y'empandiika"
@@@ -17849,12 -17849,12 +18319,20 @@@ msgstr "Enshobe omukubiika ebirakwata a
msgid "VLC was unable to save the meta data."
msgstr "VLC tiyabaasa kubiika ebirakwata ahabirimu."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Ebisiimirwe"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Byona obigaruze nkoku byateiremu"
@@@ -18038,134 -18038,129 +18516,242 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Yemerezamu Ebyazanwa"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Okushereka okuteibwemu"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Yoreka Entekateeka"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Okushereka okuteibwemu"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Yoreka Entekateeka"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
#, fuzzy
msgid "Font color"
msgstr "Rangi y'empandika"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Empandiika"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Endimi y'emitwe"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Endimi y'emitwe esiimirwe"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Basiiza OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Basiiza OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Obutahweza"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "Hindura erangi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Entimbe ezikwiragura omunkora ezijwire"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Entimbe ezikwiragura omunkora ezijwire"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Yoreka"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Enteekateeka yokushohoza"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Ebicweeka bya sinema"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Eibiikiro"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Enshwa"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Ebirikubanza"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Okubara orikukuratanisa"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Okukyebera okukwire aha: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Tihariho kukyeberwa kwona."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Enteekateeka yokushohoza"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Ebicweeka bya sinema"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Eibiikiro"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Enshwa"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Ebirikubanza"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Okubara orikukuratanisa"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Okukyebera okukwire aha: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Tihariho kukyeberwa kwona."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Garuka oteho ebisiimirwe"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18178,22 -18173,22 +18764,39 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Choose the folder to save your video snapshots to."
msgstr ""
"Yoreka eibiikiro ahu ebicweeka bya sinema ebiwatoorana birazakubwiikwa."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Toorana"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Toorana"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the directory or filename where the records will be stored."
msgstr "Endagiriro ahokubiika ekihandiiko neitekwa kutoranwa."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18201,16 -18196,16 +18804,29 @@@ msgstr "
"Nyiga eipesha risya ahabwa\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Engeita etakyakora"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Otusaasire, emapesha aga tigakaaheebwa za panya"
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Engeita etakyakora"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Otusaasire, emapesha aga tigakaaheebwa za panya"
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Engeita egi etwiibwe \"%@\"."
@@@ -20246,21 -20241,21 +20862,37 @@@ msgstr "Sanguraho ebyatoranwa omukwanju
msgid "Create a new profile"
msgstr "Tandika enyanjura ensya"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Tandika"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid " Profile Name Missing"
msgstr "Eiziina Eryenyanjula"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Nootekwa okutaho eiziina eriranjura."
@@@ -23745,47 -23740,47 +24377,83 @@@ msgstr "Shohoza Ebyarugamu
msgid "Overlays/Subtitles"
msgstr "Emitwe"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font size in pixels"
msgstr "Sayizi yempandiika, doti"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "Obutahweza"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23794,98 -23789,98 +24462,178 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "Gyeragyeranisa ebiri omu firimu"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "Gyeragyeranisa ebiri omu firimu"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "Obutahweza"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "Rangi y'empandika"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Smaller"
msgstr "Eraka Rikye"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/ckb.po
index 12ceea6,0b834a5..f191474
--- a/po/ckb.po
+++ b/po/ckb.po
@@@ -7,7 -7,7 +7,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc 1.0\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2009-06-07 18:52+0300\n"
"Last-Translator: Ara Qadir <arastein at gmail.com>\n"
"Language-Team: Kurdish (Sorani) <arastein at gmail.com>\n"
@@@ -136,7 -136,7 +140,11 @@@ msgstr "یەکە و ڕێکخستنە ج
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -448,10 -448,10 +456,17 @@@ msgid "&About
msgstr "&دەربارە"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -494,17 -494,17 +509,29 @@@ msgid "Save...
msgstr "پاشەکەوتکردن..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "هەمووی دووبارە بکەوە"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "دووبارەکردنەوەی یەکێک"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -612,7 -612,7 +639,11 @@@ msgstr "گەیشتیت بە زۆرترÛ
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "ناچالاککردن"
@@@ -1317,20 -1317,20 +1348,36 @@@ msgstr "ڕێژەی چوارچێوە
msgid "Decoded format"
msgstr "تۆمارکردن"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC ناتوانێت MRL ـی '%s' بکاتەوە. لۆگ بکەرەوە بۆ وردەکارییەکان."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1727,7 -1727,7 +1774,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1811,7 -1811,7 +1862,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "هیچ"
@@@ -1835,7 -1835,7 +1890,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "ڤیدیۆ چالاک بکە"
@@@ -2025,7 -2025,7 +2084,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "هەمیشە لە لوتکە"
@@@ -2076,7 -2076,7 +2139,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2085,7 -2085,7 +2152,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2141,7 -2141,7 +2212,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "دیکۆرەکانی پەنجەرە"
@@@ -2311,7 -2311,7 +2386,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "پەڕاندنی چوارچێوەکان"
@@@ -2444,12 -2444,12 +2523,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2457,7 -2457,7 +2545,11 @@@ msgid "Default
msgstr "بنەڕەت"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2766,7 -2766,7 +2858,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3590,7 -3590,7 +3686,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ùەرامۆشکردن"
@@@ -3614,8 -3614,8 +3714,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3697,10 -3697,10 +3802,17 @@@ msgid "Slower (fine)
msgstr "خاوتر (باش)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3713,10 -3713,10 +3825,17 @@@ msgid "Select the hotkey to use to ski
msgstr "ئەو کلیلە دیاری بکە پەڕاندنی دانەی داهاتوو لە لیستی لێداندا."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "پێشوو"
@@@ -3725,9 -3725,9 +3844,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "ئەو کلیلە دیاری بکە پەڕاندنی دانەی پێشوو لە لیستی لێداندا."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3967,9 -3967,9 +4092,15 @@@ msgid "Select the key to decrease audi
msgstr "ئەو کلیلە دیاری بکە بۆ نزمکردنەوەی ئاستی دەنگ."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "بێدەنگ"
@@@ -4398,7 -4398,7 +4529,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4595,12 -4595,12 +4730,21 @@@ msgstr "دای دەگرێت ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "پاشگەزبوونەوە"
@@@ -5377,7 -5377,7 +5521,11 @@@ msgstr "بڕین
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7759,7 -7759,7 +7907,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "شاشە"
@@@ -8540,7 -8540,7 +8692,11 @@@ msgstr "
msgid "Volume Set"
msgstr "ڕێکخستنی ئاستی دەنگ"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9692,7 -9692,7 +9848,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9727,7 -9727,7 +9887,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "دەرەنجامی بیرگەی ڤیدیۆ"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "یەکەی دەرەنجامی دەنگ"
@@@ -9737,31 -9737,31 +9901,55 @@@
msgid "Last audio device"
msgstr "ئامێری CD ـی دەنگ"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "ئامێری دەنگ دیاری بکە"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10947,46 -10947,46 +11135,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Ú•Û•Ø´"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "ڕەساسی"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "زیوی"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "سپی"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "مارۆنی"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "سور"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10994,61 -10994,61 +11210,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "زەرد"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "زەیتوونی"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "سەوز"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "مۆر"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "شین"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11178,7 -11178,7 +11430,11 @@@ msgstr "ژێرنووسەکان (پەرÛ
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13011,10 -13011,10 +13267,17 @@@ msgid "Fast
msgstr "خێراتر"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "ئاسایی"
@@@ -13127,8 -13127,8 +13390,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13475,9 -13475,9 +13743,15 @@@ msgstr "دەستپێکردن
msgid "Opening"
msgstr "کردنەوە"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "ڕاگرتن"
@@@ -15431,7 -15431,7 +15705,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "دووردەق"
@@@ -15611,7 -15611,7 +15889,11 @@@ msgid "VLC media player Help
msgstr "یارمەتی لێدەری ڕەنگاڵەی VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "سەرەتا"
@@@ -15705,9 -15705,9 +15987,15 @@@ msgstr "دڵخوازێکی نوێ درÙ
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "پاشەکەوتکردن"
@@@ -15848,7 -15848,7 +16136,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "بازدان بۆ کاتێک"
@@@ -15869,7 -15869,7 +16161,11 @@@ msgstr "
msgid "Backward"
msgstr "هەنگاو بۆ دواوە"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15879,7 -15879,7 +16175,11 @@@ msgstr "
msgid "Forward"
msgstr "پێشخستن"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15900,90 -15900,90 +16200,161 @@@ msgstr "پڕشاشەیی جێبهێڵە
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "ئەو کلیلە دیاری بکە بۆ وەستاندنی لێدان."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "پیشاندانی لیستی لێدان"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "دووبارە:"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "ئەو کلیلە دیاری بکە بۆ بێدەنگکردن."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "ئاستی دەنگی بنەڕەتی"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "کاریگەرییەکان"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr "ئەو کلیلە دیاری بکە پەڕاندنی دانەی پێشوو لە لیستی لێداندا."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -16025,7 -16025,7 +16396,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16225,8 -16225,8 +16600,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "دەستکرد"
@@@ -16319,37 -16319,37 +16699,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "لێدەری ڕەنگاڵەی VLC"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "هیچ تۆمارێکی تێکشکان نەدۆزرایەوە"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "هیچ تۆمارێکی تێکشکان نەدۆزرایەوە"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "بەردەوامبوون"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "ویستراوە کۆنەکان لاببات؟"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "ویستراوە کۆنەکان لاببات؟"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16503,7 -16503,7 +16915,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Lock Aspect Ratio"
msgstr "ڕێژەی لاکان ڕاست بکەرەوە"
@@@ -16646,7 -16646,7 +17062,11 @@@ msgstr "شاردنەوەی VLC
msgid "Hide Others"
msgstr "شاردنەوەی ئەوانی تر"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "پیشاندانی هەموو"
@@@ -16735,15 -16735,15 +17155,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "دەربچۆ دوای لێدان"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "هەنگاو بۆ پێشەوە"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "دەربچۆ دوای لێدان"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "هەنگاو بۆ پێشەوە"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "هەنگاو بۆ دواوە"
@@@ -16759,30 -16759,30 +17191,56 @@@ msgstr "کەمکردنی ئاستی دÛ
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "نیو قەبارە"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "قەبارەی ئاسایی"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "دوو هێندە قەبارە"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "نیو قەبارە"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "قەبارەی ئاسایی"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "دوو هێندە قەبارە"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "ئامێری ڤیدیۆی پڕشاشە"
@@@ -16791,7 -16791,7 +17249,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "پەڕگەی ژێرنووس"
@@@ -17034,7 -17034,7 +17496,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "هەڵبژێرە..."
@@@ -17220,7 -17220,7 +17686,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "ئینکۆدینی ژێڕنووس"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "قەبارەی Ùۆنت"
@@@ -17451,12 -17451,12 +17921,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "ویستراوەکان"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "هەمووی وەک خۆی لێبکەوە"
@@@ -17640,133 -17640,128 +18118,241 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "دەربچۆ دوای لێدان"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "ئینکۆدینی بنەڕەتی"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "ڕێکخستنەکانی پیشاندان"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "ئینکۆدینی بنەڕەتی"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "ڕێکخستنەکانی پیشاندان"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Ú•Û•Ù†Ú¯ÛŒ Ùۆنت"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Ùۆنت"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "زمانی ژێرنووس"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "زمانی ویستراوی ژێرنووس"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "چالاککردنی پ س ش"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "چالاککردنی پ س ش"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "هەڵگێڕانەوەی ڕەنگەکان"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "پیشاندان"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "بوخچە"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "شێواز"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "پێشگر"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "بوخچە"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "شێواز"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "پێشگر"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "ویستراوەکان وەک خۆی لێبکەوە"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17779,35 -17774,35 +18365,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "هەكبژێرە"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "هەكبژێرە"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19840,20 -19835,20 +20456,36 @@@ msgstr "شتە دیاریکراوەکÛ
msgid "Create a new profile"
msgstr "دڵخوازێکی نوێ دروست بکە"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "دروستکردن"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -23307,48 -23302,48 +23939,84 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font family for the font you want to use"
msgstr "ناوی Ù¾Û•Ú•Ú¯Û•ÛŒ ئەو Ùۆنتەی ئەتەوێت بەکاری ببەیت"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:159
++=======
+ #: modules/text_renderer/freetype.c:158
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font file for the font you want to use"
msgstr "ناوی Ù¾Û•Ú•Ú¯Û•ÛŒ ئەو Ùۆنتەی ئەتەوێت بەکاری ببەیت"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "قەبارەی Ùۆنت بە خاڵ"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "قەبارەی Ùۆنت بە خاڵ"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "جێگەی دەق"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "ڕەنگی بنەڕەتی دەق"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23357,96 -23352,96 +24025,176 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "پاشەبنەما"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "پاشەبنەما"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "Ú•Û•Ù†Ú¯ÛŒ Ùۆنت"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "بچوکتر"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "بچوک"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "گەورە"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "گەورەتر"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/co.po
index bd5569f,be19fc9..cd64255
--- a/po/co.po
+++ b/po/co.po
@@@ -7,7 -7,7 +7,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2006-04-06 07:27+0000\n"
"Last-Translator: ghjuvan pasquinu <jpasquin.castellani at libertysurf.fr>\n"
"Language-Team: Corsican <co at li.org>\n"
@@@ -131,7 -131,7 +135,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -444,10 -444,10 +452,17 @@@ msgid "&About
msgstr ""
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -488,17 -488,17 +503,29 @@@ msgid "Save...
msgstr ""
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr ""
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr ""
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -581,7 -581,7 +608,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr ""
@@@ -1259,20 -1259,20 +1290,36 @@@ msgstr "
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1667,7 -1667,7 +1714,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1750,7 -1750,7 +1801,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr ""
@@@ -1774,7 -1774,7 +1829,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -1964,7 -1964,7 +2023,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr ""
@@@ -2015,7 -2015,7 +2078,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2024,7 -2024,7 +2091,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2080,7 -2080,7 +2151,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2250,7 -2250,7 +2325,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2378,12 -2378,12 +2457,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2391,7 -2391,7 +2479,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2696,7 -2696,7 +2788,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3509,7 -3509,7 +3605,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3533,8 -3533,8 +3633,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3616,10 -3616,10 +3721,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3632,10 -3632,10 +3744,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr ""
@@@ -3644,9 -3644,9 +3763,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3881,9 -3881,9 +4006,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4310,7 -4310,7 +4441,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4508,12 -4508,12 +4643,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr ""
@@@ -5273,7 -5273,7 +5417,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "Audio"
@@@ -7619,7 -7619,7 +7767,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8377,7 -8377,7 +8529,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9507,7 -9507,7 +9663,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "Audio"
@@@ -9542,7 -9542,7 +9702,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "Audio"
@@@ -9552,31 -9552,31 +9716,55 @@@
msgid "Last audio device"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10760,46 -10760,46 +10948,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10807,61 -10807,61 +11023,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10995,7 -10995,7 +11247,11 @@@ msgstr "Audio
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12814,10 -12814,10 +13070,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -12924,8 -12924,8 +13187,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13268,9 -13268,9 +13536,15 @@@ msgstr "
msgid "Opening"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -15179,7 -15179,7 +15453,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15360,7 -15360,7 +15638,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15454,9 -15454,9 +15736,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr ""
@@@ -15597,7 -15597,7 +15885,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15617,7 -15617,7 +15909,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15627,7 -15627,7 +15923,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15647,86 -15647,86 +15947,157 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -15766,7 -15766,7 +16137,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15961,8 -15961,8 +16336,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -16055,37 -16055,37 +16435,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Remove old preferences?"
msgstr "Priferenze di VLC"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16237,7 -16237,7 +16649,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Lock Aspect Ratio"
msgstr "Audio"
@@@ -16371,7 -16371,7 +16787,11 @@@ msgstr "
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr ""
@@@ -16459,15 -16459,15 +16879,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16484,30 -16484,30 +16916,56 @@@ msgstr "
msgid "Audio Device"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16516,7 -16516,7 +16974,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Audio"
@@@ -16752,7 -16752,7 +17214,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -16932,7 -16932,7 +17398,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -17167,13 -17167,13 +17637,21 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
#, fuzzy
msgid "Preferences"
msgstr "Priferenze di VLC"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17359,134 -17359,130 +17837,242 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
#, fuzzy
msgid "Font color"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
#, fuzzy
msgid "Reset Preferences"
msgstr "Priferenze di VLC"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17499,35 -17495,35 +18085,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19515,20 -19511,20 +20131,36 @@@ msgstr "Audio
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22919,45 -22915,45 +23551,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22966,95 -22962,95 +23634,175 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "Audio"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/cs.po
index 59610ab,71af112..0db412b
--- a/po/cs.po
+++ b/po/cs.po
@@@ -3,15 -3,15 +3,26 @@@
# This file is distributed under the same license as the VLC package.
#
# Translators:
++<<<<<<< HEAD
+# kalerme, 2013
+# Jakub ŽáÄek <dawon.cz at gmail.com>, 2009
+# Kamil Páral <ripper42 at gmail.com>, 2009
+# Martin Zicha <zicha at centrum.cz>, 2012
++=======
+ # kalerme <suchaalena at email.cz>, 2013
+ # Jakub ŽáÄek <dawon.cz at gmail.com>, 2009
+ # Kamil Páral <ripper42 at gmail.com>, 2009
+ # Martin Zicha <zicha at centrum.cz>, 2012
+ # Michal Halenka <michal.halenka at gmail.com>, 2013
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# Michal Halenka <michal.halenka at gmail.com>, 2012-2013
# Miroslav Oujeský <oujesky at mail.muni.cz>, 2006
# Mustafa Sandal <dreddux at gmail.com>, 2012
# Petr Å imáÄek <petr.simacek at gmail.com>, 2012
++<<<<<<< HEAD
+# MMMHHH <hrubymar10 at gmail.com>, 2013
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# Tomáš Chvátal <tomas.chvatal at gmail.com>, 2008-2013
# Václav PavlÃÄek <v.pavlicek at centrum.cz>, 2012
# VÃt PelÄák <vit at pelcak.org>, 2012
@@@ -20,8 -20,8 +31,13 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-12-06 12:19+0000\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-10-26 14:14+0000\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Last-Translator: Tomáš Chvátal <tomas.chvatal at gmail.com>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/vlc-trans/language/"
"cs/)\n"
@@@ -149,7 -149,7 +165,11 @@@ msgstr "Různá nastavenà a moduly pr
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -479,10 -479,10 +499,17 @@@ msgid "&About
msgstr "O &aplikaci"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -521,17 -521,17 +548,29 @@@ msgid "Save...
msgstr "Uložit..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Opakovat vše"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Opakovat jednou"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -599,32 -599,6 +638,35 @@@ msgid "
"code. You can also give funds and material to help us. And of course, you "
"can <b>promote</b> VLC media player.</p></body></html>"
msgstr ""
++<<<<<<< HEAD
+"<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; "
+"charset=utf-8\" /></head><body><h2>VÃtejte v nápovÄ›dÄ› pro VLC media player</"
+"h2><h3>Dokumentace</h3><p>Dokumentaci k VLC najdete na VideoLAN <a href="
+"\"http://wiki.videolan.org\">wiki</a>.</p><p>Pokud jste ve VLC media player "
+"nováÄek, pÅ™eÄtÄ›te si<br><a href=\"http://wiki.videolan.org/Documentation:"
+"VLC_for_dummies\"><em>Úvod do VLC media player</em></a>.</p><p>Zde najdete "
+"nÄ›jaké informace o tom, jak použÃvat pÅ™ehrávaÄ:<br>\"<a href=\"http://wiki."
+"videolan.org/Documentation:Play_HowTo\"><em>Jak přehrát soubory s VLC media "
+"player</em></a>\" dokument.</p><p>Pro vÅ¡echny ukládánÃ, zpracovánÃ, "
+"transkódovánÃ, kódovánÃ, multiplex a streamovánà úkolů, byste mÄ›li najÃt "
+"užiteÄné informace na <a href=\"http://wiki.videolan.org/Documentation:"
+"Streaming_HowTo\">Dokumentace Streamingu</a>.</p><p>Pokud si nejste jisti s "
+"terminologiÃ, poraÄte se s <a href=\"http://wiki.videolan.org/Knowledge_Base"
+"\">databázà znalostÃ</a>.</p><p>Chcete-li porozumÄ›t hlavnÃm klávesovým "
+"zkratkám, pÅ™eÄtÄ›te si stránku: <a href=\"http://wiki.videolan.org/Hotkeys"
+"\">zkratky</a>.</p><h3>Pomoc</h3><p>Než položÃte jakýkoliv dotaz, tak se "
+"pÅ™evÄ›dÄte, jestli to už nÄ›kdo neudÄ›lal za vás: <a href=\"http://www.videolan."
+"org/support/faq.html\">FAQ</a>.</p><p>Zde se dá hledat pomoc: <a href="
+"\"http://forum.videolan.org\">Fórum</a>, a <a href=\"http://www.videolan.org/"
+"vlc/lists.html\">Mailing-listy</a> nebo náš IRC kanál (<em>#videolan</em> na "
+"irc.freenode.net).</p><h3>Přispět na projekt</h3><p>Můžete pomoci projektu "
+"VideoLAN tÃm, že darujete Äást svého Äasu na pomoc komunitÄ›. Můžete "
+"navrhnout skiny (vzhled) rozhranÃ, pÅ™ekládat dokumentace, testovat a kód, "
+"apod... Můžete také darovat finanÄnà prostÅ™edky a materiál, aby jste nám "
+"pomohli. A samozřejmě, můžete <b>propagovat</b> VLC media player.</p></"
+"body></html>"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/audio_output/filters.c:247
msgid "Audio filtering failed"
@@@ -637,7 -611,7 +679,11 @@@ msgstr "Maximálnà poÄet filtrů (%u
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Zakázat"
@@@ -972,7 -946,7 +1018,11 @@@ msgstr "Vložit
#: src/config/keys.c:86
msgid "Media Angle"
++<<<<<<< HEAD
+msgstr "Úhel média"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:87
msgid "Media Audio Track"
@@@ -980,7 -954,7 +1030,11 @@@ msgstr "Zvuková stopa média
#: src/config/keys.c:88
msgid "Media Forward"
++<<<<<<< HEAD
+msgstr "Médium Vpřed"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:89
msgid "Media Menu"
@@@ -988,47 -962,47 +1042,91 @@@ msgstr "NabÃdka médiÃ
#: src/config/keys.c:90
msgid "Media Next Frame"
++<<<<<<< HEAD
+msgstr "NásledujÃcà snÃmek média"
+
+#: src/config/keys.c:91
+msgid "Media Next Track"
+msgstr "Dalšà stopa média"
+
+#: src/config/keys.c:92
+msgid "Media Play Pause"
+msgstr "Pozastavit přehrávánà média"
+
+#: src/config/keys.c:93
+msgid "Media Prev Frame"
+msgstr "PÅ™edchozà snÃmek média"
+
+#: src/config/keys.c:94
+msgid "Media Prev Track"
+msgstr "Předchozà stopa média"
+
+#: src/config/keys.c:95
+msgid "Media Record"
+msgstr "Nahrávánà média"
+
+#: src/config/keys.c:96
+msgid "Media Repeat"
+msgstr "Opakovat média"
+
+#: src/config/keys.c:97
+msgid "Media Rewind"
+msgstr "PÅ™etoÄit média"
+
+#: src/config/keys.c:98
+msgid "Media Select"
+msgstr "Vybrat média"
+
+#: src/config/keys.c:99
+msgid "Media Shuffle"
+msgstr "ZamÃchat média"
+
+#: src/config/keys.c:100
+msgid "Media Stop"
+msgstr "Zastavit média"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:91
+ msgid "Media Next Track"
+ msgstr ""
+
+ #: src/config/keys.c:92
+ msgid "Media Play Pause"
+ msgstr ""
+
+ #: src/config/keys.c:93
+ msgid "Media Prev Frame"
+ msgstr ""
+
+ #: src/config/keys.c:94
+ msgid "Media Prev Track"
+ msgstr ""
+
+ #: src/config/keys.c:95
+ msgid "Media Record"
+ msgstr ""
+
+ #: src/config/keys.c:96
+ msgid "Media Repeat"
+ msgstr ""
+
+ #: src/config/keys.c:97
+ msgid "Media Rewind"
+ msgstr ""
+
+ #: src/config/keys.c:98
+ msgid "Media Select"
+ msgstr ""
+
+ #: src/config/keys.c:99
+ msgid "Media Shuffle"
+ msgstr ""
+
+ #: src/config/keys.c:100
+ msgid "Media Stop"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:101
msgid "Media Subtitle"
@@@ -1036,11 -1010,11 +1134,19 @@@ msgstr "Titulky médiÃ
#: src/config/keys.c:102
msgid "Media Time"
++<<<<<<< HEAD
+msgstr "ÄŒas médiÃ"
+
+#: src/config/keys.c:103
+msgid "Media View"
+msgstr "Zobrazenà médiÃ"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:103
+ msgid "Media View"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:104 modules/gui/qt4/components/controller.cpp:541
msgid "Menu"
@@@ -1306,22 -1280,22 +1412,38 @@@ msgstr "SnÃmků za sekundu
msgid "Decoded format"
msgstr "Dekódovaný formát"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Zadaný vstup nelze otevÅ™Ãt"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Zadaný vstup nelze otevÅ™Ãt"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"PÅ™ehrávaÄem VLC nelze otevÅ™Ãt MRL '%s'. Podrobnosti naleznete v záznamu "
"informacÃ."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "PÅ™ehrávaÄem VLC nelze rozpoznat formát vstupu"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "PÅ™ehrávaÄem VLC nelze rozpoznat formát vstupu"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1750,7 -1724,7 +1872,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1770,7 -1744,7 +1896,11 @@@ msgstr "Vypnuto
#: src/libvlc-module.c:182
msgid "Stereo audio output mode"
++<<<<<<< HEAD
+msgstr "Režim stereo zvukového výstupu"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:194
msgid "This adds audio post processing filters, to modify the sound rendering."
@@@ -1835,7 -1809,7 +1965,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Nic"
@@@ -1861,7 -1835,7 +1995,11 @@@ msgstr "
"Vyberte výstupnà metodu videa pro VLC. Výchozà chovanà je automaticky vybrat "
"nejlepšà dostupnou metodu."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Povolit video"
@@@ -2062,7 -2036,7 +2200,11 @@@ msgstr "
"využÃt."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Vždy navrchu"
@@@ -2114,7 -2088,7 +2256,11 @@@ msgstr "Skrýt kurzor myÅ¡i a ovladaÄ
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2123,7 -2097,7 +2269,11 @@@ msgstr "Odstranit prokládánÃ
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Režim odstranÄ›nà prokládánÃ"
@@@ -2181,7 -2155,7 +2331,11 @@@ msgstr "
"Zablokuje správce napájenà v průbÄ›hu pÅ™ehrávánÃ, pro zabránÄ›nà vypnutà "
"poÄÃtaÄe z důvodu neÄinnosti."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Dekorace oken"
@@@ -2367,7 -2341,7 +2521,11 @@@ msgstr "
"(1:1). Pokud máte monitor s poměrem 16:9, možná to budete muset nastavit na "
"4:3 pro zachovánà proporcÃ."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "PÅ™eskakovat snÃmky"
@@@ -2511,12 -2485,12 +2669,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2524,7 -2498,7 +2691,11 @@@ msgid "Default
msgstr "VýchozÃ"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2838,7 -2812,7 +3009,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3704,7 -3678,7 +3879,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignorovat"
@@@ -3730,8 -3704,8 +3909,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3811,10 -3785,10 +3995,17 @@@ msgid "Slower (fine)
msgstr "Pomaleji (jemné)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3828,10 -3802,10 +4019,17 @@@ msgstr "
"Vyberte klávesovou zkratku pro skok na následujÃcà položku v seznamu skladeb."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "PÅ™edchozÃ"
@@@ -3841,9 -3815,9 +4039,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"Vyberte klávesovou zkratku pro skok na předchozà položku v seznamu skladeb."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4078,9 -4052,9 +4282,15 @@@ msgid "Select the key to decrease audi
msgstr "Vyberte klávesu pro snÞenà hlasitosti."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Ztlumit"
@@@ -4494,7 -4468,7 +4704,11 @@@ msgstr "Procházet dostupnými zvukový
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "SnÃmek videa"
@@@ -4693,12 -4667,12 +4907,21 @@@ msgstr "Stahuji...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Zrušit"
@@@ -5458,7 -5432,7 +5681,11 @@@ msgstr "Ořez
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Poměr stran"
@@@ -7777,7 -7751,7 +8004,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Obrazovka"
@@@ -8513,7 -8487,7 +8744,11 @@@ msgstr "Maximálnà hlasitost #
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9624,7 -9598,7 +9859,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "Zvukový výstup ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9655,7 -9629,7 +9894,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9663,30 -9637,30 +9906,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Zvukové zaÅ™Ãzenà nenà nastaveno"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Zvukové zaÅ™Ãzenà nenà nastaveno"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (kódovaný výstup)"
@@@ -10856,46 -10830,46 +11123,74 @@@ msgstr "StÃn
msgid "Outline"
msgstr "Obrys"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Černá"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Šedá"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "StÅ™Ãbrná"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "BÃlá"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Kaštanová"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Červená"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10903,61 -10877,61 +11198,97 @@@ msgid "Fuchsia
msgstr "Fuchsiová"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Žlutá"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Olivová"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Zelená"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Tyrkysová"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Citrusová"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Růžová"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Námořnická modř"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Modrá"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11089,7 -11063,7 +11420,11 @@@ msgstr "Titulky (pokroÄilé)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Sestavit mezipaměť pÃsem"
@@@ -11981,7 -11955,7 +12316,11 @@@ msgstr "
#: modules/codec/subsdec.c:295 modules/demux/avi/avi.c:96
msgctxt "GetACP"
msgid "CP1252"
++<<<<<<< HEAD
+msgstr "CP1250"
++=======
+ msgstr "CP1252"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsusf.c:46
msgid "USFSubs"
@@@ -12878,10 -12852,10 +13217,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "NormálnÃ"
@@@ -12986,8 -12960,8 +13332,13 @@@ msgid "D-Bus control interface
msgstr "Ovládacà rozhranà D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13323,9 -13297,9 +13674,15 @@@ msgstr "ProbÃhá inicializace
msgid "Opening"
msgstr "OtevÃránÃ"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pozastavit"
@@@ -15220,7 -15194,7 +15577,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -15399,7 -15373,7 +15760,11 @@@ msgid "VLC media player Help
msgstr "NápovÄ›da pÅ™ehrávaÄe VLC media player"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "RejstÅ™Ãk"
@@@ -15487,9 -15461,9 +15852,15 @@@ msgstr "Zadejte název nového profilu:
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Uložit"
@@@ -15632,7 -15606,7 +16003,11 @@@ msgstr "Nenalezen žádný vstup
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Proud musà být spuÅ¡tÄ›n nebo pozastaven, pro funkÄnà záložky."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "PÅ™ejÃt na Äas"
@@@ -15652,7 -15626,7 +16027,11 @@@ msgstr "
msgid "Backward"
msgstr "Zpět"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15662,7 -15636,7 +16041,11 @@@ msgstr "
msgid "Forward"
msgstr "Vpřed"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15682,84 -15656,84 +16065,155 @@@ msgstr "Přepnout do režimu celé obra
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Zobrazit/skrýt seznam skladeb"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Zobrazit/skrýt seznam skladeb"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Opakovat"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "ZamÃchat"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "ZamÃchat"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Plná hlasitost"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Plná hlasitost"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efekty"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15795,7 -15769,7 +16249,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15980,8 -15954,8 +16438,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "VlastnÃ"
@@@ -16081,36 -16055,36 +16544,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "Znovu se nedotazovat"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Nenalezen žádný záznam pádu"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Nenalezen žádný záznam pádu"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "PokraÄovat"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Nelze najÃt žádné stopy po pÅ™edchozà havárii."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Odstranit stará nastaven�"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Byla nalezena starÅ¡Ã verze souboru s nastavenÃm pro VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "PÅ™esunout do koÅ¡e a znovu spustit pÅ™ehrávaÄ VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Nelze najÃt žádné stopy po pÅ™edchozà havárii."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Odstranit stará nastaven�"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Byla nalezena starÅ¡Ã verze souboru s nastavenÃm pro VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "PÅ™esunout do koÅ¡e a znovu spustit pÅ™ehrávaÄ VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16268,7 -16242,7 +16763,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Uzamknout poměr stran"
@@@ -16397,7 -16371,7 +16896,11 @@@ msgstr "Skrýt VLC
msgid "Hide Others"
msgstr "Skryt ostatnÃ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Zobrazit vše"
@@@ -16482,15 -16456,15 +16985,27 @@@ msgstr "Synchronizace stopy
msgid "A→B Loop"
msgstr "SmyÄka A->B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "UkonÄit po pÅ™ehránÃ"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Krok vpřed"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "UkonÄit po pÅ™ehránÃ"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Krok vpřed"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Krok zpět"
@@@ -16506,30 -16480,30 +17021,56 @@@ msgstr "SnÞit hlasitost
msgid "Audio Device"
msgstr "Zvukové zaÅ™ÃzenÃ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "PoloviÄnà velikost"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Původnà velikost"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dvojnásobná velikost"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Roztáhnout na velikost obrazovky"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "PoloviÄnà velikost"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Původnà velikost"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dvojnásobná velikost"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Roztáhnout na velikost obrazovky"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16538,7 -16512,7 +17079,11 @@@
msgid "Post processing"
msgstr "DodateÄné zpracovánÃ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Přidat soubor s titulky..."
@@@ -16766,7 -16740,7 +17311,11 @@@ msgid "Play another media synchronously
msgstr "Synchronizovaně přehrát dalšà médium"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Vybrat..."
@@@ -16939,7 -16913,7 +17488,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Velikost pÃsma"
@@@ -17168,12 -17142,12 +17721,20 @@@ msgstr "Chyba při ukládánà meta
msgid "VLC was unable to save the meta data."
msgstr "VLC se nepodařilo uložit meta data."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "NastavenÃ"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Obnovit vše"
@@@ -17350,129 -17324,125 +17911,237 @@@ msgstr "Povolit oznámenà Growl (při
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Výchozà znaková sada"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Nastavenà zobrazenÃ"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Výchozà znaková sada"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Nastavenà zobrazenÃ"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Barva pÃsma"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "PÃsmo"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Jazyky titulků"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Jazyky titulků"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Upřednostňovaný jazyk titulků"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Povolit OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Povolit OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Neprůhlednost"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Vynutit tuÄné pÃsmo"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Vynutit tuÄné pÃsmo"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Barva obrysu"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Å ÃÅ™ka obrysu"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Černé okraje v režimu celé obrazovky"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Černé okraje v režimu celé obrazovky"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Zobrazit"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Výstupnà modul"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "SnÃmky videa"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Složka"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Formát"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Předpona"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "SekvenÄnà ÄÃslovánÃ"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Výstupnà modul"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "SnÃmky videa"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Složka"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Formát"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Předpona"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "SekvenÄnà ÄÃslovánÃ"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Nejnižšà odezva"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "NÃzká odezva"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Dlouhá odezva"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Nejdelšà odezva"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Obnovit nastavenÃ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17485,20 -17455,20 +18154,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Vybrat"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Vybrat"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -17506,16 -17476,16 +18192,29 @@@ msgstr "
"Stiskněte nové klávesy pro\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Neplatná kombinace"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Neplatná kombinace"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19473,20 -19443,20 +20172,36 @@@ msgstr "Smazat vybraný profil
msgid "Create a new profile"
msgstr "Vytvořit nový profil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Vytvořit"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "MusÃte zadat název profilu."
@@@ -22821,23 -22791,23 +23536,43 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr "Překryv/Titulky"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Typ pÃsma, které si pÅ™ejete použÃt"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Soubor s typem pÃsma, které si pÅ™ejete použÃt"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Velikost pÃsma v pixelech"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Typ pÃsma, které si pÅ™ejete použÃt"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Soubor s typem pÃsma, které si pÅ™ejete použÃt"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Velikost pÃsma v pixelech"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -22847,11 -22817,11 +23582,19 @@@ msgstr "
"nastavena jiná hodnota než 0, automaticky pÅ™epÃÅ¡e nastavenà relativnà "
"velikosti pÃsma."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Neprůhlednost textu"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Neprůhlednost textu"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -22859,12 -22829,12 +23602,20 @@@ msgstr "
"Neprůhlednost (opak průhlednosti) textu, který bude vykreslen přes video. 0 "
"= průhledný, 255 = absolutně neprůhledný. "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Výchozà barva textu"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22877,12 -22847,12 +23628,20 @@@ msgstr "
"modrou. #000000 = Äerná, #FF0000 = Äervená, #00FF00 = zelená, #FFFF00 = "
"žlutá (Äervená + zelená), #FFFFFF = bÃlá"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Relativnà velikost pÃsma"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -22891,81 -22861,81 +23650,153 @@@ msgstr "
"Výchozà relativnà velikost pÃsma, které bude vykresleno pÅ™es video. Pokud je "
"nastavena absolutnà velikost pÃsma, relativnà velikost bude ignorována."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Neprůhlednost pozadÃ"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Barva pozadÃ"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Neprůhlednost obrysů"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Neprůhlednost stÃnů"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Barva stÃnu"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Úhel stÃnu"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Vzdálenost stÃnu"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Neprůhlednost pozadÃ"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Barva pozadÃ"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Neprůhlednost obrysů"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Neprůhlednost stÃnů"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Barva stÃnu"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Úhel stÃnu"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Vzdálenost stÃnu"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "MenÅ¡Ã"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Malá"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Velká"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "VÄ›tÅ¡Ã"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Tenká"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Široká"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "VykreslovaÄ textu"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "VykreslovaÄ pÃsma Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Tenká"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Široká"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "VykreslovaÄ textu"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "VykreslovaÄ pÃsma Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -27615,9 -27585,8 +28446,14 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Seznam správců médiÃ"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "Show Details"
+#~ msgstr "Podrobnosti o kodeku"
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Zobrazit podrobnosti"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Add a subtitle file"
diff --combined po/cy.po
index d28f290,85e1555..252084e
--- a/po/cy.po
+++ b/po/cy.po
@@@ -4,13 -4,13 +4,22 @@@
#
# Translators:
# Aled Powell <aled at aledpowell.com>, 2013
++<<<<<<< HEAD
+# Huw Waters <huwwaters at gmail.com>, 2012-2013
++=======
+ # Huw Waters <huwwaters at gmail.com>, 2012
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-12-06 13:14+0000\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-06-27 13:17+0000\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Last-Translator: Cymrodor <cymrodor at gmail.com>\n"
"Language-Team: Welsh (http://www.transifex.com/projects/p/vlc-trans/language/"
"cy/)\n"
@@@ -139,7 -139,7 +148,11 @@@ msgstr "Gosodiadau amrywiol ar gyfer sa
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -183,11 -183,12 +196,20 @@@ msgstr "Mewnbwn / Codecs
#: include/vlc_config_cat.h:94
msgid "Settings for input, demultiplexing, decoding and encoding"
++<<<<<<< HEAD
+msgstr "Gosodiadau ar gyfer mewnbwn, dadamlblecsio, datgodio ac amgodio"
+
+#: include/vlc_config_cat.h:97
+msgid "Access modules"
+msgstr "Modiwlau cyrchu"
++=======
+ msgstr ""
+ "Gosodiadau ar gyfer mewnbwn, didoli signalau amlblecs, datgodio ac amgodio"
+
+ #: include/vlc_config_cat.h:97
+ msgid "Access modules"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:99
msgid ""
@@@ -207,11 -208,11 +229,19 @@@ msgstr "
#: include/vlc_config_cat.h:108
msgid "Demuxers"
++<<<<<<< HEAD
+msgstr "Dadamlblecsyddion"
+
+#: include/vlc_config_cat.h:109
+msgid "Demuxers are used to separate audio and video streams."
+msgstr "Defnyddir dadamlblecsyddion i wahanu ffrydiau sain a fideo."
++=======
+ msgstr "Datblecsydd"
+
+ #: include/vlc_config_cat.h:109
+ msgid "Demuxers are used to separate audio and video streams."
+ msgstr "Defnyddir datblecsyddion i wahanu ffrydiau sain a fideo."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:111
msgid "Video codecs"
@@@ -266,7 -267,7 +296,11 @@@ msgstr "Gosodiadau cyffredin allanbwn f
#: include/vlc_config_cat.h:135
msgid "Muxers"
++<<<<<<< HEAD
+msgstr "Amlblecsyddion"
++=======
+ msgstr "Plecswyr"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:137
msgid ""
@@@ -304,9 -305,8 +338,14 @@@ msgid "
"not do that.\n"
"You can also set default parameters for each packetizer."
msgstr ""
++<<<<<<< HEAD
+"Defnyddir pecynyddion i ragbrosesu'r ffrydiau cyn eu hamlblecsu. Mae'r "
+"opsiwn hwn yn galluogi gorfodi pecynnydd, ond mae'n debyg na ddylech gwneud "
+"hyn.\n"
++=======
+ "Defnyddir pecynyddion i ragbrosesu'r ffrydiau cyn eu plecsu. Mae'r opsiwn "
+ "hwn yn galluogi gorfodi pecynnydd, ond mae'n debyg na ddylech gwneud hyn.\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Mae hefyd yn bosib gosod paramedrau rhagosodedig ar gyfer pob pecynnydd."
#: include/vlc_config_cat.h:158
@@@ -468,10 -468,10 +507,17 @@@ msgid "&About
msgstr "&Ynghylch"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -510,17 -510,17 +556,29 @@@ msgid "Save...
msgstr "Cadw..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Ailchwarae'r Cyfan"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Ailchwarae Un"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -627,7 -627,7 +685,11 @@@ msgstr "Mae'r uchafswm o hidlyddion (%u
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Analluogi"
@@@ -1291,20 -1291,20 +1353,36 @@@ msgstr "Fframiau yr eiliad
msgid "Decoded format"
msgstr "Fformat datgodwyd"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Methwyd agor y mewnbwn"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Methwyd agor y mewnbwn"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "Ni all VLC agor yr MRL '%s'. Gwelwch y log am fanylion."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "Nid yw VLC yn nabod ffurf y mewnbwn"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "Nid yw VLC yn nabod ffurf y mewnbwn"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1669,7 -1669,7 +1747,11 @@@ msgstr "
#: src/libvlc-module.c:157
msgid "Audio resampler"
++<<<<<<< HEAD
+msgstr "Ailsamplwr sain"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:159
msgid "This selects which plugin to use for audio resampling."
@@@ -1708,7 -1708,7 +1790,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1792,7 -1792,7 +1878,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Dim"
@@@ -1818,7 -1818,7 +1908,11 @@@ msgstr "
"Hwn yw'r dull allbwn fideo a ddefnyddir gan VLC. Fel arfer, mae'n dewis y "
"dull gorau ar gael yn awtomatig."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Galluogi fideo"
@@@ -2027,7 -2027,7 +2121,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Cadw ar y blaen"
@@@ -2079,7 -2079,7 +2177,11 @@@ msgstr "Cuddio'r cyrchwr a'r bar rheol
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2088,7 -2088,7 +2190,11 @@@ msgstr "Datgydblethu
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Modd datgydblethu"
@@@ -2144,7 -2144,7 +2250,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Addurniadau'r ffenestr"
@@@ -2340,7 -2340,7 +2450,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Neidio fframiau"
@@@ -2476,12 -2476,12 +2590,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2489,7 -2489,7 +2612,11 @@@ msgid "Default
msgstr "Rhagosodedig"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2805,7 -2805,7 +2932,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3289,7 -3289,7 +3420,11 @@@ msgstr "Mae hyn yn caniatau dewis y dre
#: src/libvlc-module.c:962
msgid "Mux module"
++<<<<<<< HEAD
+msgstr "Modiwl amlblecsu"
++=======
+ msgstr "Modiwl amlplecsu"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:964
msgid "This is a legacy entry to let you configure mux modules"
@@@ -3327,7 -3327,7 +3462,11 @@@ msgstr "
#: src/libvlc-module.c:989
msgid "Access module"
++<<<<<<< HEAD
+msgstr "Modiwl cyrchu"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:991
msgid ""
@@@ -3346,7 -3346,7 +3485,11 @@@ msgstr "
#: src/libvlc-module.c:999
msgid "Demux module"
++<<<<<<< HEAD
+msgstr "Modiwl Dadamlblecsu"
++=======
+ msgstr "Modiwl Datblecsu"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1001
msgid ""
@@@ -3444,7 -3444,7 +3587,11 @@@ msgstr "
#: src/libvlc-module.c:1053
msgid "Log to file"
++<<<<<<< HEAD
+msgstr "Cofnodi i ffeil"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1055
msgid "Log all VLC messages to a text file."
@@@ -3674,7 -3674,7 +3821,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Anwybyddu"
@@@ -3698,8 -3698,8 +3849,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3779,10 -3779,10 +3935,17 @@@ msgid "Slower (fine)
msgstr "Arafach (mymryn)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3795,10 -3795,10 +3958,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Dewis bysell frys i neidio i'r eitem nesaf yn y rhestr chwarae."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Blaenorol"
@@@ -3807,9 -3807,9 +3977,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "Dewis bysell frys i neidio i'r eitem blaenorol yn y rhestr chwarae."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4044,9 -4044,9 +4220,15 @@@ msgid "Select the key to decrease audi
msgstr "Dewiswch bysell i ostwng uchder y sain."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Tewi"
@@@ -4460,7 -4460,7 +4642,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Ciplun"
@@@ -4659,12 -4659,12 +4845,21 @@@ msgstr "Lawrlwytho...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Diddymu"
@@@ -4781,15 -4781,15 +4976,27 @@@ msgstr "Arabeg
#: src/text/iso-639_def.h:46
msgid "Armenian"
++<<<<<<< HEAD
+msgstr "Armeneg"
+
+#: src/text/iso-639_def.h:47
+msgid "Assamese"
+msgstr "Asameg"
+
+#: src/text/iso-639_def.h:48
+msgid "Avestan"
+msgstr "Afesteg"
++=======
+ msgstr ""
+
+ #: src/text/iso-639_def.h:47
+ msgid "Assamese"
+ msgstr ""
+
+ #: src/text/iso-639_def.h:48
+ msgid "Avestan"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:49
msgid "Aymara"
@@@ -4805,7 -4805,7 +5012,11 @@@ msgstr "
#: src/text/iso-639_def.h:52
msgid "Basque"
++<<<<<<< HEAD
+msgstr "Basgeg"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:53
msgid "Belarusian"
@@@ -5057,7 -5057,7 +5268,11 @@@ msgstr "
#: src/text/iso-639_def.h:115
msgid "Kurdish"
++<<<<<<< HEAD
+msgstr "Cwrdeg"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:116
msgid "Lao"
@@@ -5401,7 -5401,7 +5616,11 @@@ msgstr "Xhosa
#: src/text/iso-639_def.h:202
msgid "Yiddish"
++<<<<<<< HEAD
+msgstr "Iddew-Almaeneg"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:203
msgid "Yoruba"
@@@ -5433,7 -5433,7 +5652,11 @@@ msgstr "Tocio
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Cymhareb agwedd"
@@@ -6039,7 -6039,7 +6262,11 @@@ msgstr "
#: modules/access/dtv/access.c:45
msgid "Do not demultiplex"
++<<<<<<< HEAD
+msgstr "Peidio â dadamlblecsu"
++=======
+ msgstr "Peidio â datblecsu"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:47
msgid ""
@@@ -6995,7 -6995,7 +7222,11 @@@ msgstr "Mewnbwn SDI
#: modules/access/linsys/linsys_sdi.c:113
msgid "SDI Demux"
++<<<<<<< HEAD
+msgstr "Dadamlblecsio SDI"
++=======
+ msgstr "Datblecsiad SDI"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/live555.cpp:78
msgid "Kasenna RTSP dialect"
@@@ -7054,7 -7054,7 +7285,11 @@@ msgstr "
#: modules/access/live555.cpp:110
msgid "RTSP/RTP access and demux"
++<<<<<<< HEAD
+msgstr "Cyrchu a dadamlblecsio RTSP/RTP"
++=======
+ msgstr "Cyrchu a datblecsu RTSP/RTP"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/live555.cpp:115 modules/access/live555.cpp:116
#: modules/gui/macosx/simple_prefs.m:343
@@@ -7435,7 -7435,7 +7670,11 @@@ msgstr "
#: modules/access_output/shout.c:101
msgid "Ogg Vorbis Quality"
++<<<<<<< HEAD
+msgstr "Ansawdd Ogg Vorbis"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/shout.c:102
msgid "Ogg Vorbis Quality information of the transcoded stream. "
@@@ -7751,7 -7751,7 +7990,11 @@@ msgstr "Mewnbwn Sgrin
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Sgrin"
@@@ -8483,7 -8483,7 +8726,11 @@@ msgstr "
msgid "Volume Set"
msgstr "Gosod Uchder Sain"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -8682,7 -8682,7 +8929,11 @@@ msgstr "
#: modules/access/vnc.c:63
msgid "Image quality"
++<<<<<<< HEAD
+msgstr "Ansawdd delwedd"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:64
msgid "Image quality 1 to 9 (max)"
@@@ -8690,11 -8690,11 +8941,19 @@@ msgstr "
#: modules/access/vnc.c:78
msgid "VNC"
++<<<<<<< HEAD
+msgstr "VNC"
+
+#: modules/access/vnc.c:82
+msgid "VNC client access"
+msgstr "Cyrchiad cleient VNC"
++=======
+ msgstr ""
+
+ #: modules/access/vnc.c:82
+ msgid "VNC client access"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/zip/zipstream.c:38
msgid "Media in Zip"
@@@ -9309,55 -9309,55 +9568,107 @@@ msgstr "
#: modules/audio_filter/param_eq.c:58
msgid "Low freq (Hz)"
++<<<<<<< HEAD
+msgstr "Amledd isel (Hz)"
+
+#: modules/audio_filter/param_eq.c:60
+msgid "Low freq gain (dB)"
+msgstr "Cynnydd amledd isel (dB)"
+
+#: modules/audio_filter/param_eq.c:61
+msgid "High freq (Hz)"
+msgstr "Amledd uchel (Hz)"
+
+#: modules/audio_filter/param_eq.c:63
+msgid "High freq gain (dB)"
+msgstr "Cynnydd amledd uchel (dB)"
+
+#: modules/audio_filter/param_eq.c:64
+msgid "Freq 1 (Hz)"
+msgstr "Amledd 1 (Hz)"
+
+#: modules/audio_filter/param_eq.c:66
+msgid "Freq 1 gain (dB)"
+msgstr "Cynnydd amledd 1 (dB)"
+
+#: modules/audio_filter/param_eq.c:68
+msgid "Freq 1 Q"
+msgstr "Q amledd 1"
+
+#: modules/audio_filter/param_eq.c:69
+msgid "Freq 2 (Hz)"
+msgstr "Amledd 2 (Hz)"
+
+#: modules/audio_filter/param_eq.c:71
+msgid "Freq 2 gain (dB)"
+msgstr "Cynnydd amledd 2 (dB)"
+
+#: modules/audio_filter/param_eq.c:73
+msgid "Freq 2 Q"
+msgstr "Q amledd 2"
+
+#: modules/audio_filter/param_eq.c:74
+msgid "Freq 3 (Hz)"
+msgstr "Amledd 3 (Hz)"
+
+#: modules/audio_filter/param_eq.c:76
+msgid "Freq 3 gain (dB)"
+msgstr "Cynnydd amledd 3 (dB)"
+
+#: modules/audio_filter/param_eq.c:78
+msgid "Freq 3 Q"
+msgstr "Q amledd 3"
++=======
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:60
+ msgid "Low freq gain (dB)"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:61
+ msgid "High freq (Hz)"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:63
+ msgid "High freq gain (dB)"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:64
+ msgid "Freq 1 (Hz)"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:66
+ msgid "Freq 1 gain (dB)"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:68
+ msgid "Freq 1 Q"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:69
+ msgid "Freq 2 (Hz)"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:71
+ msgid "Freq 2 gain (dB)"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:73
+ msgid "Freq 2 Q"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:74
+ msgid "Freq 3 (Hz)"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:76
+ msgid "Freq 3 gain (dB)"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:78
+ msgid "Freq 3 Q"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/resampler/bandlimited.c:89
msgid "Audio filter for band-limited interpolation resampling"
@@@ -9365,7 -9365,7 +9676,11 @@@ msgstr "
#: modules/audio_filter/resampler/speex.c:32
msgid "Resampling quality"
++<<<<<<< HEAD
+msgstr "Ansawdd ailsamplu"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/resampler/speex.c:34
msgid "Resampling quality (0 = worst and fastest, 10 = best and slowest)."
@@@ -9598,7 -9598,7 +9913,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "Allbwn sain ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9629,7 -9629,7 +9948,11 @@@ msgstr "Allbwn sain AudioQueue (iOS / M
msgid "Android AudioTrack audio output"
msgstr "Allbwn sain AudioTrack Android"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "Allbwn AudioUnit ar gyfer iOS"
@@@ -9637,30 -9637,30 +9960,54 @@@
msgid "Last audio device"
msgstr "Dyfais sain diwethaf"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Allbwn AudioUnit HAL"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Allbwn AudioUnit HAL"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Dyw'r dyfais sain heb ei ffurfweddu"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Dyw'r dyfais sain heb ei ffurfweddu"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Dyfais Allbwn Sain y System"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Dyfais Allbwn Sain y System"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Allbwn wedi'i Amgodio)"
@@@ -10835,46 -10835,46 +11182,74 @@@ msgstr "Cysgod
msgid "Outline"
msgstr "Amlinelliad"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Du"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Llwyd"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Arian"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Gwyn"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Marŵn"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Coch"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10882,61 -10882,61 +11257,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Melyn"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Olewydden"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Gwyrdd"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Leim"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Piws"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Glas"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11066,7 -11066,7 +11477,11 @@@ msgstr "Isdeitlau (uwch)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -11133,8 -11133,9 +11548,14 @@@ msgid "PNG video decoder
msgstr "Datgodiwr fideo PNG"
#: modules/codec/qsv.c:56
++<<<<<<< HEAD
+msgid "Enable software mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Enable software mode"
+ msgstr "Galluogi modd cefndir bwrdd gwaith"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:57
msgid ""
@@@ -11143,8 -11144,9 +11564,14 @@@
msgstr ""
#: modules/codec/qsv.c:61
++<<<<<<< HEAD
+msgid "Codec Profile"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Codec Profile"
+ msgstr "Dewis Proffil"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:63
msgid ""
@@@ -11154,8 -11156,9 +11581,14 @@@
msgstr ""
#: modules/codec/qsv.c:67
++<<<<<<< HEAD
+msgid "Codec Level"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Codec Level"
+ msgstr "Enw'r codec"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:69
msgid ""
@@@ -11196,8 -11199,9 +11629,14 @@@ msgid "
msgstr ""
#: modules/codec/qsv.c:90
++<<<<<<< HEAD
+msgid "IDR interval"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "IDR interval"
+ msgstr "Datgydblethu"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:92
msgid ""
@@@ -11220,8 -11224,9 +11659,14 @@@ msgid "
msgstr ""
#: modules/codec/qsv.c:105
++<<<<<<< HEAD
+msgid "Quantization parameter"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Quantization parameter"
+ msgstr "Paramedrau amgodio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:106
msgid ""
@@@ -11261,8 -11266,9 +11706,14 @@@ msgid "
msgstr ""
#: modules/codec/qsv.c:122
++<<<<<<< HEAD
+msgid "Maximum Bitrate"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Maximum Bitrate"
+ msgstr "Didradd Uchaf"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:123
msgid ""
@@@ -11294,8 -11300,9 +11745,14 @@@ msgid "
msgstr ""
#: modules/codec/qsv.c:139
++<<<<<<< HEAD
+msgid "Number of slices per frame"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Number of slices per frame"
+ msgstr "Nifer o segmentau"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:140
msgid ""
@@@ -11309,8 -11316,9 +11766,14 @@@ msgid "Number of reference frames
msgstr ""
#: modules/codec/qsv.c:148
++<<<<<<< HEAD
+msgid "Number of parallel operations"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Number of parallel operations"
+ msgstr "Nifer o rhesi pos"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:149
msgid ""
@@@ -11960,7 -11968,7 +12423,11 @@@ msgstr "Datgodiwr isdeitlau testun
#: modules/codec/subsdec.c:295 modules/demux/avi/avi.c:96
msgctxt "GetACP"
msgid "CP1252"
++<<<<<<< HEAD
+msgstr "CP1252"
++=======
+ msgstr "CP1252 [ GetACP ]"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsusf.c:46
msgid "USFSubs"
@@@ -12861,10 -12869,10 +13328,17 @@@ msgid "Fast
msgstr "Cyflym"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Arferol"
@@@ -12971,8 -12979,8 +13445,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13308,9 -13316,9 +13787,15 @@@ msgstr "
msgid "Opening"
msgstr "Agoriad"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Seibio"
@@@ -13636,17 -13644,17 +14121,29 @@@ msgstr "| didradd mewnbwn : %6.0f
#: modules/control/rc.c:1752 modules/gui/ncurses.c:811
#, c-format
msgid "| demux bytes read : %8.0f KiB"
++<<<<<<< HEAD
+msgstr "| beitiau dadamlblecsio wedi'u darllen : %8.0f KiB"
++=======
+ msgstr "| beitiau datblecsu wedi'u darllen : %8.0f KiB"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:1754 modules/gui/ncurses.c:813
#, c-format
msgid "| demux bitrate : %6.0f kb/s"
++<<<<<<< HEAD
+msgstr "| didradd dadamlblecsio : %6.0f kb/e"
++=======
+ msgstr "| didradd datblecsu : %6.0f kb/e"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:1756
#, c-format
msgid "| demux corrupted : %5<PRIi64>"
++<<<<<<< HEAD
+msgstr "| dadamlblecsiad wedi'i ddifrodi : %5<PRIi64>"
++=======
+ msgstr "| datblecsiad wedi'i difrodi : %5<PRIi64>"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:1758
#, c-format
@@@ -13712,15 -13720,15 +14209,27 @@@ msgstr "| didradd anfon : %6.0f kb/e
#: modules/demux/aiff.c:49
msgid "AIFF demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd AIFF"
+
+#: modules/demux/asf/asf.c:56
+msgid "ASF/WMV demuxer"
+msgstr "Dadamlblecsydd ASF/WMV"
+
+#: modules/demux/asf/asf.c:180
+msgid "Could not demux ASF stream"
+msgstr "Methwyd dadamlblecsu'r ffrwd ASF"
++=======
+ msgstr "Datblecsydd AIFF"
+
+ #: modules/demux/asf/asf.c:56
+ msgid "ASF/WMV demuxer"
+ msgstr "Datblecsydd ASF/WMV"
+
+ #: modules/demux/asf/asf.c:180
+ msgid "Could not demux ASF stream"
+ msgstr "Methwyd datblecsu'r ffrwd ASF"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/asf/asf.c:181
msgid "VLC failed to load the ASF header."
@@@ -13728,11 -13736,11 +14237,19 @@@ msgstr "
#: modules/demux/au.c:50
msgid "AU demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd AU"
+
+#: modules/demux/avformat/avformat.c:41
+msgid "Avformat demuxer"
+msgstr "Dadamlblecsydd AVformat"
++=======
+ msgstr "Datblecsydd AU"
+
+ #: modules/demux/avformat/avformat.c:41
+ msgid "Avformat demuxer"
+ msgstr "Datblecsydd avformat"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/avformat/avformat.c:42
msgid "Avformat"
@@@ -13740,19 -13748,19 +14257,35 @@@ msgstr "Avformat
#: modules/demux/avformat/avformat.c:55
msgid "Avformat muxer"
++<<<<<<< HEAD
+msgstr "Amlblecsydd AVformat"
+
+#: modules/demux/avformat/avformat.c:57 modules/stream_out/rtp.c:87
+msgid "Muxer"
+msgstr "Amlblecsydd"
+
+#: modules/demux/avformat/avformat.h:35
+msgid "Avformat mux"
+msgstr "Amlblecsio AVformat"
+
+#: modules/demux/avformat/avformat.h:36
+msgid "Force use of a specific avformat muxer."
+msgstr "Gorfodi defnydd amlblecsydd AVformat penodol"
++=======
+ msgstr "Plecsydd Avformat"
+
+ #: modules/demux/avformat/avformat.c:57 modules/stream_out/rtp.c:87
+ msgid "Muxer"
+ msgstr "Plecsydd"
+
+ #: modules/demux/avformat/avformat.h:35
+ msgid "Avformat mux"
+ msgstr "Plecs avformat"
+
+ #: modules/demux/avformat/avformat.h:36
+ msgid "Force use of a specific avformat muxer."
+ msgstr "Gorfodi defnydd plecsydd avformat penodol"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/avformat/avformat.h:37
msgid "Format name"
@@@ -13794,7 -13802,7 +14327,11 @@@ msgstr "Cywiro pan bo angen
#: modules/demux/avi/avi.c:72
msgid "AVI demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd AVI"
++=======
+ msgstr "Datblecsydd AVI"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/avi/avi.c:673
msgid "Broken or missing AVI Index"
@@@ -13828,7 -13836,7 +14365,11 @@@ msgstr "
#: modules/demux/cdg.c:43
msgid "CDG demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd CDG"
++=======
+ msgstr "Datblecsydd CDG"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/demuxdump.c:32
msgid "Dump module"
@@@ -13860,11 -13868,11 +14401,19 @@@ msgstr "Gwerth i addasu dts gan
#: modules/demux/dirac.c:54
msgid "Dirac video demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd fideo Dirac"
+
+#: modules/demux/flac.c:50
+msgid "FLAC demuxer"
+msgstr "Dadamlblecsydd FLAC"
++=======
+ msgstr "Datblecsydd fideo Dirac"
+
+ #: modules/demux/flac.c:50
+ msgid "FLAC demuxer"
+ msgstr "Datblecsydd FLAC"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/image.c:44
msgid "ES ID"
@@@ -13876,7 -13884,7 +14425,11 @@@ msgstr "Datgodio
#: modules/demux/image.c:54
msgid "Decode at the demuxer stage"
++<<<<<<< HEAD
+msgstr "Datgodio yn y cam dadamlblecsu"
++=======
+ msgstr "Datgodio yn y cam datblecsu"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/image.c:56
msgid "Forced chroma"
@@@ -13914,7 -13922,7 +14467,11 @@@ msgstr "
#: modules/demux/image.c:76
msgid "Image demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd delweddau"
++=======
+ msgstr "Datblecsydd delweddau"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/image.c:77
msgid "Image"
@@@ -13937,7 -13945,7 +14494,11 @@@ msgstr "
#: modules/demux/mjpeg.c:53
msgid "M-JPEG camera demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd camera M-JPEG"
++=======
+ msgstr "Datblecsydd camera M-JPEG"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mkv/chapter_command.cpp:143
msgid "--- DVD Menu"
@@@ -13957,7 -13965,7 +14518,11 @@@ msgstr "----- Teitl
#: modules/demux/mkv/mkv.cpp:47
msgid "Matroska stream demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd ffrwd Matroska"
++=======
+ msgstr "Datblecsydd ffrwd Matroska"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mkv/mkv.cpp:54
msgid "Respect ordered chapters"
@@@ -14042,7 -14050,7 +14607,11 @@@ msgstr "
#: modules/demux/mod.c:74
msgid "MOD demuxer (libmodplug)"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd MOD (libmodplug)"
++=======
+ msgstr "Datblecsydd MOD (libmodplug)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mod.c:85
msgid "Reverberation level"
@@@ -14628,7 -14636,7 +15197,11 @@@ msgstr "
#: modules/demux/mp4/mp4.c:52
msgid "MP4 stream demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd ffrwd MP4"
++=======
+ msgstr "Datblecsydd ffrwd MP4"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:53
msgid "MP4"
@@@ -14767,7 -14775,7 +15340,11 @@@ msgstr "Uwch Gynhyrchydd
#: modules/demux/mpc.c:62
msgid "MusePack demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd MusePack"
++=======
+ msgstr "Datblecsydd MusePack"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mpeg/es.c:51
msgid ""
@@@ -14793,11 -14801,11 +15370,19 @@@ msgstr "Cyflymder fframiau ar gyfer y f
#: modules/demux/mpeg/h264.c:51
msgid "H264 video demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd fideo H264"
+
+#: modules/demux/mpeg/mpgv.c:46
+msgid "MPEG-I/II video demuxer"
+msgstr "Dadamlblecsydd fideo MPEG-I/II"
++=======
+ msgstr "Datblecsydd fideo H264"
+
+ #: modules/demux/mpeg/mpgv.c:46
+ msgid "MPEG-I/II video demuxer"
+ msgstr "Datblecsydd fideo MPEG-I/II"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/nsc.c:47
msgid "Windows Media NSC metademux"
@@@ -14805,15 -14813,15 +15390,27 @@@ msgstr "
#: modules/demux/nsv.c:49
msgid "NullSoft demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd NullSoft"
+
+#: modules/demux/nuv.c:49
+msgid "Nuv demuxer"
+msgstr "Dadamlblecsydd Nuv"
+
+#: modules/demux/ogg.c:55
+msgid "OGG demuxer"
+msgstr "Dadamlblecsydd OGG"
++=======
+ msgstr "Datblecsydd NullSoft"
+
+ #: modules/demux/nuv.c:49
+ msgid "Nuv demuxer"
+ msgstr "Datblecsydd Nuv"
+
+ #: modules/demux/ogg.c:55
+ msgid "OGG demuxer"
+ msgstr "Datblecsydd OGG"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/playlist/gvp.c:208
msgid "Google Video"
@@@ -14887,7 -14895,7 +15484,11 @@@ msgstr "Mewnforiwr rhestr chwarae Googl
#: modules/demux/playlist/playlist.c:129
msgid "Dummy IFO demux"
++<<<<<<< HEAD
+msgstr "Dadamlblecsio Dummy IFO"
++=======
+ msgstr "Datblecsiad Dummy IFO"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/playlist/playlist.c:134
msgid "iTunes Music Library importer"
@@@ -14984,7 -14992,7 +15585,11 @@@ msgstr "
#: modules/demux/ps.c:56 modules/demux/ps.c:69
msgid "MPEG-PS demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd MPEG-PS"
++=======
+ msgstr "Datblecsydd MPEG-PS"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/ps.c:57
msgid "PS"
@@@ -14992,7 -15000,7 +15597,11 @@@ msgstr "PS
#: modules/demux/pva.c:43
msgid "PVA demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd PVA"
++=======
+ msgstr "Datblecsydd PVA"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/rawaud.c:44
msgid "Audio sample rate in Hertz. Default is 48000 Hz."
@@@ -15027,7 -15035,7 +15636,11 @@@ msgstr "
#: modules/demux/rawaud.c:64
msgid "Raw audio demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd sain craidd"
++=======
+ msgstr "Datblecsydd sain craidd"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/rawdv.c:43
msgid ""
@@@ -15036,7 -15044,7 +15649,11 @@@ msgstr "
#: modules/demux/rawdv.c:51
msgid "DV (Digital Video) demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd FD (Fideo Digidol)"
++=======
+ msgstr "Datblecsydd FD (Fideo Digidol)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/rawvid.c:45
msgid ""
@@@ -15064,19 -15072,19 +15681,35 @@@ msgstr "
#: modules/demux/rawvid.c:65
msgid "Raw video demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd fideo craidd"
+
+#: modules/demux/real.c:70
+msgid "Real demuxer"
+msgstr "Dadamlblecsydd Real"
+
+#: modules/demux/sid.cpp:56
+msgid "C64 sid demuxer"
+msgstr "Dadamlblecsydd C64 sid"
+
+#: modules/demux/smf.c:41
+msgid "SMF demuxer"
+msgstr "Dadamlblecsydd SMF"
++=======
+ msgstr "Datblecsydd fideo craidd"
+
+ #: modules/demux/real.c:70
+ msgid "Real demuxer"
+ msgstr "Datblecsydd Real"
+
+ #: modules/demux/sid.cpp:56
+ msgid "C64 sid demuxer"
+ msgstr "Datblecsydd C64 sid"
+
+ #: modules/demux/smf.c:41
+ msgid "SMF demuxer"
+ msgstr "Datblecsydd SMF"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/stl.c:43
msgid "EBU STL subtitles parser"
@@@ -15200,10 -15208,10 +15833,17 @@@ msgstr "
#: modules/demux/ts.c:137
msgid "MPEG Transport Stream demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd MPET Transport Sream (TS)"
+
+#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ msgstr "Datblecsydd MPET Transport Sream (TS)"
+
+ #: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -15241,7 -15249,7 +15881,11 @@@ msgstr "
#: modules/demux/tta.c:45
msgid "TTA demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd TTA"
++=======
+ msgstr "Datblecsydd TTA"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/ty.c:59
msgid "TY"
@@@ -15249,7 -15257,7 +15893,11 @@@ msgstr "
#: modules/demux/ty.c:60
msgid "TY Stream audio/video demux"
++<<<<<<< HEAD
+msgstr "Dadamlblecsio sain/fideo TY Stream"
++=======
+ msgstr "Datblecsiad sain/fideo TY Stream"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/ty.c:776
msgid "Closed captions 1"
@@@ -15273,7 -15281,7 +15921,11 @@@ msgstr "Cyflymder fframiau ar gyfer ffr
#: modules/demux/vc1.c:50
msgid "VC1 video demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd fideo VC1"
++=======
+ msgstr "Datblecsydd fideo VC1"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/vobsub.c:49
msgid "Vobsub subtitles parser"
@@@ -15281,15 -15289,15 +15933,27 @@@ msgstr "
#: modules/demux/voc.c:43
msgid "VOC demuxer"
++<<<<<<< HEAD
+msgstr "Dadamlblecsydd VOC"
+
+#: modules/demux/wav.c:45
+msgid "WAV demuxer"
+msgstr "Dadamlblecsydd WAV"
+
+#: modules/demux/xa.c:43
+msgid "XA demuxer"
+msgstr "Dadamlblecsydd XA"
++=======
+ msgstr "Datblecsydd VOC"
+
+ #: modules/demux/wav.c:45
+ msgid "WAV demuxer"
+ msgstr "Datblecsydd WAV"
+
+ #: modules/demux/xa.c:43
+ msgid "XA demuxer"
+ msgstr "Datblecsydd XA"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/xiph_metadata.h:46
msgid "Closed captions"
@@@ -15391,7 -15399,7 +16055,11 @@@ msgid "VLC media player Help
msgstr "Cymorth chwaraewr VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15479,9 -15487,9 +16147,15 @@@ msgstr "Enw ar gyfer y proffil newydd:
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Cadw"
@@@ -15620,7 -15628,7 +16294,11 @@@ msgstr "Ni ddarganfuwyd mewnbwn
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Neidio i Amser"
@@@ -15640,7 -15648,7 +16318,11 @@@ msgstr "
msgid "Backward"
msgstr "Nôl"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15650,7 -15658,7 +16332,11 @@@ msgstr "
msgid "Forward"
msgstr "Ymlaen"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15670,85 -15678,85 +16356,156 @@@ msgstr "Toglo modd sgrin lawn
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "Cliciwch a daliwch lawr i neidio nôl drwy'r eitem sy'n chwarae."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "Cliciwch a daliwch i lawr i neidio ymlaen drwy'r eitem sy'n chwarae."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Dangos/Cuddio'r Rhestr Chwarae"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Dangos/Cuddio'r Rhestr Chwarae"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Ailchwarae"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Cymysgu"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Cymysgu"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Tewi neu dad-tewi'r sain wrth ei glicio"
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Sain Llawn"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Cliciwch i chwarae gyda'r sain uchaf."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Tewi neu dad-tewi'r sain wrth ei glicio"
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Sain Llawn"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Cliciwch i chwarae gyda'r sain uchaf."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Effeithiau"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
"Dangos panel effeithiau sain sy'n cynnwys cyfartalydd a hidlyddion eraill"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Mynd i'r eitem flaenorol yn y rhestr chwarae"
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Mynd i'r eitem nesaf yn y rhestr chwarae"
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Mynd i'r eitem flaenorol yn y rhestr chwarae"
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Mynd i'r eitem nesaf yn y rhestr chwarae"
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "Cliciwch a daliwch lawr i neidio nôl drwy'r eitem sy'n chwarae."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "Cliciwch a daliwch i lawr i neidio ymlaen drwy'r eitem sy'n chwarae."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Trawsnewid a Ffrydio"
@@@ -15784,7 -15792,7 +16541,11 @@@ msgstr "Nodwch gyrchfan yr allbwn
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15969,8 -15977,8 +16730,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Dewisedig"
@@@ -16070,36 -16078,36 +16836,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "Peidio gofyn eto"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "Chwarae gyda VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "Chwarae gyda VLC"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Parhau"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16270,7 -16278,7 +17068,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Cloi'r Cymhareb Agwedd"
@@@ -16403,7 -16411,7 +17205,11 @@@ msgstr "Cuddio VLC
msgid "Hide Others"
msgstr "Cuddio Eraill"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Dangos y Cyfan"
@@@ -16488,15 -16496,15 +17294,27 @@@ msgstr "Cydamseriad Traciau
msgid "A→B Loop"
msgstr "Cylchrediad A→B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Cau ar ol Chwarae"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Cam Ymlaen"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Cau ar ol Chwarae"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Cam Ymlaen"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Cam yn Ôl"
@@@ -16512,30 -16520,30 +17330,56 @@@ msgstr "Sain i Lawr
msgid "Audio Device"
msgstr "Dyfais Sain"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Hanner y Maint"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Maint Arferol"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dwywaith y Maint"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Ffitio i'r Sgrin"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Hanner y Maint"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Maint Arferol"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dwywaith y Maint"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Ffitio i'r Sgrin"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Dyfais Fideo Sgrin Lawn"
@@@ -16544,7 -16552,7 +17388,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Ychwanegu Ffeil Isdeitlau..."
@@@ -16775,7 -16783,7 +17623,11 @@@ msgid "Play another media synchronously
msgstr "Chwarae eitem arall ar yr un pryd"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Dewis..."
@@@ -16839,7 -16847,7 +17691,11 @@@ msgstr "
#: modules/gui/macosx/open.m:192
msgid "Open RTP/UDP Stream"
++<<<<<<< HEAD
+msgstr "Agor Ffrwd RTP/UDP"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:194
#: share/lua/http/dialogs/stream_config_window.html:24
@@@ -16946,7 -16954,7 +17802,11 @@@ msgstr "Ff/e
msgid "Subtitle encoding"
msgstr "Amgodiad isdeitlau"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Maint ffont"
@@@ -17124,7 -17132,7 +17984,11 @@@ msgstr "Didradd mewnbwn
#: modules/gui/macosx/playlistinfo.m:99
msgid "Demuxed"
++<<<<<<< HEAD
+msgstr "Dadamlblecswyd"
++=======
+ msgstr "Datblecswyd"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/playlistinfo.m:100
msgid "Stream bitrate"
@@@ -17175,12 -17183,12 +18039,20 @@@ msgstr "Gwall wrth gadw meta
msgid "VLC was unable to save the meta data."
msgstr "Ni allai VLC cadw'r metaddata."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Dewisiadau"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Ailosod y Cyfan"
@@@ -17293,7 -17301,7 +18165,11 @@@ msgstr "
#: modules/gui/macosx/simple_prefs.m:339
msgid "Codecs / Muxers"
++<<<<<<< HEAD
+msgstr "Codecs / Amlblecsyddion"
++=======
+ msgstr "Codecs / Plecswyr"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/simple_prefs.m:341
msgid "Hardware Acceleration"
@@@ -17357,130 -17365,125 +18233,238 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Seibio iTunes tra'n chwarae gyda VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Amgodiad Rhagosodedig"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Gosodiadau Arddangos"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Amgodiad Rhagosodedig"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Gosodiadau Arddangos"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Lliw ffont"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Ffont"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Iaith isdeitlau"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Iaith isdeitlau"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Iaith isdeitlau dewisol"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Galluogi Dangosiad ar y Sgrin (OSD)"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Galluogi Dangosiad ar y Sgrin (OSD)"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Anhryloywder"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Gorfodi ffont trwm"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Gorfodi ffont trwm"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Lliw yr amlinell"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Trwch yr amlinell"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Srin du mewn modd sgrin lawn"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Srin du mewn modd sgrin lawn"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Dangosiad"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Modiwl allbwn"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Cipluniau fideo"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Ffolder"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Fformat"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Rhagddodiad"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Rhifo'n dilyniannol"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Modiwl allbwn"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Cipluniau fideo"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Ffolder"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Fformat"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Rhagddodiad"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Rhifo'n dilyniannol"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Cuddni isaf"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Cuddni isel"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Cuddni uchel"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Cuddni Uchaf"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Ailosod Dewisiadau"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17493,35 -17496,35 +18477,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Dewis"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Dewis"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -17949,7 -17952,7 +18963,11 @@@ msgstr "
#: modules/gui/macosx/wizard.m:234
msgid "MPEG Program Stream"
++<<<<<<< HEAD
+msgstr "Ffrwd Rhaglen MPEG"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:235
msgid "MPEG Transport Stream"
@@@ -19022,7 -19025,7 +20040,11 @@@ msgstr "Maint o ddata'r eitem
#: modules/gui/qt4/components/info_panels.cpp:562
msgid "Demuxed data size"
++<<<<<<< HEAD
+msgstr "Maint o ddata a dadamlblecswyd"
++=======
+ msgstr "Maint o ddata a datblecswyd"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/info_panels.cpp:563
msgid "Content bitrate"
@@@ -19498,22 -19501,22 +20520,40 @@@ msgstr "Dileu'r proffil
msgid "Create a new profile"
msgstr "Creu proffil newydd"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Creu"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+"Dyw'r amlblecsydd hwn ddim yn cael ei darparu yn uniongyrchol gan VLC. Fe "
+"all fod ar goll."
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Enw Proffil ar Goll"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+ "Dyw'r plecsydd hwn ddim yn cael ei darparu yn uniongyrchol gan VLC. Fe all "
+ "fod ar goll."
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Enw Proffil ar Goll"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Rhaid rhoi enw ar gyfer y proffil."
@@@ -19742,7 -19745,7 +20782,11 @@@ msgstr "Polisi Mynediad Rhwydwaith
#: modules/gui/qt4/dialogs/firstrun.cpp:98
msgid "Automatically retrieve media info"
++<<<<<<< HEAD
+msgstr ""
++=======
+ msgstr "Cael gwybodaeth eitemau cyfryngol o'r we yn awtomatig"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:103
msgid "Regularly check for VLC updates"
@@@ -20962,7 -20965,7 +22006,11 @@@ msgstr "
#: share/lua/http/dialogs/stream_config_window.html:28
#: share/lua/http/dialogs/stream_window.html:87
msgid "Host"
++<<<<<<< HEAD
+msgstr "Gwesteiwr"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:62
msgid ""
@@@ -21379,7 -21382,7 +22427,11 @@@ msgstr "
#: modules/mux/asf.c:73
msgid "ASF muxer"
++<<<<<<< HEAD
+msgstr "Amlblecsydd ASF"
++=======
+ msgstr "Plecsydd ASF"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/mux/asf.c:565
msgid "Unknown Video"
@@@ -21387,7 -21390,7 +22439,11 @@@ msgstr "Fideo Anhysbys
#: modules/mux/avi.c:47
msgid "AVI muxer"
++<<<<<<< HEAD
+msgstr "Amlblecsydd AVI"
++=======
+ msgstr "Plecsydd AVI"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/mux/dummy.c:45
msgid "Dummy/Raw muxer"
@@@ -21406,7 -21409,7 +22462,11 @@@ msgstr "
#: modules/mux/mp4.c:58
msgid "MP4/MOV muxer"
++<<<<<<< HEAD
+msgstr "Amlblecsydd MP4/MOV"
++=======
+ msgstr "Plecsydd MP4/MOV"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/mux/mpeg/ps.c:48 modules/mux/mpeg/ts.c:148
msgid "DTS delay (ms)"
@@@ -21432,7 -21435,7 +22492,11 @@@ msgstr "Gosoda'r maint uchaf o PES i'w
#: modules/mux/mpeg/ps.c:64
msgid "PS muxer"
++<<<<<<< HEAD
+msgstr "Amlblecsydd PS"
++=======
+ msgstr "Plecsydd PS"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/mux/mpeg/ts.c:88
msgid "Video PID"
@@@ -21626,19 -21629,19 +22690,35 @@@ msgstr "
#: modules/mux/mpeg/ts.c:181
msgid "TS muxer (libdvbpsi)"
++<<<<<<< HEAD
+msgstr "Amlblecsydd TS (libdvbpsi)"
+
+#: modules/mux/mpjpeg.c:47
+msgid "Multipart JPEG muxer"
+msgstr "Amlblecsydd JPEG amlran"
+
+#: modules/mux/ogg.c:51
+msgid "Ogg/OGM muxer"
+msgstr "Amlblecsydd Ogg/OGM"
+
+#: modules/mux/wav.c:46
+msgid "WAV muxer"
+msgstr "Amlblecsydd WAV"
++=======
+ msgstr "Plecsydd TS (libdvbpsi)"
+
+ #: modules/mux/mpjpeg.c:47
+ msgid "Multipart JPEG muxer"
+ msgstr "Plecsydd JPEG amlran"
+
+ #: modules/mux/ogg.c:51
+ msgid "Ogg/OGM muxer"
+ msgstr "Plecsydd Ogg/OGM"
+
+ #: modules/mux/wav.c:46
+ msgid "WAV muxer"
+ msgstr "Plecsydd WAV"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/notify/growl.m:104
msgid "Growl Notification Plugin"
@@@ -22130,27 -22133,28 +23210,52 @@@ msgstr "
#: modules/stream_out/es.c:52 modules/stream_out/standard.c:44
msgid "Output muxer"
++<<<<<<< HEAD
+msgstr "AmlbPlecsydd yr allbwn"
+
+#: modules/stream_out/es.c:54
+msgid "This is the default muxer method that will be used."
+msgstr "Hwn yw'r dull amlblecsu rhagosodedig i'w ddefnyddio."
+
+#: modules/stream_out/es.c:55
+msgid "Audio output muxer"
+msgstr "Amlblecsydd allbwn sain"
+
+#: modules/stream_out/es.c:57
+msgid "This is the muxer that will be used for audio."
+msgstr "Hwn yw'r dull amlblecsu rhagosodedig i'w ddefnyddio ar gyfer sain."
+
+#: modules/stream_out/es.c:58
+msgid "Video output muxer"
+msgstr "Amlblecsydd allbwn fideo"
+
+#: modules/stream_out/es.c:60
+msgid "This is the muxer that will be used for video."
+msgstr "Hwn yw'r dull amlblecsu rhagosodedig i'w ddefnyddio ar gyfer fideo."
++=======
+ msgstr "Plecsydd yr allbwn"
+
+ #: modules/stream_out/es.c:54
+ msgid "This is the default muxer method that will be used."
+ msgstr "Hwn yw'r dull plecsydd rhagosodedig caiff ei ddefnyddio."
+
+ #: modules/stream_out/es.c:55
+ msgid "Audio output muxer"
+ msgstr "Plecsydd allbwn sain"
+
+ #: modules/stream_out/es.c:57
+ msgid "This is the muxer that will be used for audio."
+ msgstr "Hwn yw'r dull plecsydd rhagosodedig caiff ei ddefnyddio ar gyfer sain."
+
+ #: modules/stream_out/es.c:58
+ msgid "Video output muxer"
+ msgstr "Plecsydd allbwn fideo"
+
+ #: modules/stream_out/es.c:60
+ msgid "This is the muxer that will be used for video."
+ msgstr ""
+ "Hwn yw'r dull plecsydd rhagosodedig caiff ei ddefnyddio ar gyfer fideo."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/es.c:62
msgid "Output URL"
@@@ -22365,8 -22369,8 +23470,13 @@@ msgid "
"This allows you to specify the muxer used for the streaming output. Default "
"is to use no muxer (standard RTP stream)."
msgstr ""
++<<<<<<< HEAD
+"Mae'n bosib dewis yr amlblecsydd i'w ddefnyddio ar gyfer allbwn y ffrwd. Yn "
+"rhagosodedig, ni ddefnyddir amlblecsydd, ond ffrwd RTP safonol."
++=======
+ "Mae'n bosib dewis y plecsydd i'w ddefnyddio ar gyfer allbwn y ffrwd. Yn "
+ "rhagosodedig does dim defnydd plecsydd (ffrwd RTP safonol)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/rtp.c:92 modules/stream_out/standard.c:58
msgid "Session name"
@@@ -22463,7 -22467,7 +23573,11 @@@ msgstr "
#: modules/stream_out/rtp.c:134
msgid "RTP/RTCP multiplexing"
++<<<<<<< HEAD
+msgstr "Dadamlblecsio RTP/RTCP"
++=======
+ msgstr "Amlblecsu RTP/RTCP"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/rtp.c:136
msgid ""
@@@ -22635,7 -22639,7 +23749,11 @@@ msgstr "
#: modules/stream_out/standard.c:46
msgid "Muxer to use for the stream."
++<<<<<<< HEAD
+msgstr "Yr amlblecsydd i'w ddefnyddio ar gyfer y ffrwd"
++=======
+ msgstr "Y plecsydd i'w ddefnyddio ar gyfer y ffrwd"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/standard.c:47
#: share/lua/http/dialogs/create_stream.html:334
@@@ -22887,45 -22891,45 +24005,81 @@@ msgstr "Trawsgodio'r allbwn ffrwd
msgid "Overlays/Subtitles"
msgstr "Troshaenau/Isdeitlau"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Teulu ffont ar gyfer y ffont i'w ddefnyddio"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Ffeil ffont ar gyfer y ffont i'w ddefnyddio"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Maint y ffont mewn picseli"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Teulu ffont ar gyfer y ffont i'w ddefnyddio"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Ffeil ffont ar gyfer y ffont i'w ddefnyddio"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Maint y ffont mewn picseli"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Anhryloywder y testun"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Anhryloywder y testun"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Lliw rhagosodedig y testun"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22934,12 -22938,12 +24088,20 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Maint ffont perthynol"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -22948,81 -22952,81 +24110,153 @@@ msgstr "
"Hwn yw maint perthynol rhagosodedig y ffont i'w dangos ar y fideo. Os oes "
"maint union wedi ei osod, hwnnw caiff ei ddefnyddio a nid y maint perthynol. "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Anhryloywder y cefndir"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Lliw cefndir"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Anhryloywder yr amlinell"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Anhryloywder y cysgod"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Lliw y cysgod"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Ongl y cysgod"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Pellder y cysgod"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Anhryloywder y cefndir"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Lliw cefndir"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Anhryloywder yr amlinell"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Anhryloywder y cysgod"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Lliw y cysgod"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Ongl y cysgod"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Pellder y cysgod"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Llai"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Bach"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Mawr"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Mwy"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Main"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Trwchus"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Main"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Trwchus"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -25353,27 -25357,27 +26587,51 @@@ msgstr "Pos
#: modules/video_filter/remoteosd.c:70
msgid "VNC Host"
++<<<<<<< HEAD
+msgstr "Gwesteiwr VNC"
+
+#: modules/video_filter/remoteosd.c:72
+msgid "VNC hostname or IP address."
+msgstr "Enw gwesteiwr neu gyfeiriad IP VNC"
+
+#: modules/video_filter/remoteosd.c:74
+msgid "VNC Port"
+msgstr "Porth VNC"
+
+#: modules/video_filter/remoteosd.c:76
+msgid "VNC port number."
+msgstr "Rhif porth VNC."
+
+#: modules/video_filter/remoteosd.c:78
+msgid "VNC Password"
+msgstr "Cyfrinair VNC"
+
+#: modules/video_filter/remoteosd.c:80
+msgid "VNC password."
+msgstr "Cyfrinair VNC."
++=======
+ msgstr ""
+
+ #: modules/video_filter/remoteosd.c:72
+ msgid "VNC hostname or IP address."
+ msgstr ""
+
+ #: modules/video_filter/remoteosd.c:74
+ msgid "VNC Port"
+ msgstr ""
+
+ #: modules/video_filter/remoteosd.c:76
+ msgid "VNC port number."
+ msgstr ""
+
+ #: modules/video_filter/remoteosd.c:78
+ msgid "VNC Password"
+ msgstr ""
+
+ #: modules/video_filter/remoteosd.c:80
+ msgid "VNC password."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/remoteosd.c:82
msgid "VNC poll interval"
@@@ -26688,7 -26692,7 +27946,11 @@@ msgstr "Ff/e Fideo
#: share/lua/http/dialogs/create_stream.html:297
msgid "MUX options"
++<<<<<<< HEAD
+msgstr "Dewisiadau Amlblecsu"
++=======
+ msgstr "Dewisiadau MUX"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:303
msgid "Video scale"
@@@ -27324,8 -27328,9 +28586,14 @@@ msgid "Default caching policy
msgstr ""
#: modules/gui/qt4/ui/sprefs_interface.h:514
++<<<<<<< HEAD
+msgid "Menus language:"
+msgstr "Iaith rhyngwyneb:"
++=======
+ #, fuzzy
+ msgid "Menus language:"
+ msgstr "Iaith sain"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:515
msgid "Look and feel"
@@@ -27687,11 -27692,11 +28955,19 @@@ msgstr "Rheolydd Amser
#: modules/gui/qt4/ui/vlm.h:295
msgid "Mux Control"
++<<<<<<< HEAD
+msgstr "Rheoli Amlblecsio"
+
+#: modules/gui/qt4/ui/vlm.h:296
+msgid "Muxer:"
+msgstr "Amlblecsydd:"
++=======
+ msgstr "Rheolydd Amlblecs"
+
+ #: modules/gui/qt4/ui/vlm.h:296
+ msgid "Muxer:"
+ msgstr "Plecsydd:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:297
msgid "AAAA; "
@@@ -27701,6 -27706,12 +28977,15 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Rhestr Rheolwyr Cyfryngau"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Dangos Manylion"
+
+ #~ msgid "Add a subtitle file"
+ #~ msgstr "Ychwanegu ffeil isdeitlau"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "You can choose to disable some CPU accelerations here. Use with extreme "
#~ "care!"
@@@ -27951,14 -27962,6 +29236,17 @@@
#~ msgstr "00000; "
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Manylion Codec"
+
+#, fuzzy
+#~ msgid "Add a subtitle file"
+#~ msgstr "Defnyddio ffeil &isdeitlau"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Image colors inversion"
#~ msgstr "Gwrthdroad lliwiau"
@@@ -28050,7 -28053,7 +29338,11 @@@
#, fuzzy
#~ msgid "Audio output frequency (Hz)"
++<<<<<<< HEAD
+#~ msgstr "Amlblecsydd allbwn sain"
++=======
+ #~ msgstr "Plecsydd allbwn sain"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Audio visualizations "
@@@ -28130,7 -28133,7 +29422,11 @@@
#, fuzzy
#~ msgid "Load subtitles file:"
++<<<<<<< HEAD
+#~ msgstr "Defnyddio ffeil isdeitlau"
++=======
+ #~ msgstr "Ychwanegu ffeil isdeitlau"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Subtitles encoding"
@@@ -28240,11 -28243,11 +29536,19 @@@
#, fuzzy
#~ msgid " demux bytes read : %8.0f KiB"
++<<<<<<< HEAD
+#~ msgstr "| beitiau dadamlblecsio wedi'u darllen : %8.0f KiB"
+
+#, fuzzy
+#~ msgid " demux bitrate : %6.0f kb/s"
+#~ msgstr "| didradd dadamlblecsio : %6.0f kb/e"
++=======
+ #~ msgstr "| beitiau datblecsu wedi'u darllen : %8.0f KiB"
+
+ #, fuzzy
+ #~ msgid " demux bitrate : %6.0f kb/s"
+ #~ msgstr "| didradd datblecsu : %6.0f kb/e"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid " [Video Decoding]"
@@@ -28452,7 -28455,7 +29756,11 @@@
#, fuzzy
#~ msgid "MUX Options"
++<<<<<<< HEAD
+#~ msgstr "Dewisiadau Amlblecsu"
++=======
+ #~ msgstr "Dewisiadau MUX"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Video Scale"
@@@ -28520,7 -28523,7 +29828,11 @@@
#, fuzzy
#~ msgid "Add a subtitles file"
++<<<<<<< HEAD
+#~ msgstr "Defnyddio ffeil &isdeitlau"
++=======
+ #~ msgstr "Ychwanegu ffeil isdeitlau"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Use a sub&titles file"
diff --combined po/da.po
index e630029,169cf58..2e8eb0c
--- a/po/da.po
+++ b/po/da.po
@@@ -3,7 -3,6 +3,10 @@@
# This file is distributed under the same license as the VLC package.
#
# Translators:
++<<<<<<< HEAD
+# nrbbi <nrbbiyoutube at gmail.com>, 2013
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# Aputsiaĸ Niels Janussen <aj at isit.gl>, 2013
# bbuullll33rr <madsrbojesen at gmail.com>, 2013
# Peter Jespersen <flywheeldk at gmail.com>, 2013
@@@ -28,8 -27,8 +31,13 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-15 17:42+0000\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-10-25 04:00+0000\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Last-Translator: Aputsiaĸ Niels Janussen <aj at isit.gl>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/vlc-trans/"
"language/da/)\n"
@@@ -157,7 -156,7 +165,11 @@@ msgstr "Diverse lydindstillinger og -mo
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -497,7 -496,7 +509,11 @@@ msgstr "GÃ¥ til specifikt &tidspunkt
#: include/vlc_intf_strings.h:59
msgid "Custom &Bookmarks"
++<<<<<<< HEAD
+msgstr "Brugerdefinerede &bogmærker"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:60
msgid "&VLM Configuration"
@@@ -508,10 -507,10 +524,17 @@@ msgid "&About
msgstr "&Om"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -550,17 -549,17 +573,29 @@@ msgid "Save...
msgstr "Gem..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Gentag alle"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Gentag én"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -667,7 -666,7 +702,11 @@@ msgstr "Det maksimale antal af filtre (
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Deaktivér"
@@@ -1368,20 -1367,20 +1407,36 @@@ msgstr "Billedfrekvens
msgid "Decoded format"
msgstr "Afkodet format"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Inddata kan ikke åbnes"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Inddata kan ikke åbnes"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC kan ikke åbne MRL \"%s\". Detaljer er skrevet i loggen."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC kan ikke genkende formatet på dette input"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC kan ikke genkende formatet på dette input"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1813,7 -1812,7 +1868,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1902,7 -1901,7 +1961,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Ingen"
@@@ -1932,7 -1931,7 +1995,11 @@@ msgstr "
"Her vælger du den videooutputmetode, VLC skal anvende. Som standard vælger "
"VLC automatisk den bedste tilgængelige metode."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Slå video til"
@@@ -2142,7 -2141,7 +2209,11 @@@ msgstr "
"denne egenskab som standard."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Altid øverst"
@@@ -2195,7 -2194,7 +2266,11 @@@ msgstr "Skjul musemarkøren og kontrol
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2204,7 -2203,7 +2279,11 @@@ msgstr "Deinterlace
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Deinterlace-modul"
@@@ -2262,7 -2261,7 +2341,11 @@@ msgstr "
"Spærrer for strømsparer-dæmonen under en afspilning for at forhindre, at "
"computeren går i dvale grundet inaktivitet."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Vinduesdekorationer"
@@@ -2463,7 -2462,7 +2546,11 @@@ msgstr "
"har firkantede pixler (1:1). Hvis du har en 16:9-skærm, skal du evt. ændre "
"dette til 4:3 for at bevare proportionerne."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Spring billeder over"
@@@ -2608,12 -2607,12 +2695,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2621,7 -2620,7 +2717,11 @@@ msgid "Default
msgstr "Standard"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2968,7 -2967,7 +3068,11 @@@ msgid "You can completely disable the s
msgstr "Du kan slå behandling af underbilleder helt fra."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3144,9 -3143,6 +3248,12 @@@ msgid "
"address (e.g. ::1 or 127.0.0.1) or a host name (e.g. localhost) to restrict "
"them to a specific network interface."
msgstr ""
++<<<<<<< HEAD
+"Som standard vil serveren lytte til enhver lokal IP-adresse. Angiv en IP-"
+"adresse (eks. ::1 eller 127.0.0.1) eller et værtsnavn (eks. localhost) for "
+"at begrænse dem til en specifik netværksgrænseflade."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:798
msgid "RTSP server address"
@@@ -3212,15 -3208,13 +3319,22 @@@ msgstr "
#: src/libvlc-module.c:835
msgid "HTTP/TLS Certificate Authority"
++<<<<<<< HEAD
+msgstr "HTTP/TLS-certifikatmyndighed"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:837
msgid ""
"This X.509 certificate file (PEM format) can optionally be used to "
"authenticate remote clients in TLS sessions."
msgstr ""
++<<<<<<< HEAD
+"Denne X.509-certifikatfil (PEM-format) kan, valgfrit anvendes til at "
+"godkende fjernklienter i TLS-sessioner."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:840
msgid "HTTP/TLS Certificate Revocation List"
@@@ -3456,8 -3450,6 +3570,11 @@@ msgid "
"This allow you to configure the initial caching amount for stream output "
"muxer. This value should be set in milliseconds."
msgstr ""
++<<<<<<< HEAD
+"Dette gør at du kan konfigurere startcacheværdien for outputstrøm-muxeren. "
+"Denne værdi skal være i millisekunder."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:957
msgid "Preferred packetizer list"
@@@ -3684,11 -3676,6 +3801,14 @@@ msgid "
"This option will allow you to play the file with the already running "
"instance or enqueue it."
msgstr ""
++<<<<<<< HEAD
+"Det kan nogle gange være nyttigt kun at tillade en enkelt kørende instans af "
+"VLC ad gangen, f.eks. hvis du har associeret VLC med nogle medietyper, og du "
+"ikke ønsker at åbne en ny instans af VLC, hver gang du åbner en fil i "
+"filhåndteringen. Med denne indstilling kan du afspille filen i den aktuelt "
+"kørende instans, eller du kan sætte den i kø."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1071
msgid ""
@@@ -3906,7 -3893,7 +4026,11 @@@ msgstr "
"Disse indstillinger er de globale VLC-tastaturgenveje, kendt som "
"genvejstaster."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignorér"
@@@ -3932,8 -3919,8 +4056,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4014,10 -4001,10 +4143,17 @@@ msgid "Slower (fine)
msgstr "Langsommere (en smule)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4032,10 -4019,10 +4168,17 @@@ msgstr "
"spillelisten."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Forrige"
@@@ -4046,9 -4033,9 +4189,15 @@@ msgstr "
"Vælg genvejstasten, der skal bruges for at springe til forrige element på "
"spillelisten"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4283,9 -4270,9 +4432,15 @@@ msgid "Select the key to decrease audi
msgstr "Vælg genvejstasten der skal formindske lydstyrken."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Lyd fra"
@@@ -4604,7 -4591,7 +4759,11 @@@ msgstr "Vis kontroller i fuldskærm
#: src/libvlc-module.c:1385
msgid "Boss key"
++<<<<<<< HEAD
+msgstr "Overnøgle"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1386
msgid "Hide the interface and pause playback."
@@@ -4703,7 -4690,7 +4862,11 @@@ msgstr "Gennemløb de tilgængelige lyd
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Snapshot"
@@@ -4908,12 -4895,12 +5071,21 @@@ msgstr "Henter ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Annullér"
@@@ -5679,7 -5666,7 +5851,11 @@@ msgstr "Beskær
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Udseendeforhold"
@@@ -5808,7 -5795,7 +5984,11 @@@ msgstr "
#: modules/access/bluray.c:275
msgid "Missing AACS configuration file!"
++<<<<<<< HEAD
+msgstr "Mangler en AACS-konfigurationsfil!"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:278
msgid "No valid processing key found in AACS config file."
@@@ -5900,15 -5887,13 +6080,22 @@@ msgstr "
#: modules/access/decklink.cpp:49
msgid "Desired input video mode"
++<<<<<<< HEAD
+msgstr "Ønskede inputtilstand for video"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/decklink.cpp:51
msgid ""
"Desired input video mode for DeckLink captures. This value should be a "
"FOURCC code in textual form, e.g. \"ntsc\"."
msgstr ""
++<<<<<<< HEAD
+"Ønskede inputtilstand for video til DeckLink-optagelser. Denne værdi bør "
+"være en FOURCC-kode i tekstform, eks. \"ntsc\"."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/decklink.cpp:55 modules/video_output/decklink.cpp:80
msgid "Audio connection"
@@@ -5931,8 -5916,6 +6118,11 @@@ msgstr "
msgid ""
"Audio sampling rate (in hertz) for DeckLink captures. 0 disables audio input."
msgstr ""
++<<<<<<< HEAD
+"Samplingsfrekvens for lyd (i hertz) til DeckLink-optagelser. 0 slår lydinput "
+"fra."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/decklink.cpp:66 modules/access/dshow/dshow.cpp:197
#: modules/video_output/decklink.cpp:90
@@@ -6270,13 -6253,12 +6460,20 @@@ msgstr "Ingen video- eller lydenhed er
#: modules/access/dshow/dshow.cpp:602
msgid "VLC cannot open ANY capture device. Check the error log for details."
++<<<<<<< HEAD
+msgstr "VLC kan ikke åbne NOGEN optageenhed. Se detaljer i fejlloggen."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:1049
msgid ""
"The device you selected cannot be used, because its type is not supported."
msgstr ""
++<<<<<<< HEAD
+"Enheden som du har valgt kan ikke anvendes, da denne type ikke understøttes."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:1102
#, c-format
@@@ -6365,15 -6347,13 +6562,22 @@@ msgstr "
#: modules/access/dtv/access.c:81
msgid "Symbol rate (bauds)"
++<<<<<<< HEAD
+msgstr "Symbolfrekvens (baud)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:83
msgid ""
"The symbol rate must be specified manually for some systems, notably DVB-C, "
"DVB-S and DVB-S2."
msgstr ""
++<<<<<<< HEAD
+"Symbolfrekvensen skal angives manuelt for nogle systemer, især DVB-C, DVB-S "
+"og DVB-S2."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:86
msgid "Spectrum inversion"
@@@ -6399,15 -6379,15 +6603,27 @@@ msgstr "
#: modules/access/dtv/access.c:97
msgid "Layer A code rate"
++<<<<<<< HEAD
+msgstr "Kodefrekvens for lag A"
+
+#: modules/access/dtv/access.c:98
+msgid "Layer B code rate"
+msgstr "Kodefrekvens for lag B"
+
+#: modules/access/dtv/access.c:99
+msgid "Layer C code rate"
+msgstr "Kodefrekvens for lag C"
++=======
+ msgstr ""
+
+ #: modules/access/dtv/access.c:98
+ msgid "Layer B code rate"
+ msgstr ""
+
+ #: modules/access/dtv/access.c:99
+ msgid "Layer C code rate"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:101
msgid "The code rate for Forward Error Correction can be specified."
@@@ -6459,15 -6439,15 +6675,27 @@@ msgstr "
#: modules/access/dtv/access.c:146
msgid "Layer A segments count"
++<<<<<<< HEAD
+msgstr "Segmentoptælling for lag A"
+
+#: modules/access/dtv/access.c:147
+msgid "Layer B segments count"
+msgstr "Segmentoptælling for lag B"
+
+#: modules/access/dtv/access.c:148
+msgid "Layer C segments count"
+msgstr "Segmentoptælling for lag C"
++=======
+ msgstr ""
+
+ #: modules/access/dtv/access.c:147
+ msgid "Layer B segments count"
+ msgstr ""
+
+ #: modules/access/dtv/access.c:148
+ msgid "Layer C segments count"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:150
msgid "Layer A time interleaving"
@@@ -6483,7 -6463,7 +6711,11 @@@ msgstr "
#: modules/access/dtv/access.c:154
msgid "Pilot"
++<<<<<<< HEAD
+msgstr "Pilot"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:156
msgid "Roll-off factor"
@@@ -6503,7 -6483,7 +6735,11 @@@ msgstr "0.25
#: modules/access/dtv/access.c:164
msgid "Transport stream ID"
++<<<<<<< HEAD
+msgstr "ID for transportstrøm"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:166
msgid "Polarization (Voltage)"
@@@ -6663,7 -6643,7 +6899,11 @@@ msgstr "Fysisk ATSC-kanal
#: modules/access/dtv/access.c:240
msgid "DTV"
++<<<<<<< HEAD
+msgstr "DTV"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:241
msgid "Digital Television and Radio"
@@@ -6671,27 -6651,27 +6911,51 @@@ msgstr "Digitalt fjernsyn og radio
#: modules/access/dtv/access.c:279
msgid "Terrestrial reception parameters"
++<<<<<<< HEAD
+msgstr "Parametre for jordbaseret modtagelse"
+
+#: modules/access/dtv/access.c:291
+msgid "DVB-T reception parameters"
+msgstr "Parametre for modtagelse af DVB-T"
+
+#: modules/access/dtv/access.c:307
+msgid "ISDB-T reception parameters"
+msgstr "Parametre for modtagelse af ISDB-T"
+
+#: modules/access/dtv/access.c:348
+msgid "Cable and satellite reception parameters"
+msgstr "Parametre for kabel- og satellitmodtagelse"
+
+#: modules/access/dtv/access.c:360
+msgid "DVB-S2 parameters"
+msgstr "Parametre for DVB-S2"
+
+#: modules/access/dtv/access.c:368
+msgid "ISDB-S parameters"
+msgstr "Parametre for ISDB-S"
++=======
+ msgstr ""
+
+ #: modules/access/dtv/access.c:291
+ msgid "DVB-T reception parameters"
+ msgstr ""
+
+ #: modules/access/dtv/access.c:307
+ msgid "ISDB-T reception parameters"
+ msgstr ""
+
+ #: modules/access/dtv/access.c:348
+ msgid "Cable and satellite reception parameters"
+ msgstr ""
+
+ #: modules/access/dtv/access.c:360
+ msgid "DVB-S2 parameters"
+ msgstr ""
+
+ #: modules/access/dtv/access.c:368
+ msgid "ISDB-S parameters"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:373
msgid "Satellite equipment control"
@@@ -6699,7 -6679,7 +6963,11 @@@ msgstr "Kontrol til satellitudstyr
#: modules/access/dtv/access.c:415
msgid "ATSC reception parameters"
++<<<<<<< HEAD
+msgstr "Parametre for ATSC-modtagelse"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:471
msgid "Digital broadcasting"
@@@ -6713,7 -6693,7 +6981,11 @@@ msgstr "
#: modules/access/dv.c:60
msgid "Digital Video (Firewire/ieee1394) input"
++<<<<<<< HEAD
+msgstr "Digitalt videoinput (Firewire/ieee1394)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dv.c:61
msgid "DV"
@@@ -7257,11 -7237,11 +7529,19 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:89
msgid "HD-SDI Input"
++<<<<<<< HEAD
+msgstr "HD-SDI-input"
+
+#: modules/access/linsys/linsys_hdsdi.c:90
+msgid "HD-SDI"
+msgstr "HD-SDI"
++=======
+ msgstr ""
+
+ #: modules/access/linsys/linsys_hdsdi.c:90
+ msgid "HD-SDI"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/linsys/linsys_sdi.c:79
msgid "Teletext configuration"
@@@ -7271,8 -7251,6 +7551,11 @@@ msgstr "Konfiguration af teletekst
msgid ""
"Allows you to set Teletext configuration (id=line1-lineN with both fields)."
msgstr ""
++<<<<<<< HEAD
+"Tillader dig at angive Teletext-konfiguration (id=line1-lineN med begge "
+"felter)."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/linsys/linsys_sdi.c:82
msgid "Teletext language"
@@@ -7280,11 -7258,11 +7563,19 @@@ msgstr "Sprog for teletekst
#: modules/access/linsys/linsys_sdi.c:84
msgid "Allows you to set Teletext language (page=lang/type,...)."
++<<<<<<< HEAD
+msgstr "Tillader dig at angive Teletext-sprog (page=lang/type,...)."
+
+#: modules/access/linsys/linsys_sdi.c:92
+msgid "SDI Input"
+msgstr "SDI-input"
++=======
+ msgstr ""
+
+ #: modules/access/linsys/linsys_sdi.c:92
+ msgid "SDI Input"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/linsys/linsys_sdi.c:113
msgid "SDI Demux"
@@@ -7300,9 -7278,6 +7591,12 @@@ msgid "
"parameter VLC will try this dialect, but then it cannot connect to normal "
"RTSP servers."
msgstr ""
++<<<<<<< HEAD
+"Kasenna-servere bruger en gammel dialekt af RTSP, som ikke følger "
+"standarden. Med denne parameter vil VLC prøve denne dialekt, men kan ikke "
+"forbinde til normale RTSP-servere."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/live555.cpp:83
msgid "WMServer RTSP dialect"
@@@ -7627,13 -7602,11 +7921,20 @@@ msgstr "
#: modules/access_output/livehttp.c:85
msgid "Full URL to put in index file"
++<<<<<<< HEAD
+msgstr "Komplet URL til placering i indeksfil"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/livehttp.c:86
msgid "Full URL to put in index file. Use #'s to represent segment number"
msgstr ""
++<<<<<<< HEAD
+"Komplet URL til placering i indeksfil. Brug #-tegn til repræsentation af "
+"segmentnummer"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/livehttp.c:89
msgid "Delete segments"
@@@ -7653,11 -7626,11 +7954,19 @@@ msgstr "
#: modules/access_output/livehttp.c:96
msgid "AES key file"
++<<<<<<< HEAD
+msgstr "AES-nøglefil"
+
+#: modules/access_output/livehttp.c:97
+msgid "File containing the 16 bytes encryption key"
+msgstr "Fil indeholdende krypteringsnøglen på 16 bytes"
++=======
+ msgstr ""
+
+ #: modules/access_output/livehttp.c:97
+ msgid "File containing the 16 bytes encryption key"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/livehttp.c:99
msgid "File where vlc reads key-uri and keyfile-location"
@@@ -8087,7 -8060,7 +8396,11 @@@ msgstr "Skærminput
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Skærm"
@@@ -8579,7 -8552,7 +8892,11 @@@ msgstr "
#: modules/access/v4l2/v4l2.c:152
msgid "Color killer"
++<<<<<<< HEAD
+msgstr "Farvedræber"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:154
msgid ""
@@@ -8610,11 -8583,11 +8927,19 @@@ msgstr "Negativ
#: modules/access/v4l2/v4l2.c:165
msgid "Emboss"
++<<<<<<< HEAD
+msgstr "Relief"
+
+#: modules/access/v4l2/v4l2.c:165
+msgid "Sketch"
+msgstr "Skitse"
++=======
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:165
+ msgid "Sketch"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:165
msgid "Sky blue"
@@@ -8626,11 -8599,11 +8951,19 @@@ msgstr "Græsgrøn
#: modules/access/v4l2/v4l2.c:166
msgid "Skin whiten"
++<<<<<<< HEAD
+msgstr "Gør skin lysere"
+
+#: modules/access/v4l2/v4l2.c:166
+msgid "Vivid"
+msgstr "Livlig"
++=======
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:166
+ msgid "Vivid"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:169 modules/audio_output/auhal.c:66
#: modules/audio_output/directx.c:115 modules/audio_output/waveout.c:146
@@@ -8639,15 -8612,15 +8972,27 @@@ msgstr "Lydstyrke
#: modules/access/v4l2/v4l2.c:171
msgid "Volume of the audio input."
++<<<<<<< HEAD
+msgstr "Lydstyrke for indgående lyd."
+
+#: modules/access/v4l2/v4l2.c:172
+msgid "Audio balance"
+msgstr "Lydbalance"
+
+#: modules/access/v4l2/v4l2.c:174
+msgid "Balance of the audio input."
+msgstr "Balance for indgående lyd."
++=======
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:172
+ msgid "Audio balance"
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:174
+ msgid "Balance of the audio input."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:175
msgid "Bass level"
@@@ -8655,7 -8628,7 +9000,11 @@@ msgstr "Bassniveau
#: modules/access/v4l2/v4l2.c:177
msgid "Bass adjustment of the audio input."
++<<<<<<< HEAD
+msgstr "Basjustering af indgående lyd."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:178
msgid "Treble level"
@@@ -8713,15 -8686,15 +9062,27 @@@ msgstr "625 linjer / 50 Hz
#: modules/access/v4l2/v4l2.c:255
msgid "PAL N Argentina"
++<<<<<<< HEAD
+msgstr "PAL N Argentina"
+
+#: modules/access/v4l2/v4l2.c:256
+msgid "NTSC M Japan"
+msgstr "NTSC M Japan"
+
+#: modules/access/v4l2/v4l2.c:256
+msgid "NTSC M South Korea"
+msgstr "NTSC M Sydkorea"
++=======
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:256
+ msgid "NTSC M Japan"
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:256
+ msgid "NTSC M South Korea"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:267 modules/audio_output/alsa.c:76
msgid "Mono"
@@@ -8769,7 -8742,7 +9130,11 @@@ msgstr "
#: modules/access/v4l2/v4l2.c:432
msgid "Video4Linux radio tuner"
++<<<<<<< HEAD
+msgstr "Radiotuner for Video4Linux"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vcd/vcd.c:47
msgid "VCD"
@@@ -8781,7 -8754,7 +9146,11 @@@ msgstr "Vcd-input
#: modules/access/vcd/vcd.c:54
msgid "[vcd:][device][#[title][,[chapter]]]"
++<<<<<<< HEAD
+msgstr "[vcd:][enhed][#[titel][,[kapitel]]]"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vcdx/access.c:272 modules/access/vcdx/access.c:352
#: modules/access/vcdx/access.c:674 modules/access/vcdx/info.c:229
@@@ -8831,7 -8804,7 +9200,11 @@@ msgstr "Lydstyrke max #
msgid "Volume Set"
msgstr "Lydstyrke angivet"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -8960,11 -8933,11 +9333,19 @@@ msgstr "Formatet der skal bruges til sp
#: modules/access/vdr.c:76
msgid "Support for VDR recordings (http://www.tvdr.de/)."
++<<<<<<< HEAD
+msgstr "Understøttelse af VDR-optagelser (http://www.tvdr.de/)."
+
+#: modules/access/vdr.c:78
+msgid "Chapter offset in ms"
+msgstr "Kapitelforskyning i ms"
++=======
+ msgstr ""
+
+ #: modules/access/vdr.c:78
+ msgid "Chapter offset in ms"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vdr.c:80
msgid "Move all chapters. This value should be set in milliseconds."
@@@ -8992,31 -8965,31 +9373,59 @@@ msgstr "Start
#: modules/access/vnc.c:48
msgid "X.509 Certificate Authority"
++<<<<<<< HEAD
+msgstr "X.509-certifikatmyndighed"
+
+#: modules/access/vnc.c:49
+msgid "Certificate of the Authority to verify server's against"
+msgstr "Certifikatet for myndigheden som serverens verificeres mod"
+
+#: modules/access/vnc.c:50
+msgid "X.509 Certificate Revocation List"
+msgstr "Liste med tilbagekaldelser af X.509-certifikater"
+
+#: modules/access/vnc.c:51
+msgid "List of revoked servers certificates"
+msgstr "Liste med tilbagekaldelte servercertifikater"
+
+#: modules/access/vnc.c:52
+msgid "X.509 Client certificate"
+msgstr "X.509-klientcertifikat"
+
+#: modules/access/vnc.c:53
+msgid "Certificate for client authentification"
+msgstr "Certifikat for klientgodkendelse"
+
+#: modules/access/vnc.c:54
+msgid "X.509 Client private key"
+msgstr "Privat nøgle for X.509-klient"
++=======
+ msgstr ""
+
+ #: modules/access/vnc.c:49
+ msgid "Certificate of the Authority to verify server's against"
+ msgstr ""
+
+ #: modules/access/vnc.c:50
+ msgid "X.509 Certificate Revocation List"
+ msgstr ""
+
+ #: modules/access/vnc.c:51
+ msgid "List of revoked servers certificates"
+ msgstr ""
+
+ #: modules/access/vnc.c:52
+ msgid "X.509 Client certificate"
+ msgstr ""
+
+ #: modules/access/vnc.c:53
+ msgid "Certificate for client authentification"
+ msgstr ""
+
+ #: modules/access/vnc.c:54
+ msgid "X.509 Client private key"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:55
msgid "Private key for authentification by certificate"
@@@ -9028,7 -9001,7 +9437,11 @@@ msgstr "
#: modules/access/vnc.c:61
msgid "Compression level"
++<<<<<<< HEAD
+msgstr "Niveau for komprimering"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:62
msgid "Transfer compression level from 0 (none) to 9 (max)"
@@@ -9036,11 -9009,11 +9449,19 @@@ msgstr "
#: modules/access/vnc.c:63
msgid "Image quality"
++<<<<<<< HEAD
+msgstr "Billedkvalitet"
+
+#: modules/access/vnc.c:64
+msgid "Image quality 1 to 9 (max)"
+msgstr "Billedkvalitet 1 til 9 (maks.)"
++=======
+ msgstr ""
+
+ #: modules/access/vnc.c:64
+ msgid "Image quality 1 to 9 (max)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:78
msgid "VNC"
@@@ -9048,7 -9021,7 +9469,11 @@@ msgstr "VNC
#: modules/access/vnc.c:82
msgid "VNC client access"
++<<<<<<< HEAD
+msgstr "VNC-klientadgang"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/zip/zipstream.c:38
msgid "Media in Zip"
@@@ -9997,7 -9970,7 +10422,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "ALSA-lydoutput"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Fejl i lydoutput"
@@@ -10030,7 -10003,7 +10459,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -10038,30 -10011,30 +10471,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit-output"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit-output"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr "Den valgte lydenheds output er optaget af et andet program."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Lydenheden er ikke konfigureret"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Lydenheden er ikke konfigureret"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Indkodet output)"
@@@ -10464,11 -10437,11 +10921,19 @@@ msgstr "
#: modules/codec/avcodec/avcodec.h:136
msgid "Hardware decoding"
++<<<<<<< HEAD
+msgstr "Hardware-afkodning"
+
+#: modules/codec/avcodec/avcodec.h:137
+msgid "This allows hardware decoding when available."
+msgstr "Dette tillader hardware-afkodning når det er tilgængeligt."
++=======
+ msgstr ""
+
+ #: modules/codec/avcodec/avcodec.h:137
+ msgid "This allows hardware decoding when available."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:139
msgid "VDA output pixel format"
@@@ -11275,46 -11248,46 +11740,74 @@@ msgstr "Skygge
msgid "Outline"
msgstr "Kontur"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Sort"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Grå"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Sølv"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Hvid"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Rødbrun"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Rød"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11322,61 -11295,61 +11815,97 @@@ msgid "Fuchsia
msgstr "Lyserød"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Gul"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Olivengrøn"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Grøn"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Turkis"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Limegrøn"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Lilla"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Marineblå"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Blå"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11511,7 -11484,7 +12040,11 @@@ msgstr "Undertekster (avanceret)
msgid "Subtitle renderers using libass"
msgstr "Underteksttegnere som bruger libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Bygger skrifttypecache"
@@@ -13324,10 -13297,10 +13857,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -13432,8 -13405,8 +13972,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus-kontrolgrænseflade"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13771,9 -13744,9 +14316,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pause"
@@@ -15652,7 -15625,7 +16203,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG Transport Stream demuxer"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Tekst-TV"
@@@ -15840,7 -15813,7 +16395,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Index"
@@@ -15928,9 -15901,9 +16487,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Gem"
@@@ -16069,7 -16042,7 +16634,11 @@@ msgstr "Ingen inddata fundet
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Spring til tidspunkt"
@@@ -16089,7 -16062,7 +16658,11 @@@ msgstr "
msgid "Backward"
msgstr "Tilbage"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16099,7 -16072,7 +16672,11 @@@ msgstr "
msgid "Forward"
msgstr "Fremad"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16119,84 -16092,84 +16696,155 @@@ msgstr "Slå fuld skærm til/fra
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Vis/skjul spilleliste"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Vis/skjul spilleliste"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Gentag"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Bland"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Bland"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Fuld lydstyrke"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Fuld lydstyrke"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Effekter"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16232,7 -16205,7 +16880,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16415,8 -16388,8 +17067,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Brugerdefineret"
@@@ -16509,36 -16482,36 +17166,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Ingen CrashLog fundet"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Ingen CrashLog fundet"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Fortsæt"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Fjern gamle indstillinger?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Fjern gamle indstillinger?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16702,7 -16675,7 +17391,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Lås skærmformat"
@@@ -16831,7 -16804,7 +17524,11 @@@ msgstr "Skjul VLC
msgid "Hide Others"
msgstr "Skjul andre"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Vis alle"
@@@ -16916,15 -16889,15 +17613,27 @@@ msgstr "Synkronisering af spor
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Afslut efter afspilning"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "GÃ¥ fremad"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Afslut efter afspilning"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "GÃ¥ fremad"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "GÃ¥ tilbage"
@@@ -16940,30 -16913,30 +17649,56 @@@ msgstr "Formindsk lydstyrken
msgid "Audio Device"
msgstr "Lydenhed"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Halv størrelse"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Normal størrelse"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Doppelt størrelse"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Tilpas til skærm"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Halv størrelse"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Normal størrelse"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Doppelt størrelse"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Tilpas til skærm"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Flyd på toppen"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Fuldskærms-videoenhed"
@@@ -16972,7 -16945,7 +17707,11 @@@
msgid "Post processing"
msgstr "Efterbehandling"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Tilføj undertekstfil ..."
@@@ -17200,7 -17173,7 +17939,11 @@@ msgid "Play another media synchronously
msgstr "Afspil andet medie samtidig"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Vælg..."
@@@ -17374,7 -17347,7 +18117,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Skriftstørrelse"
@@@ -17509,7 -17482,7 +18256,11 @@@ msgstr "
#: modules/gui/macosx/playlist.m:536 modules/gui/qt4/dialogs_provider.cpp:582
msgid "HTML playlist"
++<<<<<<< HEAD
+msgstr "HTML-spilleliste"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/playlist.m:715
msgid "Save Playlist"
@@@ -17603,12 -17576,12 +18354,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr "VLC kunne ikke gemme metaoplysningerne."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Indstillinger"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Nulstil alt"
@@@ -17783,131 -17756,127 +18542,241 @@@ msgstr "Aktivér Growl-meddelelser (ve
#: modules/gui/macosx/simple_prefs.m:372 modules/lua/vlc.c:96
#: modules/lua/vlc.c:103
msgid "Lua HTTP"
++<<<<<<< HEAD
+msgstr "Lua HTTP"
+
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Standard-indkodning"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Visningsindstillinger"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Standard-indkodning"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Visningsindstillinger"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Skriftfarve"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Skrift"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Undertekstsprog"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Undertekstsprog"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Foretrukkent undertekstsprog"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Slå OSD til"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Slå OSD til"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Uigennemsigtighed"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Tving fed"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Tving fed"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Konturfarve"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Konturtykkelse"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Sorte skærme i fuldskærmstilstand"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Sorte skærme i fuldskærmstilstand"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Vis"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Uddatamodul"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Video-snapshot"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Mappe"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Præfiks"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Sekventiel nummerering"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Sidste søgning: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Ingen søgning er gennemført endnu."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Uddatamodul"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Video-snapshot"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Mappe"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Præfiks"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Sekventiel nummerering"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Sidste søgning: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Laveste forsinkelse"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Lav forsinkelse"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Høj forsinkelse"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Højere forsinkelse"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Nulstil indstillinger"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17920,20 -17889,20 +18789,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Vælg"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Vælg"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -17941,16 -17910,16 +18827,29 @@@ msgstr "
"Tryk en ny tastekombination for\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Ugyldig kombination"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Ugyldig kombination"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19411,11 -19380,11 +20310,19 @@@ msgstr "
#: modules/gui/qt4/components/info_panels.cpp:553
msgid "Input/Read"
++<<<<<<< HEAD
+msgstr "Input/læs"
+
+#: modules/gui/qt4/components/info_panels.cpp:554
+msgid "Output/Written/Sent"
+msgstr "Output/Skreven/Sendt"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/info_panels.cpp:554
+ msgid "Output/Written/Sent"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/info_panels.cpp:556
msgid "Media data size"
@@@ -19440,16 -19409,16 +20347,28 @@@ msgstr "
#: modules/gui/qt4/components/info_panels.cpp:570
#: modules/gui/qt4/components/info_panels.cpp:583
msgid "Decoded"
++<<<<<<< HEAD
+msgstr "Afkodet"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/info_panels.cpp:571
#: modules/gui/qt4/components/info_panels.cpp:584
msgid "blocks"
++<<<<<<< HEAD
+msgstr "blokke"
+
+#: modules/gui/qt4/components/info_panels.cpp:572
+msgid "Displayed"
+msgstr "Vist"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/info_panels.cpp:572
+ msgid "Displayed"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/info_panels.cpp:573
#: modules/gui/qt4/components/info_panels.cpp:575
@@@ -19464,11 -19433,11 +20383,19 @@@ msgstr "
#: modules/gui/qt4/components/info_panels.cpp:577
#: modules/gui/qt4/components/info_panels.cpp:578
msgid "Sent"
++<<<<<<< HEAD
+msgstr "Sendt"
+
+#: modules/gui/qt4/components/info_panels.cpp:577
+msgid "packets"
+msgstr "pakker"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/info_panels.cpp:577
+ msgid "packets"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/info_panels.cpp:580
msgid "Upstream rate"
@@@ -19476,16 -19445,16 +20403,28 @@@ msgstr "
#: modules/gui/qt4/components/info_panels.cpp:585
msgid "Played"
++<<<<<<< HEAD
+msgstr "Afspillet"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/info_panels.cpp:586
#: modules/gui/qt4/components/info_panels.cpp:587
msgid "buffers"
++<<<<<<< HEAD
+msgstr "buffere"
+
+#: modules/gui/qt4/components/info_panels.cpp:609
+msgid "Last 60 seconds"
+msgstr "Seneste 60 sekunder"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/info_panels.cpp:609
+ msgid "Last 60 seconds"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/info_panels.cpp:610
msgid "Overall"
@@@ -19500,8 -19469,6 +20439,11 @@@ msgid "
"Current playback speed: %1\n"
"Click to adjust"
msgstr ""
++<<<<<<< HEAD
+"Nuværende afspilningshastighed: %1\n"
+"Klik for at tilpasse"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/interface_widgets.cpp:541
msgid "Revert to normal play speed"
@@@ -19521,37 -19488,37 +20463,69 @@@ msgstr "
#: modules/gui/qt4/components/interface_widgets.cpp:718
msgid "Image Files (*.gif *.jpg *.jpeg *.png)"
++<<<<<<< HEAD
+msgstr "Billedfiler (*.gif *.jpg *.jpeg *.png)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/interface_widgets.cpp:743
#: modules/gui/qt4/dialogs/toolbar.cpp:461
msgid "Elapsed time"
++<<<<<<< HEAD
+msgstr "Forløbne tid"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/interface_widgets.cpp:747
#: modules/gui/qt4/dialogs/toolbar.cpp:465
msgid "Total/Remaining time"
++<<<<<<< HEAD
+msgstr "I alt/Resterende tid"
+
+#: modules/gui/qt4/components/interface_widgets.cpp:749
+msgid "Click to toggle between total and remaining time"
+msgstr "Klik for at skifte mellem samlet og resterende tid"
+
+#: modules/gui/qt4/components/interface_widgets.cpp:755
+msgid "Click to toggle between elapsed and remaining time"
+msgstr "Klik for at skifte mellem forløben og resterende tid"
+
+#: modules/gui/qt4/components/interface_widgets.cpp:757
+msgid "Double click to jump to a chosen time position"
+msgstr "Dobbeltklik for hoppe til den angivet tidsplacering"
+
+#: modules/gui/qt4/components/open_panels.cpp:57
+msgid "Select a device or a VIDEO_TS directory"
+msgstr "Vælg en enhed eller en VIDEO_TS-mappe"
+
+#: modules/gui/qt4/components/open_panels.cpp:58
+msgid "Select a device or a VIDEO_TS folder"
+msgstr "Vælg en enhed eller en VIDEO_TS-mappe"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/interface_widgets.cpp:749
+ msgid "Click to toggle between total and remaining time"
+ msgstr ""
+
+ #: modules/gui/qt4/components/interface_widgets.cpp:755
+ msgid "Click to toggle between elapsed and remaining time"
+ msgstr ""
+
+ #: modules/gui/qt4/components/interface_widgets.cpp:757
+ msgid "Double click to jump to a chosen time position"
+ msgstr ""
+
+ #: modules/gui/qt4/components/open_panels.cpp:57
+ msgid "Select a device or a VIDEO_TS directory"
+ msgstr ""
+
+ #: modules/gui/qt4/components/open_panels.cpp:58
+ msgid "Select a device or a VIDEO_TS folder"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/open_panels.cpp:144
#: modules/gui/qt4/components/open_panels.cpp:222
@@@ -19589,15 -19556,15 +20563,27 @@@ msgstr "Brug VLC-takt
#: modules/gui/qt4/components/open_panels.cpp:900
msgid "TV - digital"
++<<<<<<< HEAD
+msgstr "TV - digital"
+
+#: modules/gui/qt4/components/open_panels.cpp:903
+msgid "Tuner card"
+msgstr "Tunerkort"
+
+#: modules/gui/qt4/components/open_panels.cpp:904
+msgid "Delivery system"
+msgstr "Leveringssystem"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/open_panels.cpp:903
+ msgid "Tuner card"
+ msgstr ""
+
+ #: modules/gui/qt4/components/open_panels.cpp:904
+ msgid "Delivery system"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/open_panels.cpp:934
msgid "Transponder/multiplex frequency"
@@@ -19605,7 -19572,7 +20591,11 @@@ msgstr "Transponder/multiplex-frekvens
#: modules/gui/qt4/components/open_panels.cpp:944
msgid "Transponder symbol rate"
++<<<<<<< HEAD
+msgstr "Symbolfrekvens for transponder"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/open_panels.cpp:977
msgid "Bandwidth"
@@@ -19613,7 -19580,7 +20603,11 @@@ msgstr "BÃ¥ndbredde
#: modules/gui/qt4/components/open_panels.cpp:1021
msgid "TV - analog"
++<<<<<<< HEAD
+msgstr "TV - analog"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/open_panels.cpp:1024
msgid "Device name"
@@@ -19622,12 -19589,11 +20616,19 @@@ msgstr "Enheds navn
#: modules/gui/qt4/components/open_panels.cpp:1084
msgid "Your display will be opened and played in order to stream or save it."
msgstr ""
++<<<<<<< HEAD
+"Dit vindue vil blive åbent og afspillet for at strømme eller gemme den. "
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#. xgettext: frames per second
#: modules/gui/qt4/components/open_panels.cpp:1098
msgid " f/s"
++<<<<<<< HEAD
+msgstr "b/s"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/open_panels.cpp:1309
msgid "Advanced Options"
@@@ -19647,7 -19613,7 +20648,11 @@@ msgstr "Søg i spilleliste
#: modules/gui/qt4/components/playlist/playlist_model.cpp:377
msgid "unknown"
++<<<<<<< HEAD
+msgstr "ukendt"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/selector.cpp:250
msgid "My Computer"
@@@ -19667,51 -19633,51 +20672,99 @@@ msgstr "Internet
#: modules/gui/qt4/components/playlist/selector.cpp:454
msgid "Remove this podcast subscription"
++<<<<<<< HEAD
+msgstr "Fjern dette podcast-abonnement"
+
+#: modules/gui/qt4/components/playlist/selector.cpp:605
+msgid "Do you really want to unsubscribe from %1?"
+msgstr "Sikker på at du vil afmelde dig fra %1?"
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:47
+msgid "Create Directory"
+msgstr "Opret mappe"
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:47
+msgid "Create Folder"
+msgstr "Opret mappe"
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:49
+msgid "Enter name for new directory:"
+msgstr "Angiv navnet for den nye mappe:"
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:50
+msgid "Enter name for new folder:"
+msgstr "Angiv navnet for den nye mappe:"
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:241
+msgid "Sort by"
+msgstr "Sortér efter"
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:249
+msgid "Ascending"
+msgstr "Stigende"
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:253
+msgid "Descending"
+msgstr "Aftagende"
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:260
+msgid "Display size"
+msgstr "Skærmstørrelse"
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:261
+msgid "Increase"
+msgstr "Forøg"
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:262
+msgid "Decrease"
+msgstr "Formindsk"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/selector.cpp:605
+ msgid "Do you really want to unsubscribe from %1?"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:47
+ msgid "Create Directory"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:47
+ msgid "Create Folder"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:49
+ msgid "Enter name for new directory:"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:50
+ msgid "Enter name for new folder:"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:241
+ msgid "Sort by"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:249
+ msgid "Ascending"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:253
+ msgid "Descending"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:260
+ msgid "Display size"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:261
+ msgid "Increase"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:262
+ msgid "Decrease"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/standardpanel.cpp:281
msgid "Playlist View Mode"
@@@ -19725,15 -19691,15 +20778,27 @@@ msgstr "
#: modules/gui/qt4/components/playlist/standardpanel.hpp:156
msgid "Icons"
++<<<<<<< HEAD
+msgstr "Ikoner"
+
+#: modules/gui/qt4/components/playlist/standardpanel.hpp:157
+msgid "Detailed List"
+msgstr "Detajleret liste"
+
+#: modules/gui/qt4/components/playlist/standardpanel.hpp:158
+msgid "List"
+msgstr "Liste"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.hpp:157
+ msgid "Detailed List"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.hpp:158
+ msgid "List"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/standardpanel.hpp:159
msgid "PictureFlow"
@@@ -19795,7 -19761,7 +20860,11 @@@ msgstr "
#: modules/gui/qt4/components/preferences_widgets.cpp:1423
msgid "Assign"
++<<<<<<< HEAD
+msgstr "Tildel"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1458
msgid "Warning: this key or combination is already assigned to "
@@@ -19807,7 -19773,7 +20876,11 @@@ msgstr "
#: modules/gui/qt4/components/preferences_widgets.cpp:1493
msgid "Key or combination: "
++<<<<<<< HEAD
+msgstr "Tast eller kombination:"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1502
msgid "Key: "
@@@ -19897,20 -19863,20 +20970,36 @@@ msgstr "Slet valgte profil
msgid "Create a new profile"
msgstr "Opret en ny profil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Opret"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Profilnavn mangler"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Profilnavn mangler"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Du skal give profilen et navn."
@@@ -20317,11 -20283,11 +21406,19 @@@ msgstr "
#: modules/gui/qt4/dialogs/plugins.cpp:551
msgid "Version"
++<<<<<<< HEAD
+msgstr "Version"
+
+#: modules/gui/qt4/dialogs/plugins.cpp:571
+msgid "Website"
+msgstr "Hjemmeside"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs/plugins.cpp:571
+ msgid "Website"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/podcast_configuration.cpp:35
msgid "Deletes the selected item"
@@@ -20389,7 -20355,7 +21486,11 @@@ msgstr "Ã…bn mappe
#: modules/gui/qt4/dialogs_provider.cpp:66
msgid "Open Folder"
++<<<<<<< HEAD
+msgstr "Ã…bn mappe"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs_provider.cpp:563
msgid "Open playlist..."
@@@ -20397,15 -20363,15 +21498,27 @@@ msgstr "Ã…bn spilleliste...
#: modules/gui/qt4/dialogs_provider.cpp:579
msgid "XSPF playlist"
++<<<<<<< HEAD
+msgstr "XSPF-spilleliste"
+
+#: modules/gui/qt4/dialogs_provider.cpp:580
+msgid "M3U playlist"
+msgstr "M3U-spilleliste"
+
+#: modules/gui/qt4/dialogs_provider.cpp:581
+msgid "M3U8 playlist"
+msgstr "M3U8-spilleliste"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs_provider.cpp:580
+ msgid "M3U playlist"
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs_provider.cpp:581
+ msgid "M3U8 playlist"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs_provider.cpp:599
msgid "Save playlist as..."
@@@ -20421,7 -20387,7 +21534,11 @@@ msgstr "Mediefiler
#: modules/gui/qt4/dialogs_provider.hpp:44
msgid "Subtitle Files"
++<<<<<<< HEAD
+msgstr "Undertekstfiler"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs_provider.hpp:45
msgid "All Files"
@@@ -20709,11 -20675,11 +21826,19 @@@ msgstr "Konve&rtér / Gem...
#: modules/gui/qt4/menus.cpp:383
msgid "&Stream..."
++<<<<<<< HEAD
+msgstr "&Strøm..."
+
+#: modules/gui/qt4/menus.cpp:388
+msgid "Quit at the end of playlist"
+msgstr "Afslut ved spillelistens afslutning"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/menus.cpp:388
+ msgid "Quit at the end of playlist"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:395
msgid "Close to systray"
@@@ -20733,7 -20699,7 +21858,11 @@@ msgstr "S&ynkronisering af spor
#: modules/gui/qt4/menus.cpp:425
msgid "Program Guide"
++<<<<<<< HEAD
+msgstr "Programguide"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:431
msgid "Plu&gins and extensions"
@@@ -20761,7 -20727,7 +21890,11 @@@ msgstr "Ctrl+L
#: modules/gui/qt4/menus.cpp:485
msgid "Docked Playlist"
++<<<<<<< HEAD
+msgstr "Dokket spilleliste"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:496
msgid "Mi&nimal Interface"
@@@ -20789,15 -20755,15 +21922,27 @@@ msgstr "Visualiseringsvælger
#: modules/gui/qt4/menus.cpp:583
msgid "&Increase Volume"
++<<<<<<< HEAD
+msgstr "&Forøg lydstyrken"
+
+#: modules/gui/qt4/menus.cpp:586
+msgid "&Decrease Volume"
+msgstr "F&ormindsk lydstyrken"
+
+#: modules/gui/qt4/menus.cpp:589
+msgid "&Mute"
+msgstr "&Sluk lyd"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/menus.cpp:586
+ msgid "&Decrease Volume"
+ msgstr ""
+
+ #: modules/gui/qt4/menus.cpp:589
+ msgid "&Mute"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:606
msgid "Audio &Track"
@@@ -20809,7 -20775,7 +21954,11 @@@ msgstr "Lyd&enhed
#: modules/gui/qt4/menus.cpp:608
msgid "&Stereo Mode"
++<<<<<<< HEAD
+msgstr "&Stereotilstand"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:611
msgid "&Visualizations"
@@@ -20837,7 -20803,7 +21986,11 @@@ msgstr "
#: modules/gui/qt4/menus.cpp:668
msgid "Always &on Top"
++<<<<<<< HEAD
+msgstr "Altid &øverst"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:669
msgid "Set as Wall&paper"
@@@ -20861,7 -20827,7 +22014,11 @@@ msgstr "&Deinterlace
#: modules/gui/qt4/menus.cpp:680
msgid "&Deinterlace mode"
++<<<<<<< HEAD
+msgstr "&Deinterlace-tilstand"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:681
msgid "&Post processing"
@@@ -20869,7 -20835,7 +22026,11 @@@ msgstr "&Efterbehandling
#: modules/gui/qt4/menus.cpp:685
msgid "Take &Snapshot"
++<<<<<<< HEAD
+msgstr "Tag &skærmbillede"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:708
msgid "T&itle"
@@@ -20909,7 -20875,7 +22070,11 @@@ msgstr "Næ&ste
#: modules/gui/qt4/menus.cpp:850
msgid "Sp&eed"
++<<<<<<< HEAD
+msgstr "&Hastighed"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:856
msgid "&Faster"
@@@ -21157,7 -21123,7 +22322,11 @@@ msgstr "
#: modules/gui/qt4/qt4.cpp:184
msgid "Never"
++<<<<<<< HEAD
+msgstr "Aldrig"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:184
msgid "When minimized"
@@@ -21165,7 -21131,7 +22334,11 @@@ msgstr "
#: modules/gui/qt4/qt4.cpp:184
msgid "Always"
++<<<<<<< HEAD
+msgstr "Altid"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:189
msgid "Qt interface"
@@@ -21173,15 -21139,15 +22346,27 @@@ msgstr "Qt grænseflade
#: modules/gui/qt4/util/customwidgets.cpp:80
msgid "errors"
++<<<<<<< HEAD
+msgstr "fejl"
+
+#: modules/gui/qt4/util/customwidgets.cpp:81
+msgid "warnings"
+msgstr "advarsler"
+
+#: modules/gui/qt4/util/customwidgets.cpp:82
+msgid "debug"
+msgstr "fejlsøg"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/util/customwidgets.cpp:81
+ msgid "warnings"
+ msgstr ""
+
+ #: modules/gui/qt4/util/customwidgets.cpp:82
+ msgid "debug"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/skins2/src/dialogs.cpp:206
msgid "Open a skin file"
@@@ -21217,15 -21183,13 +22402,22 @@@ msgstr "Sti til det skin, der skal brug
#: modules/gui/skins2/src/skin_main.cpp:468
msgid "Config of last used skin"
++<<<<<<< HEAD
+msgstr "Konfiguration for det sidst brugte skin"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/skins2/src/skin_main.cpp:469
msgid ""
"Windows configuration of the last skin used. This option is updated "
"automatically, do not touch it."
msgstr ""
++<<<<<<< HEAD
+"Vindueskonfigurationen for det sidst brugte skin. Denne indstilling bliver "
+"opdateret automatisk, rør den ikke."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/skins2/src/skin_main.cpp:472
msgid "Show a systray icon for VLC"
@@@ -21234,7 -21198,7 +22426,11 @@@ msgstr "Vis ikon for VLC i systembakken
#: modules/gui/skins2/src/skin_main.cpp:473
#: modules/gui/skins2/src/skin_main.cpp:474
msgid "Show VLC on the taskbar"
++<<<<<<< HEAD
+msgstr "Vis VLC i opgavelinjen"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/skins2/src/skin_main.cpp:475
msgid "Enable transparency effects"
@@@ -21245,8 -21209,6 +22441,11 @@@ msgid "
"You can disable all transparency effects if you want. This is mainly useful "
"when moving windows does not behave correctly."
msgstr ""
++<<<<<<< HEAD
+"Du kan slå alle gennemsigtighedseffekter fra. Det er hovedsageligt\n"
+"brugbart, hvis de er problemer med vinduer i bevægelse."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/skins2/src/skin_main.cpp:479
#: modules/gui/skins2/src/skin_main.cpp:480
@@@ -21255,16 -21217,13 +22454,23 @@@ msgstr "Brug skin på spilleliste
#: modules/gui/skins2/src/skin_main.cpp:481
msgid "Display video in a skinned window if any"
++<<<<<<< HEAD
+msgstr "Vis video i et vindue med skin, hvis et sådan findes"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/skins2/src/skin_main.cpp:483
msgid ""
"When set to 'no', this parameter is intended to give old skins a chance to "
"play back video even though no video tag is implemented"
msgstr ""
++<<<<<<< HEAD
+"NÃ¥r denne indstilling er sat til 'nej', er det meningen at den skal\n"
+"give gamle skins en mulighed for at afspille video, også selvom\n"
+"video-mærket ikke er indstillet."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/skins2/src/skin_main.cpp:507
msgid "Skins"
@@@ -21306,8 -21265,6 +22512,11 @@@ msgid "
"Lua interface configuration string. Format is: '[\"<interface module name>"
"\"] = { <option> = <value>, ...}, ...'."
msgstr ""
++<<<<<<< HEAD
+"Konfigurationsstreng for Lua-grænseflade. Formatet er: "
+"'[\"<grænseflademodulnavn>\"] = { <indstilling> = <værdi>, ...}, ...'."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:54 modules/lua/vlc.c:70
msgid "A single password restricts access to this interface."
@@@ -21329,7 -21286,7 +22538,11 @@@ msgstr "
#: share/lua/http/dialogs/stream_config_window.html:28
#: share/lua/http/dialogs/stream_window.html:87
msgid "Host"
++<<<<<<< HEAD
+msgstr "Vært"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:62
msgid ""
@@@ -21337,17 -21294,12 +22550,23 @@@
"network interfaces (0.0.0.0). If you want this interface to be available "
"only on the local machine, enter \"127.0.0.1\"."
msgstr ""
++<<<<<<< HEAD
+"Dette er værten, grænsefladen lytter på. Som standard er dette alle "
+"netværksgrænseflader (0.0.0.0). Hvis du vil have at denne grænseflade kun er "
+"tilgængelig på den lokale maskine, så skriv \"127.0.0.1\"."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:67
msgid ""
"This is the TCP port on which this interface will listen. It defaults to "
"4212."
msgstr ""
++<<<<<<< HEAD
+"Dette er TCP-porten hvorpå denne grænseflade vil lytte. Standardværdien er "
+"4212."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:75
msgid "CLI input"
@@@ -21362,23 -21314,23 +22581,43 @@@ msgstr "
#: modules/lua/vlc.c:84
msgid "Lua"
++<<<<<<< HEAD
+msgstr "Lua"
+
+#: modules/lua/vlc.c:85
+msgid "Lua interpreter"
+msgstr "Lua-fortolker"
+
+#: modules/lua/vlc.c:106
+msgid "Lua CLI"
+msgstr "Lua CLI"
+
+#: modules/lua/vlc.c:110
+msgid "Command-line interface"
+msgstr "Kommandolinjebrugerflade"
+
+#: modules/lua/vlc.c:119 modules/lua/vlc.c:130
+msgid "Lua Telnet"
+msgstr "Lua Telnet"
++=======
+ msgstr ""
+
+ #: modules/lua/vlc.c:85
+ msgid "Lua interpreter"
+ msgstr ""
+
+ #: modules/lua/vlc.c:106
+ msgid "Lua CLI"
+ msgstr ""
+
+ #: modules/lua/vlc.c:110
+ msgid "Command-line interface"
+ msgstr ""
+
+ #: modules/lua/vlc.c:119 modules/lua/vlc.c:130
+ msgid "Lua Telnet"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:134
msgid "Lua Meta Fetcher"
@@@ -21386,15 -21338,15 +22625,27 @@@ msgstr "
#: modules/lua/vlc.c:135
msgid "Fetch meta data using lua scripts"
++<<<<<<< HEAD
+msgstr "Hent metadata ved hjælp af lua-skripts"
+
+#: modules/lua/vlc.c:140
+msgid "Lua Meta Reader"
+msgstr "Lua-metalæser"
+
+#: modules/lua/vlc.c:141
+msgid "Read meta data using lua scripts"
+msgstr "Læs metadata ved hjælp af lua-skripts"
++=======
+ msgstr ""
+
+ #: modules/lua/vlc.c:140
+ msgid "Lua Meta Reader"
+ msgstr ""
+
+ #: modules/lua/vlc.c:141
+ msgid "Read meta data using lua scripts"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:147
msgid "Lua Playlist"
@@@ -21414,11 -21366,11 +22665,19 @@@ msgstr "Hent kunst vha. lua-scripts
#: modules/lua/vlc.c:159 modules/lua/vlc.c:160
msgid "Lua Extension"
++<<<<<<< HEAD
+msgstr "Lua-udvidelse"
+
+#: modules/lua/vlc.c:166
+msgid "Lua SD Module"
+msgstr "Lua-SD-modul"
++=======
+ msgstr ""
+
+ #: modules/lua/vlc.c:166
+ msgid "Lua SD Module"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/meta_engine/folder.c:64
msgid "Folder meta data"
@@@ -21493,27 -21445,27 +22752,51 @@@ msgstr "
#: modules/misc/gnutls.c:63
msgid "Performance (prioritize faster ciphers)"
++<<<<<<< HEAD
+msgstr "Ydelse (prioritér hurtigere chifre)"
+
+#: modules/misc/gnutls.c:65
+msgid "Secure 128-bits (exclude 256-bits ciphers)"
+msgstr "Sikker 128-bit (ekskludér chifre med 256 bit)"
+
+#: modules/misc/gnutls.c:66
+msgid "Secure 256-bits (prioritize 256-bits ciphers)"
+msgstr "Sikker 256-bit (prioritér chifre med 256 bit)"
+
+#: modules/misc/gnutls.c:67
+msgid "Export (include insecure ciphers)"
+msgstr "Eksport (inkludér usikre chifre)"
+
+#: modules/misc/gnutls.c:72
+msgid "GNU TLS transport layer security"
+msgstr "GnuTLS transportlags-sikkerhed"
+
+#: modules/misc/gnutls.c:79
+msgid "GNU TLS server"
+msgstr "GNU TLS-server"
++=======
+ msgstr ""
+
+ #: modules/misc/gnutls.c:65
+ msgid "Secure 128-bits (exclude 256-bits ciphers)"
+ msgstr ""
+
+ #: modules/misc/gnutls.c:66
+ msgid "Secure 256-bits (prioritize 256-bits ciphers)"
+ msgstr ""
+
+ #: modules/misc/gnutls.c:67
+ msgid "Export (include insecure ciphers)"
+ msgstr ""
+
+ #: modules/misc/gnutls.c:72
+ msgid "GNU TLS transport layer security"
+ msgstr ""
+
+ #: modules/misc/gnutls.c:79
+ msgid "GNU TLS server"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/gnutls.c:269
#, c-format
@@@ -21547,7 -21499,7 +22830,11 @@@ msgstr "
#: modules/misc/gnutls.c:295
msgid "View certificate"
++<<<<<<< HEAD
+msgstr "Vis certifikat"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/gnutls.c:312
#, c-format
@@@ -21580,11 -21532,11 +22867,19 @@@ msgstr "
#: modules/misc/inhibit/xdg.c:38
msgid "XDG-screensaver"
++<<<<<<< HEAD
+msgstr "XDG-pauseskærm"
+
+#: modules/misc/inhibit/xdg.c:39
+msgid "XDG screen saver inhibition"
+msgstr "Undertrykkelse af XDG-pauseskærm"
++=======
+ msgstr ""
+
+ #: modules/misc/inhibit/xdg.c:39
+ msgid "XDG screen saver inhibition"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/logger.c:117
msgid "Log format"
@@@ -21592,7 -21544,7 +22887,11 @@@ msgstr "Log format
#: modules/misc/logger.c:118
msgid "Specify the logging format."
++<<<<<<< HEAD
+msgstr "Angiv formatet for logregistrering."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/logger.c:121
msgid "Syslog ident"
@@@ -21604,7 -21556,7 +22903,11 @@@ msgstr "
#: modules/misc/logger.c:125
msgid "Syslog facility"
++<<<<<<< HEAD
+msgstr "Syslog-facilitet"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/logger.c:126
msgid "Select the syslog facility where logs will be forwarded."
@@@ -21612,15 -21564,13 +22915,22 @@@ msgstr "
#: modules/misc/logger.c:153
msgid "Verbosity"
++<<<<<<< HEAD
+msgstr "Detaljeniveau"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/logger.c:154
msgid ""
"Select the verbosity to use for log or -1 to use the same verbosity given by "
"--verbose."
msgstr ""
++<<<<<<< HEAD
+"Vælg detaljeniveauet for loggen eller brug -1 for at bruge det samme\n"
+"detaljeniveau som er angivet med --verbose."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/logger.c:158
msgid "Logging"
@@@ -21640,39 -21590,37 +22950,70 @@@ msgstr "Angiv logfilnavnet.
#: modules/misc/playlist/export.c:50
msgid "M3U playlist export"
++<<<<<<< HEAD
+msgstr "Eksport af M3U-spilleliste"
+
+#: modules/misc/playlist/export.c:56
+msgid "M3U8 playlist export"
+msgstr "Eksport af M3U8-spilleliste"
+
+#: modules/misc/playlist/export.c:62
+msgid "XSPF playlist export"
+msgstr "Eksport af XSPF-spilleliste"
+
+#: modules/misc/playlist/export.c:68
+msgid "HTML playlist export"
+msgstr "Eksport af HTML-spilleliste"
+
+#: modules/misc/rtsp.c:61
+msgid "Maximum number of connections"
+msgstr "Maksimale antal forbindelser"
++=======
+ msgstr ""
+
+ #: modules/misc/playlist/export.c:56
+ msgid "M3U8 playlist export"
+ msgstr ""
+
+ #: modules/misc/playlist/export.c:62
+ msgid "XSPF playlist export"
+ msgstr ""
+
+ #: modules/misc/playlist/export.c:68
+ msgid "HTML playlist export"
+ msgstr ""
+
+ #: modules/misc/rtsp.c:61
+ msgid "Maximum number of connections"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/rtsp.c:62
msgid ""
"This limits the maximum number of clients that can connect to the RTSP VOD. "
"0 means no limit."
msgstr ""
++<<<<<<< HEAD
+"Dette begrænser det maksimale antal af klienter, som kan forbinde til RTSP "
+"VOD. 0 betyder ingen grænse."
+
+#: modules/misc/rtsp.c:65
+msgid "MUX for RAW RTSP transport"
+msgstr "MUX til RAW RTSP-transport"
+
+#: modules/misc/rtsp.c:67
+msgid "Sets the timeout option in the RTSP session string"
+msgstr "Angiver tilvalget for tidsudløb i RTSP-sessionsstrengen"
++=======
+
+ #: modules/misc/rtsp.c:65
+ msgid "MUX for RAW RTSP transport"
+ msgstr ""
+
+ #: modules/misc/rtsp.c:67
+ msgid "Sets the timeout option in the RTSP session string"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/rtsp.c:69
msgid ""
@@@ -22010,7 -21958,7 +23351,11 @@@ msgstr "
#: modules/mux/ogg.c:51
msgid "Ogg/OGM muxer"
++<<<<<<< HEAD
+msgstr "Ogg/OGM-muxer"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/mux/wav.c:46
msgid "WAV muxer"
@@@ -22018,7 -21966,7 +23363,11 @@@ msgstr "WAV muxer
#: modules/notify/growl.m:104
msgid "Growl Notification Plugin"
++<<<<<<< HEAD
+msgstr "PÃ¥mindelsesmodulet Growl"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/notify/growl.m:282
msgid "New input playing"
@@@ -22034,15 -21982,15 +23383,27 @@@ msgstr "Timeout (ms)
#: modules/notify/notify.c:54
msgid "How long the notification will be displayed "
++<<<<<<< HEAD
+msgstr "Hvor lang tid påmindelsen vil blive vist"
+
+#: modules/notify/notify.c:59
+msgid "Notify"
+msgstr "PÃ¥mind"
+
+#: modules/notify/notify.c:60
+msgid "LibNotify Notification Plugin"
+msgstr "PÃ¥mindelsesmodulet LibNotify"
++=======
+ msgstr ""
+
+ #: modules/notify/notify.c:59
+ msgid "Notify"
+ msgstr ""
+
+ #: modules/notify/notify.c:60
+ msgid "LibNotify Notification Plugin"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/packetizer/copy.c:48
msgid "Copy packetizer"
@@@ -22155,15 -22103,15 +23516,27 @@@ msgstr "Podcast
#: modules/services_discovery/pulse.c:42 modules/services_discovery/udev.c:64
#: modules/services_discovery/udev.c:101
msgid "Audio capture"
++<<<<<<< HEAD
+msgstr "Lydoptagelse"
+
+#: modules/services_discovery/pulse.c:43
+msgid "Audio capture (PulseAudio)"
+msgstr "Lydoptagelse (PulseAudio)"
+
+#: modules/services_discovery/pulse.c:186 modules/stream_out/es.c:85
+msgid "Generic"
+msgstr "Generisk"
++=======
+ msgstr ""
+
+ #: modules/services_discovery/pulse.c:43
+ msgid "Audio capture (PulseAudio)"
+ msgstr ""
+
+ #: modules/services_discovery/pulse.c:186 modules/stream_out/es.c:85
+ msgid "Generic"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/sap.c:82
msgid "SAP multicast address"
@@@ -22174,31 -22122,25 +23547,48 @@@ msgid "
"The SAP module normally chooses itself the right addresses to listen to. "
"However, you can specify a specific address."
msgstr ""
++<<<<<<< HEAD
+"SAP-modulet vælger normalt selv den rigtige adresse at lytte til. Dog kan du "
+"angive en specifik adresse."
+
+#: modules/services_discovery/sap.c:86
+msgid "SAP timeout (seconds)"
+msgstr "SAP-tidsgrænse (sekunder)"
++=======
+
+ #: modules/services_discovery/sap.c:86
+ msgid "SAP timeout (seconds)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/sap.c:88
msgid ""
"Delay after which SAP items get deleted if no new announcement is received."
msgstr ""
++<<<<<<< HEAD
+"Ventetid hvorefter SAP-elementer bliver slettet, hvis ingen nye "
+"annonceringer modtages."
+
+#: modules/services_discovery/sap.c:90
+msgid "Try to parse the announce"
+msgstr "Prøv at fortolke annonceringen"
++=======
+
+ #: modules/services_discovery/sap.c:90
+ msgid "Try to parse the announce"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/sap.c:92
msgid ""
"This enables actual parsing of the announces by the SAP module. Otherwise, "
"all announcements are parsed by the \"live555\" (RTP/RTSP) module."
msgstr ""
++<<<<<<< HEAD
+"Dette aktiverer egentlig fortolkning af annonceringerne af SAP-modulet. "
+"Ellers fortolkes alle annonceringer af \"live555\"-modulet (RTP/RTSP)."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/sap.c:95
msgid "SAP Strict mode"
@@@ -22209,8 -22151,6 +23599,11 @@@ msgid "
"When this is set, the SAP parser will discard some non-compliant "
"announcements."
msgstr ""
++<<<<<<< HEAD
+"NÃ¥r denne er angivet, vil SAP-fortolkeren forkaste visse annonceringer som "
+"ikke følger foreskriften."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/sap.c:109
msgid "SAP"
@@@ -22222,7 -22162,7 +23615,11 @@@ msgstr "Netværksstreams (SAP)
#: modules/services_discovery/sap.c:132
msgid "SDP Descriptions parser"
++<<<<<<< HEAD
+msgstr "SDP-beskrivelsesfortolker"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/sap.c:878 modules/services_discovery/sap.c:882
msgid "Session"
@@@ -22238,19 -22178,19 +23635,35 @@@ msgstr "Bruger
#: modules/services_discovery/udev.c:55 modules/services_discovery/udev.c:97
msgid "Video capture"
++<<<<<<< HEAD
+msgstr "Videooptagelse"
+
+#: modules/services_discovery/udev.c:56
+msgid "Video capture (Video4Linux)"
+msgstr "Videooptagelse (Video4Linux)"
+
+#: modules/services_discovery/udev.c:65
+msgid "Audio capture (ALSA)"
+msgstr "Lydoptagelse (ALSA)"
+
+#: modules/services_discovery/udev.c:592
+msgid "CD"
+msgstr "Cd"
++=======
+ msgstr ""
+
+ #: modules/services_discovery/udev.c:56
+ msgid "Video capture (Video4Linux)"
+ msgstr ""
+
+ #: modules/services_discovery/udev.c:65
+ msgid "Audio capture (ALSA)"
+ msgstr ""
+
+ #: modules/services_discovery/udev.c:592
+ msgid "CD"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/udev.c:594 modules/gui/qt4/ui/open_disk.h:298
msgid "DVD"
@@@ -22258,11 -22198,11 +23671,19 @@@ msgstr "DVD
#: modules/services_discovery/udev.c:598
msgid "HD DVD"
++<<<<<<< HEAD
+msgstr "HD DVD"
+
+#: modules/services_discovery/udev.c:605
+msgid "Unknown type"
+msgstr "Ukendt type"
++=======
+ msgstr ""
+
+ #: modules/services_discovery/udev.c:605
+ msgid "Unknown type"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/upnp.cpp:71
msgid "Universal Plug'n'Play"
@@@ -22273,7 -22213,7 +23694,11 @@@ msgstr "Universelt Plug'n'Play
#: modules/services_discovery/xcb_apps.c:86
#: modules/services_discovery/xcb_apps.c:151
msgid "Screen capture"
++<<<<<<< HEAD
+msgstr "Skærmoptagelse"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/xcb_apps.c:152
msgid "Your window manager does not provide a list of applications."
@@@ -23255,45 -23195,45 +24680,81 @@@ msgstr "Konverter stream uddata
msgid "Overlays/Subtitles"
msgstr "Overlægning/undertekster"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Skrifttypestørrelse i pixels"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Skrifttypestørrelse i pixels"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23306,93 -23246,93 +24767,173 @@@ msgstr "
"derefter grøn, og til sidst blå. #000000 = sort, #FF0000 = rød, #00FF00 = "
"grøn, #FFFF00 = gul (rød + grøn), #FFFFFF = hvid"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Relativ skriftstørrelse"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Baggrundsgennemsigtighed"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Baggrundsfarve"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Konturuigennemsigtighed"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Baggrundsgennemsigtighed"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Baggrundsfarve"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Konturuigennemsigtighed"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Mindre"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Lille"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Stor"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Større"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Anvend YUVP-optegner"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Anvend YUVP-optegner"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Tynd"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Tyk"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Tekst optegner"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2-skrifttypeoptegner"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Tynd"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Tyk"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Tekst optegner"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2-skrifttypeoptegner"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -28060,6 -28000,9 +29601,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Mediestyringsliste"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Vis detaljer"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -28077,6 -28020,9 +29624,12 @@@
#~ msgid "These settings affect chroma transformation modules."
#~ msgstr "Disse indstillinger påvirker chromatransformationsmodulerne."
++<<<<<<< HEAD
++=======
+ #~ msgid "Sort"
+ #~ msgstr "Sortér"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Some options are available but hidden. Check \"Advanced options\" to see "
#~ "them."
@@@ -28267,6 -28213,13 +29820,16 @@@
#~ msgid "Blu-Ray Disc Input"
#~ msgstr "Blu-Ray-diskinput"
++<<<<<<< HEAD
++=======
+ #~ msgid "VLC cannot use the device \"%s\", because its type is not supported."
+ #~ msgstr ""
+ #~ "VLC kan ikke bruge enheden \"%s\", da denne type ikke er understøttet."
+
+ #~ msgid "Digital Video (Firewire/ieee1394) input"
+ #~ msgstr "Digitalt videoinput (Firewire/ieee1394)"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "collapse"
#~ msgstr "fold sammen"
@@@ -28396,6 -28349,9 +29959,12 @@@
#~ msgid "Primary language left, Secondary language right"
#~ msgstr "Det primære sprog til venstre, det sekundære sprog til højre"
++<<<<<<< HEAD
++=======
+ #~ msgid "Video4Linux2 Compressed A/V"
+ #~ msgstr "Video4Linux2-komprimeret A/V"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "AltiVec memcpy"
#~ msgstr "AltiVec-memcpy"
@@@ -28478,6 -28434,9 +30047,12 @@@
#~ "dette give en masse fejl.\n"
#~ "Gyldigt interval er fra 0 til 4 (0 deaktiverer fejltolerance helt). "
++<<<<<<< HEAD
++=======
+ #~ msgid "Low resolution decoding"
+ #~ msgstr "Lav opløsning dekodning"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Only decode a low resolution version of the video. This requires less "
#~ "processing power"
@@@ -28586,6 -28545,9 +30161,12 @@@
#~ msgid "Power Management Inhibitor"
#~ msgstr "Undertryk strømstyring"
++<<<<<<< HEAD
++=======
+ #~ msgid "X Screensaver disabler"
+ #~ msgstr "X-pauseskærm deaktiveret"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "libc memcpy"
#~ msgstr "libc memcpy"
@@@ -29735,6 -29697,9 +31316,12 @@@
#~ msgid "You you need to select a file, you want to save to."
#~ msgstr "Du skal vælge en fil at gemme til"
++<<<<<<< HEAD
++=======
+ #~ msgid "Last skin used"
+ #~ msgstr "Sidst brugte skin"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Show bookmarks dialog when the interface starts."
#~ msgstr "Vis bogmærkevindue når grænsefladen starter."
@@@ -30081,6 -30046,10 +31668,13 @@@
#~ msgstr "Indstil kontrast for video inddata"
#, fuzzy
++<<<<<<< HEAD
++=======
+ #~ msgid "Balance of the audio input (if supported by the v4l2 driver)."
+ #~ msgstr "Indstil kontrast for video inddata"
+
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Mute audio input (if supported by the v4l2 driver)."
#~ msgstr "Indstil kontrast for video inddata"
@@@ -30156,6 -30125,9 +31750,12 @@@
#~ msgid "Speed"
#~ msgstr "Hastighed"
++<<<<<<< HEAD
++=======
+ #~ msgid "Take Screen Shot"
+ #~ msgstr "Gem skærmbilledet"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "ftp"
#~ msgstr "ftp"
@@@ -30172,6 -30144,10 +31772,13 @@@
#~ msgstr "Krypter lyd"
#, fuzzy
++<<<<<<< HEAD
++=======
+ #~ msgid "Open a device or a VIDEO_TS directory"
+ #~ msgstr "Vælg enhed eller VIDEO_TS-mappe"
+
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Enable the strict rate control algorithm."
#~ msgstr "Aktiver interlaced indkodning"
@@@ -30201,6 -30177,10 +31808,13 @@@
#~ msgid "Input has changed "
#~ msgstr "Inddata har ændret sig"
++<<<<<<< HEAD
++=======
+ #, fuzzy
+ #~ msgid "Sort by &Title"
+ #~ msgstr "Sortér efter navn"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Override frames per second. It will only work with MicroDVD and SubRIP "
#~ "subtitles."
@@@ -30254,6 -30234,10 +31868,13 @@@
#~ "Tryk RETUR-tasten for at fortsætte...\n"
#, fuzzy
++<<<<<<< HEAD
++=======
+ #~ msgid "Growl server"
+ #~ msgstr "GnuTLS-server"
+
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Number of previous frames used as predictors. This is effective in Anime, "
#~ "but seems to make little difference in live-action source material. Some "
@@@ -30377,6 -30361,9 +31998,12 @@@
#~ msgid "Height of the stream to capture (-1 for autodetect)."
#~ msgstr "Højden på den strøm, der skal optages (-1 for auto)."
++<<<<<<< HEAD
++=======
+ #~ msgid "HTML playlist (*.html)"
+ #~ msgstr "HTML-spilleliste (*.html)"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Camera"
#~ msgstr "Kamera"
@@@ -30450,64 -30437,6 +32077,67 @@@
#~ msgstr "_Moduler..."
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Vis indstillinger"
+
+#, fuzzy
+#~ msgid "Sort"
+#~ msgstr "Sortér efter"
+
+#, fuzzy
+#~ msgid "VLC cannot use the device \"%s\", because its type is not supported."
+#~ msgstr ""
+#~ "Enheden som du har valgt kan ikke anvendes, da denne type ikke "
+#~ "understøttes."
+
+#, fuzzy
+#~ msgid "Digital Video (Firewire/ieee1394) input"
+#~ msgstr "Digitalt videoinput (Firewire/ieee1394)"
+
+#, fuzzy
+#~ msgid "Video4Linux2 Compressed A/V"
+#~ msgstr "Radiotuner for Video4Linux"
+
+#, fuzzy
+#~ msgid "Low resolution decoding"
+#~ msgstr "Hardware-afkodning"
+
+#, fuzzy
+#~ msgid "X Screensaver disabler"
+#~ msgstr "Undertrykkelse af XDG-pauseskærm"
+
+#, fuzzy
+#~ msgid "Last skin used"
+#~ msgstr "Seneste 60 sekunder"
+
+#, fuzzy
+#~ msgid "Balance of the audio input (if supported by the v4l2 driver)."
+#~ msgstr "Balance for indgående lyd."
+
+#, fuzzy
+#~ msgid "Take Screen Shot"
+#~ msgstr "Tag &skærmbillede"
+
+#, fuzzy
+#~ msgid "Open a device or a VIDEO_TS directory"
+#~ msgstr "Vælg en enhed eller en VIDEO_TS-mappe"
+
+#, fuzzy
+#~ msgid "Sort by &Title"
+#~ msgstr "Sortér efter"
+
+#, fuzzy
+#~ msgid "Growl server"
+#~ msgstr "GNU TLS-server"
+
+#, fuzzy
+#~ msgid "HTML playlist (*.html)"
+#~ msgstr "HTML-spilleliste"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Secondary language (Analog TV tuners only)"
#~ msgstr "Sekundært sprog eller program"
@@@ -30729,8 -30658,8 +32359,13 @@@
#~ "This allow you to configure the initial caching amount for stream output "
#~ "muxer. This value should be set in milliseconds."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Dette gør at du kan konfigurere startcacheværdien for outputstrøm-"
+#~ "muxeren. Denne værdi skal være i millisekunder."
++=======
+ #~ "Standardcacheværdi for udgående UDP-strømme. Denne værdi skal være i "
+ #~ "millisekunder."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Control SAP flow"
@@@ -30750,9 -30679,11 +32385,17 @@@
#~ msgstr ""
#~ "Det kan nogle gange være nyttigt kun at tillade en enkelt kørende instans "
#~ "af VLC ad gangen, f.eks. hvis du har associeret VLC med nogle medietyper, "
++<<<<<<< HEAD
+#~ "og du ikke ønsker at åbne en ny instans af VLC, hver gang du åbner en fil "
+#~ "i filhåndteringen. Med denne indstilling kan du afspille filen i den "
+#~ "aktuelt kørende instans, eller du kan sætte den i kø."
++=======
+ #~ "og du ikke ønsker at åbne en ny instans af VLC, hver gang du "
+ #~ "dobbeltklikker på en fil. Med denne indstilling kan du afspille filen i "
+ #~ "den aktuelt kørende instans, eller du kan sætte den i kø. Denne "
+ #~ "indstilling kræver, at D-Bus-sessionsdæmonen er aktiv, og at den kørende "
+ #~ "instans af VLC anvender D-Bus-kontrolgrænsefladen."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Allow only one running instance when started from file."
@@@ -30828,7 -30759,7 +32471,11 @@@
#, fuzzy
#~ msgid "VLC cannot open ANY capture device.Check the error log for details."
++<<<<<<< HEAD
+#~ msgstr "VLC kan ikke åbne NOGEN optageenhed. Se detaljer i fejlloggen."
++=======
+ #~ msgstr "VLC kan ikke åbne MRL \"%s\". Detaljer er skrevet i loggen."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Auto Connection"
@@@ -30904,7 -30835,7 +32551,11 @@@
#, fuzzy
#~ msgid "Tuner id"
++<<<<<<< HEAD
+#~ msgstr "Tunerkort"
++=======
+ #~ msgstr "Tuner"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Tuner id (see debug output)."
@@@ -30920,7 -30851,7 +32571,11 @@@
#, fuzzy
#~ msgid "[vcd:][device][@[title][,[chapter]]]"
++<<<<<<< HEAD
+#~ msgstr "[vcd:][enhed][#[titel][,[kapitel]]]"
++=======
+ #~ msgstr "[cdda:][enhed][@[spor]]"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "ARM NEON audio format conversions"
@@@ -31109,7 -31040,7 +32764,11 @@@
#, fuzzy
#~ msgid "HTML Playlist"
++<<<<<<< HEAD
+#~ msgstr "HTML-spilleliste"
++=======
+ #~ msgstr "Lua-spilleliste"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "General Audio Settings"
@@@ -31213,7 -31144,7 +32872,11 @@@
#, fuzzy
#~ msgid "Subtitles Files"
++<<<<<<< HEAD
+#~ msgstr "Undertekstfiler"
++=======
+ #~ msgstr "Undertekstfil"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "&Tools"
@@@ -31449,7 -31380,7 +33112,11 @@@
#, fuzzy
#~ msgid "Max number of redirection"
++<<<<<<< HEAD
+#~ msgstr "Maksimale antal forbindelser"
++=======
+ #~ msgstr "Antallet af DWT-operationer"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Direct3D Desktop mode"
@@@ -31513,7 -31444,7 +33180,11 @@@
#, fuzzy
#~ msgid "Elasped time"
++<<<<<<< HEAD
+#~ msgstr "Forløbne tid"
++=======
+ #~ msgstr "Forsinkelsestid"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Video standard (Default, SECAM_D, PAL_B, NTSC_M, etc...)."
@@@ -31629,7 -31560,7 +33300,11 @@@
#, fuzzy
#~ msgid "Preload Directory"
++<<<<<<< HEAD
+#~ msgstr "Opret mappe"
++=======
+ #~ msgstr "Vælg mappe"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Motion blue"
@@@ -31783,11 -31714,11 +33458,19 @@@
#, fuzzy
#~ msgid "Certificate file"
++<<<<<<< HEAD
+#~ msgstr "Vis certifikat"
+
+#, fuzzy
+#~ msgid "Private key file"
+#~ msgstr "AES-nøglefil"
++=======
+ #~ msgstr "Vend lodret"
+
+ #, fuzzy
+ #~ msgid "Private key file"
+ #~ msgstr "Opret en ny profil"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Root CA file"
@@@ -31987,11 -31918,11 +33670,19 @@@
#, fuzzy
#~ msgid "Brightness of the video input."
++<<<<<<< HEAD
+#~ msgstr "Balance for indgående lyd."
+
+#, fuzzy
+#~ msgid "Color of the video input."
+#~ msgstr "Lydstyrke for indgående lyd."
++=======
+ #~ msgstr "Tærskel for lysstyrke"
+
+ #, fuzzy
+ #~ msgid "Color of the video input."
+ #~ msgstr "ASCII-kunst video-uddata"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Set this option if the capture device outputs MJPEG"
@@@ -32204,7 -32135,7 +33895,11 @@@
#, fuzzy
#~ msgid "Screen Capture Input"
++<<<<<<< HEAD
+#~ msgstr "Skærmoptagelse"
++=======
+ #~ msgstr "Skærminput"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "No %@s found"
@@@ -32228,7 -32159,7 +33923,11 @@@
#, fuzzy
#~ msgid "Empty Folder"
++<<<<<<< HEAD
+#~ msgstr "Ã…bn mappe"
++=======
+ #~ msgstr "Mappe"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Default Server Port"
@@@ -32296,19 -32227,19 +33995,35 @@@
#, fuzzy
#~ msgid "XSPF playlist (*.xspf)"
++<<<<<<< HEAD
+#~ msgstr "Eksport af XSPF-spilleliste"
+
+#, fuzzy
+#~ msgid "M3U8 playlist (*.m3u8)"
+#~ msgstr "M3U8-spilleliste"
+
+#, fuzzy
+#~ msgid "M3U playlist (*.m3u)"
+#~ msgstr "M3U-spilleliste"
+
+#, fuzzy
+#~ msgid "&Streaming..."
+#~ msgstr "&Strøm..."
++=======
+ #~ msgstr "Import af XSPF-spilleliste"
+
+ #, fuzzy
+ #~ msgid "M3U8 playlist (*.m3u8)"
+ #~ msgstr "Import af M3U spilleliste"
+
+ #, fuzzy
+ #~ msgid "M3U playlist (*.m3u)"
+ #~ msgstr "Import af M3U spilleliste"
+
+ #, fuzzy
+ #~ msgid "&Streaming..."
+ #~ msgstr "Streaming"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Sna&pshot"
@@@ -32373,7 -32304,7 +34088,11 @@@
#, fuzzy
#~ msgid "Interfaces implemented using lua scripts"
++<<<<<<< HEAD
+#~ msgstr "Læs metadata ved hjælp af lua-skripts"
++=======
+ #~ msgstr "Hent kunst vha. lua-scripts"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Lua Interface Module (shortcuts)"
@@@ -32397,7 -32328,7 +34116,11 @@@
#, fuzzy
#~ msgid "OpenGL Provider"
++<<<<<<< HEAD
+#~ msgstr "Ã…bn mappe"
++=======
+ #~ msgstr "OpenGL video uddata"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Snapshot width"
@@@ -32493,7 -32424,7 +34216,11 @@@
#, fuzzy
#~ msgid "Set"
++<<<<<<< HEAD
+#~ msgstr "Sendt"
++=======
+ #~ msgstr "VÃ¥dt"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "SDL video driver name"
@@@ -32724,7 -32655,7 +34451,11 @@@
#, fuzzy
#~ msgid "Sort by Path"
++<<<<<<< HEAD
+#~ msgstr "Sortér efter"
++=======
+ #~ msgstr "Sortér punkt efter kunstner"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Randomize"
@@@ -32752,7 -32683,7 +34483,11 @@@
#, fuzzy
#~ msgid "Stay On Top"
++<<<<<<< HEAD
+#~ msgstr "Altid &øverst"
++=======
+ #~ msgstr "Flyd på toppen"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Download now"
@@@ -33011,7 -32942,7 +34746,11 @@@
#, fuzzy
#~ msgid "Old playlist export"
++<<<<<<< HEAD
+#~ msgstr "Eksport af M3U-spilleliste"
++=======
+ #~ msgstr "Import af M3U spilleliste"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Mac Text renderer"
@@@ -34479,7 -34410,7 +36218,11 @@@
#, fuzzy
#~ msgid "Input start time (seconds)"
++<<<<<<< HEAD
+#~ msgstr "SAP-tidsgrænse (sekunder)"
++=======
+ #~ msgstr "Input-gentagelser"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Preferred codecs list"
@@@ -35245,7 -35176,7 +36988,11 @@@
#, fuzzy
#~ msgid "Verbosity Level"
++<<<<<<< HEAD
+#~ msgstr "Detaljeniveau"
++=======
+ #~ msgstr "Detaljeniveau (0,1,2)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Embed video in interface"
diff --combined po/de.po
index 5dfe541,9f8b85e..651de03
--- a/po/de.po
+++ b/po/de.po
@@@ -21,7 -21,7 +21,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-20 09:20+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann at web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -152,7 -152,7 +156,11 @@@ msgstr "Verschiedene Audioeinstellunge
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -506,10 -506,10 +514,17 @@@ msgid "&About
msgstr "&Ãœber"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -548,17 -548,17 +563,29 @@@ msgid "Save...
msgstr "Speichern..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Alle wiederholen"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Eines wiederholen"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -667,7 -667,7 +694,11 @@@ msgstr "Die Maximalanzahl an Filtern (%
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Deaktivieren"
@@@ -1370,22 -1370,22 +1401,38 @@@ msgstr "Bildwiederholrate
msgid "Decoded format"
msgstr "Decodiertes Format"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Ihre Eingabe konnte nicht geöffnet werden"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Ihre Eingabe konnte nicht geöffnet werden"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC kann die MRL '%s' nicht öffnen. Sehen Sie für Details im Fehlerprotokoll "
"nach."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC kann das Eingabeformat nicht erkennen."
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC kann das Eingabeformat nicht erkennen."
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1823,7 -1823,7 +1870,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1912,7 -1912,7 +1963,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Kein"
@@@ -1943,7 -1943,7 +1998,11 @@@ msgstr "
"Dies ist die von VLC benutzte Videoausgabemethode. Das standardmäßige "
"Verhalten ist, die beste verfügbare Methode zu wählen."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Video aktivieren"
@@@ -2155,7 -2155,7 +2214,11 @@@ msgstr "
"benutzen."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Immer im Vordergrund"
@@@ -2212,7 -2212,7 +2275,11 @@@ msgstr "Mauscursor und Vollbildsteuerun
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2221,7 -2221,7 +2288,11 @@@ msgstr "Deinterlace
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Deinterlace-Modus"
@@@ -2279,7 -2279,7 +2350,11 @@@ msgstr "
"Unterbricht den Powermanagement-Daemon während jeglicher Wiedergabe, um die "
"Deaktivierung des Computers auf Grund von Inaktivität zu verhindern."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Fensterdekorationen"
@@@ -2482,7 -2482,7 +2557,11 @@@ msgstr "
"quadratische Pixel (1:1). Wenn Sie einen 16:9 Bildschirm haben, müssen Sie "
"dies eventuell ändern, um die Proportionen zu erhalten."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Frames überspringen"
@@@ -2630,12 -2630,12 +2709,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2643,7 -2643,7 +2731,11 @@@ msgid "Default
msgstr "Standard"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2999,7 -2999,7 +3091,11 @@@ msgid "You can completely disable the s
msgstr "Sie können die Verarbeitung von Unterbildern komplett deaktivieren."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3984,7 -3984,7 +4080,11 @@@ msgstr "
"Diese Einstellungen sind die globalen Tastenkürzel von VLC, bekannt als "
"\"Hotkeys\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignorieren"
@@@ -4010,8 -4010,8 +4110,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4091,10 -4091,10 +4196,17 @@@ msgid "Slower (fine)
msgstr "Langsamer (fein)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4108,10 -4108,10 +4220,17 @@@ msgstr "
"Wählen Sie den Hotkey zum Springen zum nächsten Objekt der Wiedergabeliste."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Vorheriges"
@@@ -4121,9 -4121,9 +4240,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"Wählen Sie den Hotkey zum Springen zum vorherigen Objekt der Wiedergabeliste."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4361,9 -4361,9 +4486,15 @@@ msgid "Select the key to decrease audi
msgstr "Wählen Sie den Hotkey zum Verringern der Lautstärke."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Ton aus"
@@@ -4791,7 -4791,7 +4922,11 @@@ msgstr "Durch die verfügbaren Audioger
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Schnappschuss"
@@@ -4998,12 -4998,12 +5133,21 @@@ msgstr "Herunterladen...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Abbrechen"
@@@ -5771,7 -5771,7 +5915,11 @@@ msgstr "Beschneiden
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Seitenverhältnis"
@@@ -8293,7 -8293,7 +8441,11 @@@ msgstr "Bildschirm-Input
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Bildschirm"
@@@ -9047,7 -9047,7 +9199,11 @@@ msgstr "Max. Lautstärke #
msgid "Volume Set"
msgstr "Eingestellte Lautstärke"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10241,7 -10241,7 +10397,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "ALSA-Audioausgabe"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Audioausgabe fehlgeschlagen"
@@@ -10274,7 -10274,7 +10434,11 @@@ msgstr "AudioQueue (iOS / Mac OS) Audio
msgid "Android AudioTrack audio output"
msgstr "Android Audiotitel-Audioausgabe"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "AudioUnit Ausgabe für iOS"
@@@ -10282,22 -10282,22 +10446,38 @@@
msgid "Last audio device"
msgstr "Letztes Audiogerät"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit-Ausgabe"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit-Ausgabe"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Das ausgewählte Audioausgabegerät wird gerade exklusiv von einem anderen "
"Programm benutzt."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Audiogerät ist nicht konfiguriert"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Audiogerät ist nicht konfiguriert"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10305,11 -10305,11 +10485,19 @@@ msgstr "
"Konfigurieren Sie ihre Lautsprecheranordnung mit dem \\\"Audio Midi-Setup\\"
"\"-Werkzeug unter /Programme/Werkzeuge. VLC wird nur Stereo ausgeben."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "System Audio-Ausgabegerät"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "System Audio-Ausgabegerät"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (encodierte Ausgabe)"
@@@ -11609,46 -11609,46 +11797,74 @@@ msgstr "Schatten
msgid "Outline"
msgstr "Kontur"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Schwarz"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Grau"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Silber"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Weiß"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Kastanienbraun"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Rot"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11656,61 -11656,61 +11872,97 @@@ msgid "Fuchsia
msgstr "Fuchsienfarben"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Gelb"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Oliv"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Grün"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Aquamarin"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Limone"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Violett"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Navy-Blau"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Blau"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11865,7 -11865,7 +12117,11 @@@ msgstr "Untertitel (erweitert)
msgid "Subtitle renderers using libass"
msgstr "Untertitel-Renderer, die libass verwenden"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Erzeuge Font-Cache"
@@@ -13893,10 -13893,10 +14149,17 @@@ msgid "Fast
msgstr "Schnell"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -14006,8 -14006,8 +14269,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus-Kontrollinterface"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14364,9 -14364,9 +14632,15 @@@ msgstr "Initialisieren
msgid "Opening"
msgstr "Öffnen"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pause"
@@@ -16320,7 -16320,7 +16594,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG Transport Stream-Demuxer"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -16509,7 -16509,7 +16787,11 @@@ msgid "VLC media player Help
msgstr "VLC media player Hilfe"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Index"
@@@ -16597,9 -16597,9 +16879,15 @@@ msgstr "Geben Sie einen Namen für das
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Speichern"
@@@ -16745,7 -16745,7 +17033,11 @@@ msgstr "
"Der Stream muss wiedergegeben werden oder pausiert sein, damit die "
"Lesezeichen funktionieren."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Zu Zeitpunkt springen"
@@@ -16765,7 -16765,7 +17057,11 @@@ msgstr "Klicken, um das aktuelle Mediu
msgid "Backward"
msgstr "Rückwärts"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16777,7 -16777,7 +17073,11 @@@ msgstr "
msgid "Forward"
msgstr "Vorwärts"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16801,25 -16801,15 +17101,37 @@@ msgstr "Vollbild-Modus umschalten
msgid "Click to enable fullscreen video playback."
msgstr "Klicken, um die Vollbildschirmwiedergabe zu aktivieren."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+"Klicken und halten Sie, um durch die aktuelle Medium zurück zu springen."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+"Klicken und halten Sie, um durch die aktuelle Medium nach vorn zu springen."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Klicken, um die Wiedergabe zu stoppen."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Wiedergabeliste ein-/ausblenden"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Klicken, um die Wiedergabe zu stoppen."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Wiedergabeliste ein-/ausblenden"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -16828,12 -16818,12 +17140,20 @@@ msgstr "
"wechseln. Falls kein Video im Hauptfenster angezeigt wird, können Sie so die "
"Wiedergabeliste verstecken."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Wiederholen"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -16841,15 -16831,15 +17161,27 @@@ msgstr "
"Klicken Sie, um den Wiederholungs-Modus zu ändern. Es gibt 3 Zustände: "
"einzeln wiederholen, alles wiederholen und aus."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Mischen"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "Klicken, um die zufällige Wiedergabe zu aktivieren oder deaktivieren."
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Mischen"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "Klicken, um die zufällige Wiedergabe zu aktivieren oder deaktivieren."
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -16857,24 -16847,24 +17189,44 @@@ msgstr "
"Klicken Sie und verschieben Sie die Maus während Sie die Taste gedrückt "
"halten, um diesen Schieberegler zum Ändern der Lautstärke zu benutzen."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Klicken, um das Audio stumm zu schalten oder wieder einzuschalten."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Volle Lautstärke"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Klicken, um das Audio mit höchster Lautstärke wiederzugeben."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Klicken, um das Audio stumm zu schalten oder wieder einzuschalten."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Volle Lautstärke"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Klicken, um das Audio mit höchster Lautstärke wiederzugeben."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Effekte"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -16882,14 -16872,24 +17234,35 @@@ msgstr "
"Klicken Sie, um einen Audio-Effektpanel mit einen Equalizer und weiteren "
"Filtern zu zeigen."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Klicken, um zum vorherigen Element der Wiedergabeliste zu gehen."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Klicken, um zum nächsten Element in der Wiedergabeliste zu gehen."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Klicken, um zum vorherigen Element der Wiedergabeliste zu gehen."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Klicken, um zum nächsten Element in der Wiedergabeliste zu gehen."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+ "Klicken und halten Sie, um durch die aktuelle Medium zurück zu springen."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+ "Klicken und halten Sie, um durch die aktuelle Medium nach vorn zu springen."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Konvertieren & Streamen"
@@@ -16925,7 -16925,7 +17298,11 @@@ msgstr "Wählen Sie einen Ausgabeort
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17115,8 -17115,8 +17492,13 @@@ msgid "A SDP export is requested, but n
msgstr "Ein SDP Export wurde angefragt, aber keine URL angegeben."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Eigenes"
@@@ -17218,37 -17218,37 +17600,69 @@@ msgstr "
msgid "Don't ask again"
msgstr "Nicht erneut fragen"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "VLC Medienwiedergabe"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Kein CrashLog gefunden"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "VLC Medienwiedergabe"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Kein CrashLog gefunden"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Fortfahren"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Konnte keine Spuren eines vorherigen Absturzes finden."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Alte Einstellungen entfernen?"
+
+#: modules/gui/macosx/intf.m:1937
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Konnte keine Spuren eines vorherigen Absturzes finden."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Alte Einstellungen entfernen?"
+
+ #: modules/gui/macosx/intf.m:1922
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "We just found an older version of VLC's preferences files."
msgstr ""
"Wir haben gerade eine alte Version von VLC's Einstellungsdatei gefunden."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "In den Papierkorb legen und VLC neustarten"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "In den Papierkorb legen und VLC neustarten"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC Debug-Protokoll (%s).rtf"
@@@ -17433,7 -17433,7 +17847,11 @@@ msgstr "
"Diese Option ermöglicht es dem Interface, sein Symbol bei verschiedenen "
"Gelegenheiten zu ändern."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Seitenverhältnis sperren"
@@@ -17565,7 -17565,7 +17983,11 @@@ msgstr "VLC ausblenden
msgid "Hide Others"
msgstr "Andere ausblenden"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Alle einblenden"
@@@ -17650,15 -17650,15 +18072,27 @@@ msgstr "Titel-Synchronisation
msgid "A→B Loop"
msgstr "A→B Schleife"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Nach Wiedergabe beenden"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Ein Stück vorwärts"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Nach Wiedergabe beenden"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Ein Stück vorwärts"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Ein Stück rückwärts"
@@@ -17674,30 -17674,30 +18108,56 @@@ msgstr "Leiser
msgid "Audio Device"
msgstr "Audiogerät"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Halbe Größe"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Normale Größe"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Doppelte Größe"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "An Bildschirm anpassen"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Halbe Größe"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Normale Größe"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Doppelte Größe"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "An Bildschirm anpassen"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Immer im Vordergrund"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Vollbildausgabegerät"
@@@ -17706,7 -17706,7 +18166,11 @@@
msgid "Post processing"
msgstr "Nachbearbeitung"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Untertiteldatei hinzufügen …"
@@@ -17947,7 -17947,7 +18411,11 @@@ msgid "Play another media synchronously
msgstr "Ein anderes Medium synchron wiedergeben"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Wählen..."
@@@ -18136,7 -18136,7 +18604,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Untertitelcodierung"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Schriftgröße"
@@@ -18365,12 -18365,12 +18837,20 @@@ msgstr "Fehler beim Speichern der Metad
msgid "VLC was unable to save the meta data."
msgstr "VLC war nicht in der Lage, die Metadaten zu speichern."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Einstellungen"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Standardwerte"
@@@ -18549,130 -18549,125 +19029,238 @@@ msgstr "Growl-Nachrichten aktivieren (n
msgid "Lua HTTP"
msgstr "Lua-HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "iTunes während der VLC-Wiedergabe pausieren"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Standardcodierung"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Anzeigeeinstellungen"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Standardcodierung"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Anzeigeeinstellungen"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Schriftfarbe"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Schrift"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Untertitelsprachen"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Untertitelsprachen"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Bevorzugte Untertitelsprache"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OSD aktivieren"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OSD aktivieren"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Deckkraft"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Fett erzwingen"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Fett erzwingen"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Kontur-Farbe"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Kontur-Stärke"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Bei Vollbild Bildschirme schwärzen"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Bei Vollbild Bildschirme schwärzen"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Anzeige"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Ausgabemodul"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Videoschnappschüsse"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Ordner"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Format"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Präfix"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Sequentielle Nummerierung"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Letzte Prüfung am: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Es wurde noch keine Prüfung durchgeführt."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Ausgabemodul"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Videoschnappschüsse"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Ordner"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Format"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Präfix"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Sequentielle Nummerierung"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Letzte Prüfung am: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Es wurde noch keine Prüfung durchgeführt."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Niedrigste Latenz"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Niedrige Latenz"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Hohe Latenz"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Höchste Latenz"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Einstellungen zurücksetzen"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18694,22 -18689,22 +19282,39 @@@ msgstr "
"\n"
"Sind Sie sicher, dass Sie fortfahren möchten?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Choose the folder to save your video snapshots to."
msgstr ""
"Wählen Sie den Ordner, in dem Ihre Videoschnappschüsse gespeichert werden "
"sollen."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Wählen"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Verzeichnis oder Dateiname, in dem die Aufnahmen gespeichert werden."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Wählen"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Verzeichnis oder Dateiname, in dem die Aufnahmen gespeichert werden."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18717,17 -18712,17 +19322,30 @@@ msgstr "
"Drücken Sie neue Tasten für\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Ungültige Kombination"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Ungültige Kombination"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"Leider können diese Tasten nicht als Hotkey-Tastenkürzel zugewiesen werden."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Diese Kombination ist bereits von \"%@\" belegt."
@@@ -20831,21 -20826,21 +21449,37 @@@ msgstr "Ausgewähltes Profil löschen
msgid "Create a new profile"
msgstr "Neues Profil erstellen"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Erstellen"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This muxer is not provided directly by VLC: It could be missing."
msgstr ""
"Dieser Muxer wird nicht direkt von VLC bereitgestellt: Er könnte fehlen."
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Profilname fehlt"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Profilname fehlt"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Sie müssen einen Namen für das Profil angeben"
@@@ -24449,23 -24444,23 +25083,43 @@@ msgstr "Streamausgabe transkodieren
msgid "Overlays/Subtitles"
msgstr "Einblendungen/Untertitel"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Monospace Schriftart"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Schriftarten-Familie für die Schrift, die Sie benutzen möchten"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Schriftartendatei für die Schrift, die Sie benutzen möchten"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Schriftgröße in Pixeln"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Monospace Schriftart"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Schriftarten-Familie für die Schrift, die Sie benutzen möchten"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Schriftartendatei für die Schrift, die Sie benutzen möchten"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Schriftgröße in Pixeln"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24475,11 -24470,11 +25129,19 @@@ msgstr "
"Wenn dies auf etwas anderes als 0 eingestellt ist, wird diese Option die "
"relative Schriftgröße überschreiben."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Text-Deckkraft"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Text-Deckkraft"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24487,12 -24482,12 +25149,20 @@@ msgstr "
"Die Deckkraft (Gegenteil von Transparenz) von eingeblendetem Text. 0 = "
"transparent, 255 = komplett undurchsichtig."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Text-Standardfarbe"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24505,12 -24500,12 +25175,20 @@@ msgstr "
"stehen für Rot, dann Grün und Blau. #000000 = Schwarz, #FF0000 = Rot, "
"#00FF00 = Grün, #FFFF00 = Gelb (Rot + Grün), #FFFFFF = Weiß"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Relative Schriftgröße"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24520,59 -24515,59 +25198,111 @@@ msgstr "
"werden. Wenn eine absolute Schriftgröße angegeben wird, wird die relative "
"Größe überschrieben."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Hintergrund-Deckkraft"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Hintergrund-Farbe"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Kontur-Deckkraft"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Schatten-Deckkraft"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Schatten-Farbe"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Schatten-Winkel"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Schatten-Abstand"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Hintergrund-Deckkraft"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Hintergrund-Farbe"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Kontur-Deckkraft"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Schatten-Deckkraft"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Schatten-Farbe"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Schatten-Winkel"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Schatten-Abstand"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Kleiner"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Klein"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Groß"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Größer"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "YUVP-Renderer benutzen"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "YUVP-Renderer benutzen"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24580,23 -24575,23 +25310,43 @@@ msgstr "
"Rendert eine Schrift mit Palettenfarben von YUV. Diese Option wird nur "
"benötigt, wenn Sie DVB-Subtitel codieren möchten."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Dünn"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Dick"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Textrenderer"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2-Schriftrenderer"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Dünn"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Dick"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Textrenderer"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2-Schriftrenderer"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/el.po
index 75a876f,037dace..89044bf
--- a/po/el.po
+++ b/po/el.po
@@@ -11,7 -11,7 +11,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-23 08:47+0000\n"
"Last-Translator: mstefanis <mstefanis at hotmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/vlc-trans/language/"
@@@ -145,7 -145,7 +149,11 @@@ msgstr "ΔιάφοÏες Ïυθμίσε
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -515,10 -515,10 +523,17 @@@ msgid "&About
msgstr "&ΠεÏί"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -557,17 -557,17 +572,29 @@@ msgid "Save...
msgstr "Αποθήκευση..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Επανάληψη όλων"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Επανάληψη ενός"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -677,7 -677,7 +704,11 @@@ msgstr "ΕπιτεÏχθηκε ο μÎÎ
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "ΑπενεÏγοποίηση"
@@@ -1384,22 -1384,22 +1415,38 @@@ msgstr "Ρυθμός καÏÎ
msgid "Decoded format"
msgstr "ΑποκωδικοποιημÎνος Ï„Ïπος"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Η είσοδός σας δεν μποÏεί να ανοιχτεί"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Η είσοδός σας δεν μποÏεί να ανοιχτεί"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"O VLC δεν είναι δυνατόν να ανοίξει το MRL '%s'. ΕλÎγξτε το καταγÏαφολόγιο "
"για λεπτομÎÏειες."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "Ο VLC δεν μποÏεί να αναγνωÏίσει τον Ï„Ïπο της εισόδου"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "Ο VLC δεν μποÏεί να αναγνωÏίσει τον Ï„Ïπο της εισόδου"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1842,7 -1842,7 +1889,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1932,7 -1932,7 +1983,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Καθόλου"
@@@ -1963,7 -1963,7 +2018,11 @@@ msgstr "
"Αυτή είναι η μÎθοδος εξόδου βίντεο που χÏησιμοποιεί ο VLC. Η Ï€ÏοεπιλεγμÎνη "
"συμπεÏιφοÏά είναι η αυτόματη επιλογή της καλÏτεÏης διαθÎσιμης μεθόδου."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "ΕνεÏγοποίηση βίντεο"
@@@ -2176,7 -2176,7 +2235,11 @@@ msgstr "
"χÏησιμοποιήσει από Ï€Ïοεπιλογή."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Πάντα στην κοÏυφή"
@@@ -2231,7 -2231,7 +2294,11 @@@ msgstr "ΑπόκÏυψη του κÎÏÏ
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2240,7 -2240,7 +2307,11 @@@ msgstr "Αποδιαπλοκή
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "ΛειτουÏγία αποδιαπλοκής"
@@@ -2300,7 -2300,7 +2371,11 @@@ msgstr "
"ΑναστÎλλει το δαίμονα διαχείÏισης ισχÏος κατά τη διάÏκεια οποιασδήποτε "
"αναπαÏαγωγής, για να αποφευχθεί η αδÏανοποίηση του υπολογιστή λόγω απÏαξίας."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Διακοσμήσεις παÏαθÏÏου"
@@@ -2510,7 -2510,7 +2585,11 @@@ msgstr "
"Îχουν τετÏάγωνα pixels (1:1). Εάν Îχετε οθόνη 16:9, ίσως χÏειαστείτε να τον "
"αλλάξετε σε 4:3 ώστε να διατηÏηθοÏν οι αναλογίες."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "ΠαÏάλειψη καÏÎ"
@@@ -2659,12 -2659,12 +2738,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2672,7 -2672,7 +2760,11 @@@ msgid "Default
msgstr "Î Ïοεπιλογή"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -3035,7 -3035,7 +3127,11 @@@ msgid "You can completely disable the s
msgstr "ΜποÏείτε να απενεÏγοποιήσετε πλήÏως την επεξεÏγασία της υποεικόνας."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -4042,7 -4042,7 +4138,11 @@@ msgstr "
"ΑυτÎÏ‚ οι Ïυθμίσεις είναι οι συνολικÎÏ‚ διαδÎσεις πλήκτÏων του VLC, γνωστÎÏ‚ "
"και ως \"πλήκτÏα συντόμευσης\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Αγνόηση"
@@@ -4069,8 -4069,8 +4169,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4163,10 -4163,10 +4268,17 @@@ msgid "Slower (fine)
msgstr "Πιο αÏγά (ακÏιβής ÏÏθμιση)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4181,10 -4181,10 +4293,17 @@@ msgstr "
"επόμενο στοιχείο της λίστας αναπαÏαγωγής."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Î ÏοηγοÏμενο"
@@@ -4195,9 -4195,9 +4314,15 @@@ msgstr "
"Επιλογή του πλήκτÏου συντόμευσης που θα χÏησιμοποιείται για υπεÏπήδηση στο "
"Ï€ÏοηγοÏμενο στοιχείο της λίστας αναπαÏαγωγής."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4452,9 -4452,9 +4577,15 @@@ msgid "Select the key to decrease audi
msgstr "Επιλογή του πλήκτÏου για τη μείωση της Îντασης ήχου."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Σίγαση"
@@@ -4879,7 -4879,7 +5010,11 @@@ msgstr "ΠεÏικÏκλωση διαθ
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Στιγμιότυπο οθόνης"
@@@ -5087,12 -5087,12 +5222,21 @@@ msgstr "Λήψη ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "ΆκυÏο"
@@@ -5860,7 -5860,7 +6004,11 @@@ msgstr "Αποκοπή
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Συντελεστής αναλογίας"
@@@ -8396,7 -8396,7 +8544,11 @@@ msgstr "Είσοδος οθόνης
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Οθόνη"
@@@ -9156,7 -9156,7 +9308,11 @@@ msgstr "ÎœÎγιστη Îνταση ήÏ
msgid "Volume Set"
msgstr "ΡÏθμιση Îντασης ήχου"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10360,7 -10360,7 +10516,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "Έξοδος ήχου ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Αποτυχία εξόδου ήχου"
@@@ -10393,7 -10393,7 +10553,11 @@@ msgstr "Έξοδος ήχου AudioQueu
msgid "Android AudioTrack audio output"
msgstr "Έξοδος ήχου Android AudioTrack"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "Έξοδος AudioUnit για το iOS"
@@@ -10401,21 -10401,21 +10565,37 @@@
msgid "Last audio device"
msgstr "Τελευταία συσκευή ήχου"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Έξοδος HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Έξοδος HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Η επιλεγμÎνη Îξοδος ήχου είναι αποκλειστικά σε χÏήση από άλλο Ï€ÏόγÏαμμα."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Η συσκευή ήχου δεν Ïυθμίστηκε"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Η συσκευή ήχου δεν Ïυθμίστηκε"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10423,11 -10423,11 +10603,19 @@@ msgstr "
"Θα Ï€ÏÎπει να Ïυθμίστε τη διάταξη των ηχείων σας με το \"Audio Midi Setup\" "
"στο /ΕφαÏμογÎÏ‚/Βοηθήματα. Ο VLC θα εξάγει μόνο στεÏεοφωνικό ήχο."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Συσκευή Εξόδου Ήχου Συστήματος"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Συσκευή Εξόδου Ήχου Συστήματος"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (ΚωδικοποιημÎνη Îξοδος)"
@@@ -11744,46 -11744,46 +11932,74 @@@ msgstr "ΣκιασμÎνο
msgid "Outline"
msgstr "ΠεÏίγÏαμμα"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "ΜαÏÏο"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "ΓκÏι"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Ασημί"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Λευκό"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "ΚαστανÎÏυθÏο"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Κόκκινο"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11791,61 -11791,61 +12007,97 @@@ msgid "Fuchsia
msgstr "ΦοÏξια"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "ΚίτÏινο"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Λαδί"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Î Ïάσινο"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "ΣκοÏÏο Ï€Ïάσινο"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Ανοιχτό Ï€Ïάσινο"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Μωβ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Μπλε μαÏÎν"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "ΜπλÎ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -12003,7 -12003,7 +12255,11 @@@ msgstr "Υπότιτλοι (για Ï€Ï
msgid "Subtitle renderers using libass"
msgstr "ΑποτυπωτÎÏ‚ υπότιτλων που χÏησιμοποιοÏν libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "ΔημιουÏγία κÏυφής μνήμης γÏαμματοσειÏάς"
@@@ -14080,10 -14080,10 +14336,17 @@@ msgid "Fast
msgstr "ΓÏήγοÏο"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Κανονικό"
@@@ -14195,8 -14195,8 +14458,13 @@@ msgid "D-Bus control interface
msgstr "Διεπαφή ελÎγχου D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14554,9 -14554,9 +14822,15 @@@ msgstr "ΈναÏξη
msgid "Opening"
msgstr "Άνοιγμα"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "ΠαÏση"
@@@ -16568,7 -16568,7 +16842,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "ΑποπολυπλÎκτης Ïοής δεδομÎνων μεταφοÏάς MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -16759,7 -16759,7 +17037,11 @@@ msgid "VLC media player Help
msgstr "Βοήθεια αναπαÏÎ±Î³Ï‰Î³Î¿Ï Ï€Î¿Î»Ï…Î¼Îσων VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "ΕυÏετήÏιο"
@@@ -16847,9 -16847,9 +17129,15 @@@ msgstr "Εισάγετε Îνα όνοÎ
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Αποθήκευση"
@@@ -16995,7 -16995,7 +17283,11 @@@ msgstr "
"Η Ïοή δεδομÎνων Ï€ÏÎπει να είναι σε κατάσταση αναπαÏαγωγής ή παÏσης για να "
"λειτουÏγήσουν οι σελιδοδείκτες."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Μεταπήδηση στο χÏόνο"
@@@ -17015,7 -17015,7 +17307,11 @@@ msgstr "Κάντε κλικ για αν
msgid "Backward"
msgstr "Î Ïος τα πίσω"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -17028,7 -17028,7 +17324,11 @@@ msgstr "
msgid "Forward"
msgstr "ΕμπÏός"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -17055,27 -17055,15 +17355,39 @@@ msgid "Click to enable fullscreen vide
msgstr ""
"Κάντε κλικ για να ενεÏγοποιήσετε την αναπαÏαγωγή βίντεο πλήÏους οθόνης."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+"Κάντε κλικ και κÏατήστε για να παÏαλείψετε Ï€Ïος τα πίσω μÎσα από το Ï„ÏÎχον "
+"πολυμÎσο."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+"Κάντε κλικ και κÏατήστε για να παÏαλείψετε Ï€Ïος τα εμπÏός μÎσα από το Ï„ÏÎχον "
+"πολυμÎσο."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Κάντε κλικ για να σταματήσετε την αναπαÏαγωγή."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Î Ïοβολή/ΑπόκÏυψη λίστας αναπαÏαγωγής"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Κάντε κλικ για να σταματήσετε την αναπαÏαγωγή."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Î Ïοβολή/ΑπόκÏυψη λίστας αναπαÏαγωγής"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -17084,12 -17072,12 +17396,20 @@@ msgstr "
"δεν Ï€Ïοβάλλεται βίντεο στο κÏÏιο παÏάθυÏο, σας δίνεται η δυνατότητα να "
"αποκÏÏψτε τη λίστα αναπαÏαγωγής."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Επανάληψη"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -17097,16 -17085,16 +17417,28 @@@ msgstr "
"Κάντε κλικ για να αλλάξετε τη λειτουÏγία επανάληψης. ΥπάÏχουν 3 καταστάσεις: "
"επανάληψη ενός, επανάληψη όλων και απενεÏγοποίηση."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Ανακάτεμα"
+
+#: modules/gui/macosx/ControlsBar.m:484
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Ανακάτεμα"
+
+ #: modules/gui/macosx/ControlsBar.m:450
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Click to enable or disable random playback."
msgstr ""
"Κάντε κλικ για να ενεÏγοποιήσετε ή απενεÏγοποιήσετε την τυχαία αναπαÏαγωγή."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -17114,24 -17102,24 +17446,44 @@@ msgstr "
"Κάντε κλικ και μετακινήστε το ποντίκι κÏατώντας πατημÎνο το κουμπί για να "
"χÏησιμοποιήσετε αυτό τον ολισθητή και να μεταβάλλετε την Îνταση του ήχου."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Κάντε κλικ για σίγαση ή αναίÏεση σίγασης του ήχου."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "ΠλήÏης Îνταση ήχου"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Κάντε κλικ για αναπαÏαγωγή του ήχου στην μÎγιστη Îνταση."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Κάντε κλικ για σίγαση ή αναίÏεση σίγασης του ήχου."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "ΠλήÏης Îνταση ήχου"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Κάντε κλικ για αναπαÏαγωγή του ήχου στην μÎγιστη Îνταση."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "ΕφÎ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -17139,16 -17127,28 +17491,39 @@@ msgstr "
"Κάντε κλικ για να Ï€Ïοβάλλετε Îνα πλαίσιο εφΠήχου με ισοσταθμιστή και άλλα "
"φίλτÏα."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Click to go to the previous playlist item."
msgstr ""
"Κάντε κλικ για μετάβαση στο Ï€ÏοηγοÏμενο αντικείμενο της λίστας αναπαÏαγωγής"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Click to go to the next playlist item."
msgstr ""
"Κάντε κλικ για μετάβαση στο επόμενο αντικείμενο της λίστας αναπαÏαγωγής"
++<<<<<<< HEAD
++=======
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+ "Κάντε κλικ και κÏατήστε για να παÏαλείψετε Ï€Ïος τα πίσω μÎσα από το Ï„ÏÎχον "
+ "πολυμÎσο."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+ "Κάντε κλικ και κÏατήστε για να παÏαλείψετε Ï€Ïος τα εμπÏός μÎσα από το Ï„ÏÎχον "
+ "πολυμÎσο."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "ΜετατÏοπή & Ροή δεδομÎνων"
@@@ -17184,7 -17184,7 +17559,11 @@@ msgstr "ΕπιλÎξτε τοποθεσ
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17375,8 -17375,8 +17754,13 @@@ msgid "A SDP export is requested, but n
msgstr "Απαιτείται μία εξαγωγή SDP αλλά δεν Îχει δοθεί URL."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Î ÏοσαÏμοσμÎνη"
@@@ -17480,36 -17480,36 +17864,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "Îα μην εÏωτηθώ ξανά"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "ΑναπαÏαγωγή πολυμÎσων VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Δεν βÏÎθηκε αÏχείο καταγÏαφής καταÏÏεÏσεων"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "ΑναπαÏαγωγή πολυμÎσων VLC"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Δεν βÏÎθηκε αÏχείο καταγÏαφής καταÏÏεÏσεων"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "ΣυνÎχεια"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "ΑδÏνατη η ανεÏÏεση ιχνών από Ï€ÏοηγοÏμενη κατάÏÏευση."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Îα απομακÏυνθοÏν οι παλιÎÏ‚ Ï€Ïοτιμήσεις;"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Μόλις βÏήκαμε μία παλαιότεÏη Îκδοση αÏχείων Ï€Ïοτιμήσεων του VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "ΜεταφοÏά στα αποÏÏίμματα και επανεκκίνηση του VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "ΑδÏνατη η ανεÏÏεση ιχνών από Ï€ÏοηγοÏμενη κατάÏÏευση."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Îα απομακÏυνθοÏν οι παλιÎÏ‚ Ï€Ïοτιμήσεις;"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Μόλις βÏήκαμε μία παλαιότεÏη Îκδοση αÏχείων Ï€Ïοτιμήσεων του VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "ΜεταφοÏά στα αποÏÏίμματα και επανεκκίνηση του VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "ΚαταγÏαφολόγιο αποσφαλμάτωσης VLC (%s).rtf"
@@@ -17694,7 -17694,7 +18110,11 @@@ msgstr "
"Αυτή η επιλογή επιτÏÎπει στη διεπαφή να αλλάξει το εικονίδιό της σε διάφοÏες "
"πεÏιστάσεις."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Κλείδωμα αναλογίας διαστάσεων"
@@@ -17828,7 -17828,7 +18248,11 @@@ msgstr "ΑπόκÏυψη του VLC
msgid "Hide Others"
msgstr "ΑπόκÏυψη των άλλων"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Î Ïοβολή όλων"
@@@ -17913,15 -17913,15 +18337,27 @@@ msgstr "ΣυγχÏονισμός κομ
msgid "A→B Loop"
msgstr "Î’Ïόχος A→B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Έξοδος μετά την αναπαÏαγωγή"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Βήμα εμπÏός"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Έξοδος μετά την αναπαÏαγωγή"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Βήμα εμπÏός"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Βήμα πίσω"
@@@ -17937,30 -17937,30 +18373,56 @@@ msgstr "Μείωση Îντασης ήÏ
msgid "Audio Device"
msgstr "Συσκευή ήχου"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Μισό μÎγεθος"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Κανονικό μÎγεθος"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Διπλάσιο μÎγεθος"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Î ÏοσαÏμογή στην οθόνη"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Μισό μÎγεθος"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Κανονικό μÎγεθος"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Διπλάσιο μÎγεθος"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Î ÏοσαÏμογή στην οθόνη"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Επίπλευση στην κοÏυφή"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Συσκευή βίντεο πλήÏους οθόνης"
@@@ -17969,7 -17969,7 +18431,11 @@@
msgid "Post processing"
msgstr "ΜετεπεξεÏγασία"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Î Ïοσθήκη αÏχείου υποτίτλων..."
@@@ -18210,7 -18210,7 +18676,11 @@@ msgid "Play another media synchronously
msgstr "ΤαυτόχÏονη αναπαÏαγωγή άλλων πολυμÎσων"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Επιλογή..."
@@@ -18402,7 -18402,7 +18872,11 @@@ msgstr "FPS (ΚαÏΠανά δευτε
msgid "Subtitle encoding"
msgstr "Κωδικοποίηση υποτίτλων"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "ÎœÎγεθος γÏαμματοσειÏάς"
@@@ -18631,12 -18631,12 +19105,20 @@@ msgstr "Σφάλμα κατά την α
msgid "VLC was unable to save the meta data."
msgstr "Ο VLC δεν ήταν ικανό να αποθηκεÏσει τα μεταδεδομÎνα."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Î Ïοτιμήσεις"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "ΕπαναφοÏά όλων"
@@@ -18817,130 -18817,125 +19299,238 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP του lua"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "ΠαÏση του iTunes κατά τη διάÏκεια της αναπαÏαγωγής του VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Î ÏοεπιλεγμÎνη κωδικοποίηση"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Ρυθμίσεις οθόνης"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Î ÏοεπιλεγμÎνη κωδικοποίηση"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Ρυθμίσεις οθόνης"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "ΧÏώμα γÏαμματοσειÏάς"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "ΓÏαμματοσειÏά"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Γλώσσες υπότιτλων"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Γλώσσες υπότιτλων"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Î Ïοτιμώμενη γλώσσα υποτίτλων"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "ΕνεÏγοποίηση εμφάνισης στην οθόνη (OSD)"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "ΕνεÏγοποίηση εμφάνισης στην οθόνη (OSD)"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Αδιαφάνεια"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Επιβολή Îντονων"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Επιβολή Îντονων"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "ΧÏώμα πεÏιγÏάμματος"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Πάχος πεÏιγÏάμματος"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "ΜαÏÏες οθόνες στη λειτουÏγία πλήÏους οθόνης"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "ΜαÏÏες οθόνες στη λειτουÏγία πλήÏους οθόνης"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Εμφάνιση"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Ενότητα εξόδου"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Στιγμιότυπα οθόνης"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Φάκελος"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "ΤÏπος"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Î Ïόθεμα"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Διαδοχική αÏίθμηση"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Τελευταίος Îλεγχος: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Ακόμα δεν Ï€Ïαγματοποιήθηκε Îλεγχος."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Ενότητα εξόδου"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Στιγμιότυπα οθόνης"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Φάκελος"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "ΤÏπος"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Î Ïόθεμα"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Διαδοχική αÏίθμηση"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Τελευταίος Îλεγχος: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Ακόμα δεν Ï€Ïαγματοποιήθηκε Îλεγχος."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Κατώτατη λανθάνουσα κατάσταση"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Χαμηλή λανθάνουσα κατάσταση"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Υψηλή λανθάνουσα κατάσταση"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "ΥψηλότεÏη λανθάνουσα κατάσταση"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "ΕπαναφοÏά Ï€Ïοτιμήσεων"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18963,23 -18958,23 +19553,40 @@@ msgstr "
"\n"
"Είστε σίγουÏοι ότι θÎλετε να συνεχίσετε;"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Choose the folder to save your video snapshots to."
msgstr ""
"ΕπιλÎξτε το φάκελο στον οποίο θα αποθηκευτοÏν τα στιγμιότυπα του βίντεο σας."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Επιλογή"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Επιλογή"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Choose the directory or filename where the records will be stored."
msgstr ""
"ΕπιλÎξετε τον κατάλογο ή το όνομα του αÏχείου όπου θα αποθηκευτοÏν οι "
"εγγÏαφÎÏ‚."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18987,17 -18982,17 +19594,30 @@@ msgstr "
"ΠιÎστε νÎα πλήκτÏα για\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Μη αποδεκτός συνδυασμός"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Μη αποδεκτός συνδυασμός"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"Δυστυχώς, αυτά τα πλήκτÏα δεν μποÏοÏν να εκχωÏηθοÏν ως πλήκτÏα συντομεÏσεων."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Αυτός ο συνδυασμός είναι ήδη κατειλημμÎνος από το \"%@\"."
@@@ -21128,20 -21123,20 +21748,36 @@@ msgstr "ΔιαγÏαφή επιλεγμ
msgid "Create a new profile"
msgstr "ΔημιουÏγία ενός νÎου Ï€Ïοφίλ"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "ΔημιουÏγία"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "Ο πολυπλÎκτης δεν παÏÎχεται άμεσα από τον VLC: ΜποÏεί να λείπει."
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Δεν υπάÏχει όνομα Ï€Ïοφίλ"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr "Ο πολυπλÎκτης δεν παÏÎχεται άμεσα από τον VLC: ΜποÏεί να λείπει."
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Δεν υπάÏχει όνομα Ï€Ïοφίλ"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Î ÏÎπει να Ïυθμίσετε Îνα όνομα για το Ï€Ïοφίλ."
@@@ -24788,25 -24783,25 +25424,45 @@@ msgstr "ΕπανακωδικοποίηÏ
msgid "Overlays/Subtitles"
msgstr "ΕπικαλÏψεις/Υπότιτλοι"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "ΓÏαμματοσειÏά Monospace"
+
+#: modules/text_renderer/freetype.c:158
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "ΓÏαμματοσειÏά Monospace"
+
+ #: modules/text_renderer/freetype.c:157
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Font family for the font you want to use"
msgstr ""
"ΟικογÎνεια γÏαμματοσειÏάς για τη γÏαμματοσειÏά που θÎλετε να χÏησιμοποιήσετε"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:159
++=======
+ #: modules/text_renderer/freetype.c:158
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Font file for the font you want to use"
msgstr ""
"ΑÏχείο γÏαμματοσειÏάς για τη γÏαμματοσειÏά που θÎλετε να χÏησιμοποιήσετε"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "ÎœÎγεθος γÏαμματοσειÏάς σε pixels"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "ÎœÎγεθος γÏαμματοσειÏάς σε pixels"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24816,11 -24811,11 +25472,19 @@@ msgstr "
"στο βίντεο. Εάν ÏυθμιστοÏν σε κάτι διαφοÏετικό από 0 αυτή η επιλογή θα "
"παÏακάμψει το σχετικό μÎγεθος γÏαμματοσειÏάς."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Αδιαφάνεια κειμÎνου"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Αδιαφάνεια κειμÎνου"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24828,12 -24823,12 +25492,20 @@@ msgstr "
"Η αδιαφάνεια (το αντίθετο της διαφάνειας) του κειμÎνου που θα αποτυπωθεί στο "
"βίντεο. 0 = διαφανÎÏ‚, 255 = τελείως αδιαφανÎÏ‚."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Î ÏοεπιλεγμÎνο χÏώμα κειμÎνου"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24847,12 -24842,12 +25519,20 @@@ msgstr "
"κόκκινο, #00FF00 = Ï€Ïάσινο, #FFFF00 = κίτÏινο (κόκκινο + Ï€Ïάσινο), #FFFFFF = "
"λευκό"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Σχετικό μÎγεθος γÏαμματοσειÏάς"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24862,59 -24857,59 +25542,111 @@@ msgstr "
"αποτυπωθοÏν στο βίντεο. Εάν οÏιστεί το απόλυτο μÎγεθος γÏαμματοσειÏάς, το "
"σχετικό μÎγεθος θα παÏακαμφθεί."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Αδιαφάνεια παÏασκηνίου"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "ΧÏώμα παÏασκηνίου"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Αδιαφάνεια πεÏιγÏάμματος"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Αδιαφάνεια σκιάς"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "ΧÏώμα σκιάς"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Γωνία σκιάς"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Απόσταση σκιάς"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Αδιαφάνεια παÏασκηνίου"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "ΧÏώμα παÏασκηνίου"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Αδιαφάνεια πεÏιγÏάμματος"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Αδιαφάνεια σκιάς"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "ΧÏώμα σκιάς"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Γωνία σκιάς"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Απόσταση σκιάς"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "ΜικÏότεÏο"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "ΜικÏÏŒ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Μεγάλο"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "ΜεγαλÏτεÏο"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "ΧÏήση αποτυπωτή YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "ΧÏήση αποτυπωτή YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24923,23 -24918,23 +25655,43 @@@ msgstr "
"Αυτή η επιλογή χÏειάζεται μόνο όταν θÎλετε να κωδικοποιήσετε σε υπότιτλους "
"DVB"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Λεπτό"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "ΠαχÏ"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Αποτυπωτής κειμÎνου"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Αποτυπωτής γÏαμματοσειÏάς Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Λεπτό"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "ΠαχÏ"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Αποτυπωτής κειμÎνου"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Αποτυπωτής γÏαμματοσειÏάς Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/en_GB.po
index eb43f06,f17713a..a28b1d7
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@@ -20,7 -20,7 +20,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2002-04-22 09:56+0200\n"
"Last-Translator: Sam Hocevar <sam at zoy.org>\n"
"Language-Team: \n"
@@@ -156,7 -156,7 +160,11 @@@ msgstr "Help options
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -498,10 -498,10 +506,17 @@@ msgid "&About
msgstr "_About…"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -547,19 -547,19 +562,31 @@@ msgid "Save...
msgstr "Save As…"
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Repeat All"
msgstr "Random Off"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Repeat One"
msgstr "Random Off"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -647,7 -647,7 +674,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Disable"
@@@ -1380,20 -1380,20 +1411,36 @@@ msgstr "Frame rate
msgid "Decoded format"
msgstr "Append to file"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1851,7 -1851,7 +1898,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1945,7 -1945,7 +1996,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr ""
@@@ -1976,7 -1976,7 +2031,11 @@@ msgstr "
"This option allows you to select the video output method used by VLC. The "
"default behaviour is to automatically select the best method available."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -2191,7 -2191,7 +2250,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr ""
@@@ -2247,7 -2247,7 +2310,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2256,7 -2256,7 +2323,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
#, fuzzy
msgid "Deinterlace mode"
@@@ -2315,7 -2315,7 +2386,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2512,7 -2512,7 +2587,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2662,12 -2662,12 +2741,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2675,7 -2675,7 +2763,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -3041,7 -3041,7 +3133,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3983,7 -3983,7 +4079,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Ignore"
msgstr "Codec"
@@@ -4011,8 -4011,8 +4111,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4100,10 -4100,10 +4205,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4116,10 -4116,10 +4228,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr ""
@@@ -4128,9 -4128,9 +4247,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4409,9 -4409,9 +4534,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4875,7 -4875,7 +5006,11 @@@ msgstr "Choose subtitle track
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -5083,12 -5083,12 +5218,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Cancel"
msgstr "Channels"
@@@ -5861,7 -5861,7 +6005,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "Codec setting"
@@@ -8441,7 -8441,7 +8589,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Screen"
msgstr "Scope"
@@@ -9267,7 -9267,7 +9419,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10494,7 -10494,7 +10650,11 @@@ msgstr "Dolby Surround
msgid "ALSA audio output"
msgstr "File audio output"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "Audio output URL"
@@@ -10531,7 -10531,7 +10691,11 @@@ msgstr "File audio output
msgid "Android AudioTrack audio output"
msgstr "Greyscale video output"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "File audio output"
@@@ -10541,33 -10541,33 +10705,57 @@@
msgid "Last audio device"
msgstr "Audio Device"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
++=======
+ #: modules/audio_output/auhal.c:166
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "HAL AudioUnit output"
msgstr "File audio output"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
++=======
+ #: modules/audio_output/auhal.c:578
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio device is not configured"
msgstr "Audio Device"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Audio Device"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -11871,27 -11871,27 +12059,43 @@@ msgstr "Random Off
msgid "Outline"
msgstr "Codec"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#, fuzzy
msgid "Black"
msgstr "Backwards"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Grey"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
#, fuzzy
msgid "Silver"
msgstr "Title"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
@@@ -11899,14 -11899,14 +12103,22 @@@
msgid "White"
msgstr "Title"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
@@@ -11914,7 -11914,7 +12126,11 @@@
msgid "Red"
msgstr "Append to file"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11922,14 -11922,14 +12138,22 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
#, fuzzy
@@@ -11937,7 -11937,7 +12161,11 @@@ msgid "Olive
msgstr "Codec"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11945,14 -11945,14 +12173,22 @@@
msgid "Green"
msgstr "Genre"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
#, fuzzy
msgid "Teal"
msgstr "Disable"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
@@@ -11960,28 -11960,28 +12196,44 @@@
msgid "Lime"
msgstr "Title"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
#, fuzzy
msgid "Purple"
msgstr "Stream "
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -12125,7 -12125,7 +12377,11 @@@ msgstr "DVB subtitles decoder
msgid "Subtitle renderers using libass"
msgstr "Subtitle demuxer settings"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -14065,10 -14065,10 +14321,17 @@@ msgid "Fast
msgstr "Date"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Normal"
@@@ -14192,8 -14192,8 +14455,13 @@@ msgid "D-Bus control interface
msgstr "Remote control interface"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14581,9 -14581,9 +14849,15 @@@ msgstr "Interlingue
msgid "Opening"
msgstr "Options:"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Pause"
msgstr "Date"
@@@ -16656,7 -16656,7 +16930,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "ISO 13818-1 MPEG Transport Stream demuxstream"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Teletext"
msgstr "DVB subtitles decoder"
@@@ -16860,7 -16860,7 +17138,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Index"
msgstr "PS demuxer"
@@@ -16962,9 -16962,9 +17244,15 @@@ msgstr "Destination video codec
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
#, fuzzy
msgid "Save"
@@@ -17117,7 -17117,7 +17405,11 @@@ msgstr "no input\n
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Jump To Time"
msgstr "Rate control buffer size"
@@@ -17140,7 -17140,7 +17432,11 @@@ msgstr "
msgid "Backward"
msgstr "&Backwards"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -17151,7 -17151,7 +17447,11 @@@ msgstr "
msgid "Forward"
msgstr "Backwards"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -17172,98 -17172,98 +17472,169 @@@ msgstr "Skinnable Interface
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr ""
"Select the key to go back (to the previous media item) in the browsing "
"history."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "&Shuffle Playlist"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "Random Off"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr ""
"Select the key to go back (to the previous media item) in the browsing "
"history."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "Next file"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
#, fuzzy
msgid "Effects"
msgstr "Random Off"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr "&Shuffle Playlist"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the next playlist item."
msgstr ""
"When this is active, VLC will keep playing the current playlist item over "
"and over again."
++<<<<<<< HEAD
++=======
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -17305,7 -17305,7 +17676,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17512,8 -17512,8 +17887,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
#, fuzzy
msgid "Custom"
@@@ -17616,40 -17616,40 +17996,72 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "Backwards"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
++=======
+ #: modules/gui/macosx/intf.m:1877
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "No CrashLog found"
msgstr "no input\n"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
#, fuzzy
msgid "Continue"
msgstr "Interlingue"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Remove old preferences?"
msgstr "VLC preferences"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -17811,7 -17811,7 +18223,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Lock Aspect Ratio"
msgstr "Codec setting"
@@@ -17960,7 -17960,7 +18376,11 @@@ msgstr "
msgid "Hide Others"
msgstr "Video title"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show All"
msgstr "&Shuffle Playlist"
@@@ -18059,17 -18059,17 +18479,29 @@@ msgstr "Clock synchronisation
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Quit after Playback"
msgstr "Backwards"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
++=======
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Step Forward"
msgstr "Backwards"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Step Backward"
msgstr "Backwards"
@@@ -18088,33 -18088,33 +18520,59 @@@ msgstr "Next file
msgid "Audio Device"
msgstr "Audio Device"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Half Size"
msgstr "Copy packetiser"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
++=======
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Normal Size"
msgstr "Copy packetiser"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
++=======
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Double Size"
msgstr "Copy packetiser"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Fullscreen Video Device"
msgstr "Video Device"
@@@ -18124,7 -18124,7 +18582,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Subtitles Track"
@@@ -18379,7 -18379,7 +18841,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Choose…"
@@@ -18573,7 -18573,7 +19039,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr "DVB subtitles decoder"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
#, fuzzy
msgid "Font size"
@@@ -18844,13 -18844,13 +19314,21 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
#, fuzzy
msgid "Preferences"
msgstr "VLC preferences"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Reset All"
msgstr "Date"
@@@ -19055,28 -19055,23 +19533,44 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Backwards"
+
+#: modules/gui/macosx/simple_prefs.m:377
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Default Encoding"
msgstr "Audio encoders settings"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:378
++=======
+ #: modules/gui/macosx/simple_prefs.m:377
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Display Settings"
msgstr "Display resolution"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
#, fuzzy
msgid "Font color"
msgstr "ffmpeg demuxer"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
@@@ -19084,119 -19079,119 +19578,211 @@@
msgid "Font"
msgstr "Video title"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Subtitles Track"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Language"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Enable OSD"
msgstr "Enable"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "Codec"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Black screens in Fullscreen mode"
msgstr ""
"Select the key to go back (to the previous media item) in the browsing "
"history."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
#, fuzzy
msgid "Display"
msgstr "File stream output"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Output module"
msgstr "Output modules"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
++=======
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Video snapshots"
msgstr "Video bitrate"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
++=======
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Folder"
msgstr "Title"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
++=======
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Format"
msgstr "Sample rate"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
++=======
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Prefix"
msgstr "Stream "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
#, fuzzy
msgid "Reset Preferences"
msgstr "VLC preferences"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -19209,39 -19204,39 +19795,69 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose"
msgstr "Choose file"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the directory or filename where the records will be stored."
msgstr ""
"Allows you to modify the user name that will be used for the connection."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Invalid combination"
msgstr "Resolution"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -21425,21 -21420,21 +22041,37 @@@ msgstr "Destination video codec
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
#, fuzzy
msgid "Create"
msgstr "Sample rate"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "You must set a name for the profile."
msgstr "Destination video codec"
@@@ -25202,47 -25197,47 +25834,83 @@@ msgstr "Transcode stream output
msgid "Overlays/Subtitles"
msgstr "Subtitles Track"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font size in pixels"
msgstr "Video title"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "Codec"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -25251,108 -25246,108 +25919,188 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
#, fuzzy
msgid "Relative font size"
msgstr "Rate control buffer size"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "Backwards"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "Backwards"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "Codec"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
++=======
+ #: modules/text_renderer/freetype.c:187
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow opacity"
msgstr "Random Off"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "Random Off"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
++=======
+ #: modules/text_renderer/freetype.c:189
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow angle"
msgstr "Random Off"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:191
++=======
+ #: modules/text_renderer/freetype.c:190
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow distance"
msgstr "Random Off"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Smaller"
msgstr "Scope"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Small"
msgstr "Scope"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Large"
msgstr "Language"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Larger"
msgstr "Language"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
++=======
+ #: modules/text_renderer/freetype.c:196
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Use YUVP renderer"
msgstr "Force a video rendering mode."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text renderer"
msgstr "Force a video rendering mode."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:220
++=======
+ #: modules/text_renderer/freetype.c:219
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Freetype2 font renderer"
msgstr "Force a video rendering mode."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/es.po
index b851be7,8ab1ddb..97fb601
--- a/po/es.po
+++ b/po/es.po
@@@ -19,8 -19,8 +19,13 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-22 19:55+0000\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-10-15 12:30+0000\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Last-Translator: picodotdev <pico.dev at gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/vlc-trans/"
"language/es/)\n"
@@@ -148,7 -148,7 +153,11 @@@ msgstr "Preferencias de audio y módulo
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -502,10 -502,10 +511,17 @@@ msgid "&About
msgstr "&Acerca de"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -544,17 -544,17 +560,29 @@@ msgid "Save...
msgstr "Guardar..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Repetir todo"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Repetir uno"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -661,7 -661,7 +689,11 @@@ msgstr "Se alcanzó el número máximo
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Deshabilitar"
@@@ -1091,7 -1091,7 +1123,11 @@@ msgstr "Parar medio
#: src/config/keys.c:101
msgid "Media Subtitle"
++<<<<<<< HEAD
+msgstr "SubtÃtulos de medio"
++=======
+ msgstr "SubtÃtulo de medio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:102
msgid "Media Time"
@@@ -1267,7 -1267,7 +1303,11 @@@ msgstr "Emisión %d
#: src/input/es_out.c:2872 src/input/es_out.c:2987 modules/access/imem.c:64
msgid "Subtitle"
++<<<<<<< HEAD
+msgstr "SubtÃtulos"
++=======
+ msgstr "SubtÃtulo"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/es_out.c:2880 src/input/es_out.c:2907 src/input/es_out.c:2951
#: src/input/es_out.c:2987 modules/gui/macosx/ConvertAndSave.m:197
@@@ -1365,21 -1365,21 +1405,37 @@@ msgstr "Tasa de fotogramas
msgid "Decoded format"
msgstr "Formato decodificado"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Su entrada no puede abrirse"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Su entrada no puede abrirse"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC es incapaz de abrir el MRL «%s». Vea el registro para más detalles."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC no puede reconocer el formato de entrada"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC no puede reconocer el formato de entrada"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1813,7 -1813,7 +1869,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1901,7 -1901,7 +1961,11 @@@ msgstr "Permite reproducir audio a meno
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Ninguno"
@@@ -1932,7 -1932,7 +1996,11 @@@ msgstr "
"Método de salida de vÃdeo usado por VLC. El modo predeterminado es "
"seleccionar automáticamente el mejor método posible."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Habilitar vÃdeo"
@@@ -2141,7 -2141,7 +2209,11 @@@ msgstr "
"(capacidad de generar vÃdeo directamente). VLC intentará usarla por defecto."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Siempre sobre todo"
@@@ -2197,7 -2197,7 +2269,11 @@@ msgstr "Ocultar cursor y controlador d
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2206,7 -2206,7 +2282,11 @@@ msgstr "Desentrelazar
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Modo de desentrelazado"
@@@ -2264,7 -2264,7 +2344,11 @@@ msgstr "
"Inhibe el administrador de energÃa durante cualquier reproducción, para "
"evitar que el ordenador se suspenda por inactividad."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Decoraciones de ventana"
@@@ -2470,7 -2470,7 +2554,11 @@@ msgstr "
"pÃxeles cuadrados (1:1). Si tienes pantalla de 16:9, podrÃa necesitar "
"cambiarse a 4:3 para mantener proporciones."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Saltar fotogramas"
@@@ -2618,12 -2618,12 +2706,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2631,7 -2631,7 +2728,11 @@@ msgid "Default
msgstr "Predeterminado"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2983,7 -2983,7 +3084,11 @@@ msgid "You can completely disable the s
msgstr "Puede deshabilitar completamente el proceso de subimágenes."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3858,7 -3858,7 +3963,11 @@@ msgstr "VLC se mantendrá reproduciend
#: src/libvlc-module.c:1141
msgid "Repeat current item"
++<<<<<<< HEAD
+msgstr "Repetir elemento actual"
++=======
+ msgstr "Repetir objeto actual"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1143
msgid "VLC will keep playing the current playlist item."
@@@ -3949,7 -3949,7 +4058,11 @@@ msgstr "
"Estas opciones son las teclas enlazadas globales de VLC, conocidas como "
"«atajos de teclado»."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignorar"
@@@ -3975,8 -3975,8 +4088,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4062,10 -4062,10 +4180,17 @@@ msgid "Slower (fine)
msgstr "Más lento (preciso)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4080,10 -4080,10 +4205,17 @@@ msgstr "
"reproducción."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Anterior"
@@@ -4094,9 -4094,9 +4226,15 @@@ msgstr "
"Seleccione el atajo de teclado para saltar al objeto anterior en la lista de "
"reproducción."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4334,9 -4334,9 +4472,15 @@@ msgid "Select the key to decrease audi
msgstr "Seleccionar tecla para bajar el volumen"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Silenciar"
@@@ -4703,7 -4703,7 +4847,11 @@@ msgstr "Normal/Bucle/Repetir
#: src/libvlc-module.c:1396
msgid "Toggle Normal/Loop/Repeat playlist modes"
++<<<<<<< HEAD
+msgstr "Cambiar entre modos normal/bucle/repetir"
++=======
+ msgstr "Cambia entre modos normal/bucle/repetir"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1399
msgid "Toggle random playlist playback"
@@@ -4763,7 -4763,7 +4911,11 @@@ msgstr "Rotar por los dispositivos de a
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Captura de pantalla"
@@@ -4969,12 -4969,12 +5121,21 @@@ msgstr "Descargando ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Cancelar"
@@@ -5740,7 -5740,7 +5901,11 @@@ msgstr "Recortar
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Proporción"
@@@ -8268,7 -8268,7 +8433,11 @@@ msgstr "Entrada de pantalla
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Pantalla"
@@@ -9024,7 -9024,7 +9193,11 @@@ msgstr "Vol máx #
msgid "Volume Set"
msgstr "Conjunto de volumen"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10136,7 -10136,7 +10309,11 @@@ msgid "
"the mono. If the value is 1 it will cancel all the signal common to both "
"channels."
msgstr ""
++<<<<<<< HEAD
+"DiafonÃa de derecha a izquierda con fase invertida. Esto ayuda al suprimir "
++=======
+ "DiafonÃa de derecha a izquierda con fase invertida. Esto ayuda suprimiendo "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"el audio mono. Si el valor es 1 se cancelarán todas las señales comunes en "
"ambos canales."
@@@ -10214,7 -10214,7 +10391,11 @@@ msgstr "Envolvente 7.1
msgid "ALSA audio output"
msgstr "Salida de audio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Falló salida de audio"
@@@ -10247,7 -10247,7 +10428,11 @@@ msgstr "Salida de audio AudioQueue (iO
msgid "Android AudioTrack audio output"
msgstr "Salida de audio Android AudioTrack"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "Salida AudioUnit para iOS"
@@@ -10255,22 -10255,22 +10440,38 @@@
msgid "Last audio device"
msgstr "Último dispositivo de audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Salida AudioUnit HAL"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Salida AudioUnit HAL"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"El dispositivo de salida de audio seleccionado está siendo usado "
"exclusivamente por otro programa."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "El dispositivo de audio no está configurado"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "El dispositivo de audio no está configurado"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10279,11 -10279,11 +10480,19 @@@ msgstr "
"«Configuración midi de audio» en /Aplicaciones/Utilidades. VLC emitirá solo "
"estéreo."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Dispositivo de salida de sistema de audio"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Dispositivo de salida de sistema de audio"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Salida codificada)"
@@@ -11575,46 -11575,46 +11784,74 @@@ msgstr "Sombra
msgid "Outline"
msgstr "Borde"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Negro"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Gris"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Plata"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Blanco"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Granate"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Rojo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11622,61 -11622,61 +11859,97 @@@ msgid "Fuchsia
msgstr "Fucsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Amarillo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Verde oliva"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Verde"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Verde azulado"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lima"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Púrpura"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Azul marino"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Azul"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11832,7 -11832,7 +12105,11 @@@ msgstr "SubtÃtulo (avanzado)
msgid "Subtitle renderers using libass"
msgstr "Generadores de subtÃtulos usando libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Construyendo caché de fuentes"
@@@ -12331,7 -12331,7 +12608,11 @@@ msgstr "Precisión del vector de movimi
#: modules/codec/schroedinger.c:208
msgid "Motion Vector precision in pels"
++<<<<<<< HEAD
+msgstr "Precisión del vector de movimiento en pels"
++=======
+ msgstr "Precisión del vector de movimiento en pels."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:261
msgid "perceptual weighting method"
@@@ -13812,9 -13812,9 +14093,15 @@@ msgid "
"Framecount to use on frametype lookahead. Currently default can cause sync-"
"issues on unmuxable output, like rtsp-output without ts-mux"
msgstr ""
++<<<<<<< HEAD
+"Framecount se usa en la búsqueda de FrameType. El predeterminado puede "
+"causar problemas de sincronización en la salida sin multiplexar, como la "
+"salida RSTP sin multiplexación TS."
++=======
+ "Framecount se usa en la búsqueda de FrameType. El actual predeterminado "
+ "puede causar problemas de sincronización en la salida sin multiplexar, como "
+ "la salida RSTP sin multiplexación TS."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:408
msgid "HRD-timing information"
@@@ -13861,10 -13861,10 +14148,17 @@@ msgid "Fast
msgstr "Rápido"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -13973,8 -13973,8 +14267,13 @@@ msgid "D-Bus control interface
msgstr "Interfaz de control D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14329,9 -14329,9 +14628,15 @@@ msgstr "Inicializando
msgid "Opening"
msgstr "Abriendo"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pausa"
@@@ -16283,7 -16283,7 +16588,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Demuxor de emisión de transporte MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletexto"
@@@ -16473,7 -16473,7 +16782,11 @@@ msgid "VLC media player Help
msgstr "Ayuda del reproductor multimedia VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Ãndice"
@@@ -16561,9 -16561,9 +16874,15 @@@ msgstr "Introduzca un nombre para el nu
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Guardar"
@@@ -16709,7 -16709,7 +17028,11 @@@ msgstr "
"La emisión debe estar reproduciéndose o en pausa para que funcionen los "
"favoritos."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Saltar a tiempo"
@@@ -16729,7 -16729,7 +17052,11 @@@ msgstr "Clic para reproducir o pausar e
msgid "Backward"
msgstr "Retroceder"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16741,7 -16741,7 +17068,11 @@@ msgstr "
msgid "Forward"
msgstr "Avance"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16765,26 -16765,15 +17096,38 @@@ msgstr "Intercambiar pantalla completa
msgid "Click to enable fullscreen video playback."
msgstr "Clic para habilitar reproducción de vÃdeo a pantalla completa."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+"Clic y mantenga pulsado para evitar ir hacia atrás a través del medio actual."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+"Clic y mantenga pulsado para evitar ir hacia adelante a través del medio "
+"actual."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Clic para detener la reproducción."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Mostrar/ocultar lista de reproducción"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Clic para detener la reproducción."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Mostrar/ocultar lista de reproducción"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -16793,12 -16782,12 +17136,20 @@@ msgstr "
"muestra vÃdeo en la ventana principal esto le permitirá ocultar la lista de "
"reproducción."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Repetir"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -16806,15 -16795,15 +17157,27 @@@ msgstr "
"Clic para cambiar modo de repetición. Hay 3 estados: Repetir uno, repetir "
"todos y apagado."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Barajar"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "Clic para habilitar o deshabilitar reproducción aleatoria."
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Barajar"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "Clic para habilitar o deshabilitar reproducción aleatoria."
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -16822,24 -16811,24 +17185,44 @@@ msgstr "
"Clic y mueva el ratón mientras mantiene el botón pulsado para usar esta "
"barra de desplazamiento para cambiar el volumen."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Clic para silenciar o quitar silencio del audio."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Volumen completo"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Clic para reproducir el audio al máximo volumen."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Clic para silenciar o quitar silencio del audio."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Volumen completo"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Clic para reproducir el audio al máximo volumen."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efectos"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -16847,14 -16836,25 +17230,36 @@@ msgstr "
"Clic para mostrar un panel de configuración de efectos de audio con un "
"ecualizador y más filtros."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Clic para ir al archivo de la lista de reproducción previa."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Clic para ir al archivo de la lista de reproducción siguiente."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Clic para ir al archivo de la lista de reproducción previa."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Clic para ir al archivo de la lista de reproducción siguiente."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+ "Clic y mantenga pulsado para evitar ir hacia atrás a través del medio actual."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+ "Clic y mantenga pulsado para evitar ir hacia adelante a través del medio "
+ "actual."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Convertir y transmision"
@@@ -16890,7 -16890,7 +17295,11 @@@ msgstr "Seleccione una ubicación de sa
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17080,8 -17080,8 +17489,13 @@@ msgstr "
"Se ha solicitado una exportación de SDP, pero no se ha proporcionado URL."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Personalizada"
@@@ -17183,38 -17183,38 +17597,70 @@@ msgstr "
msgid "Don't ask again"
msgstr "No pregunte de nuevo"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "Reproducción de medio VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "No se encontró registro de errores"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "Reproducción de medio VLC"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "No se encontró registro de errores"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Continuar"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "No se pudo hallar ningún vestigio de fallos previos."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "¿Eliminar preferencias antiguas?"
+
+#: modules/gui/macosx/intf.m:1937
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "No se pudo hallar ningún vestigio de fallos previos."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "¿Eliminar preferencias antiguas?"
+
+ #: modules/gui/macosx/intf.m:1922
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "We just found an older version of VLC's preferences files."
msgstr ""
"Se ha encontrado una versión más antigua de los archivos de preferencias de "
"VLC."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Mover a la papelera y reiniciar VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Mover a la papelera y reiniciar VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "Registro de depuración VLC (%s).rtf"
@@@ -17402,7 -17402,7 +17848,11 @@@ msgid "
msgstr ""
"Esta opción permite a la interfaz cambiar sus Ãconos en varias ocasiones."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Bloquear proporción"
@@@ -17534,7 -17534,7 +17984,11 @@@ msgstr "Ocultar VLC
msgid "Hide Others"
msgstr "Ocultar otros"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Mostrar todo"
@@@ -17619,15 -17619,15 +18073,27 @@@ msgstr "Sincronización de pista
msgid "A→B Loop"
msgstr "Bucle A→B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Salir después de reproducir"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Salto adelante"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Salir después de reproducir"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Salto adelante"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Salto atrás"
@@@ -17643,30 -17643,30 +18109,56 @@@ msgstr "Bajar volumen
msgid "Audio Device"
msgstr "Dispositivo de audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Mitad de tamaño"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Tamaño normal"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Tamaño doble"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Ajustar a pantalla"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Mitad de tamaño"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Tamaño normal"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Tamaño doble"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Ajustar a pantalla"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Flotar sobre todo"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Dispositivo de vÃdeo a pantalla completa"
@@@ -17675,7 -17675,7 +18167,11 @@@
msgid "Post processing"
msgstr "Post-Proceso"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Añadir archivo de subtÃtulos..."
@@@ -17829,7 -17829,7 +18325,11 @@@ msgstr "Darse de baja de un podcast
#: modules/gui/macosx/MainWindow.m:182
msgid "Select the podcast you would like to unsubscribe from:"
++<<<<<<< HEAD
+msgstr "Seleccionar el podcast del que desee darse de baja:"
++=======
+ msgstr "Seleccione el podcast que usted desea darse de baja:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainWindow.m:219
msgid "LIBRARY"
@@@ -17915,7 -17915,7 +18415,11 @@@ msgid "Play another media synchronously
msgstr "Reproducir otro medio de forma sincronizada"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Seleccionar..."
@@@ -18103,7 -18103,7 +18607,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Codificación de subtÃtulos"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Tamaño de fuente"
@@@ -18332,12 -18332,12 +18840,20 @@@ msgstr "Error al guardar metadatos
msgid "VLC was unable to save the meta data."
msgstr "VLC fue incapaz de guardar los metadatos."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Preferencias"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Restaurar todo"
@@@ -18518,130 -18518,125 +19034,238 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Pausar iTunes durante la reproducción de VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Codificación predeterminada"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Preferencias de pantalla"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Codificación predeterminada"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Preferencias de pantalla"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Color de fuente"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Fuente"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Idiomas de subtÃtulos"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Idiomas de subtÃtulos"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Idioma de subtÃtulos preferido"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Habilitar OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Habilitar OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Opacidad"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Forzar negrita"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Forzar negrita"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Color del borde"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Grosor del borde"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Pantallas negras en modo pantalla completa"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Pantallas negras en modo pantalla completa"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Pantalla"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Módulo de salida"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Capturas de vÃdeo"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Carpeta"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Formato"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefijo"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Numeración secuencial"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Última comprobación el: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "No se hizo ninguna comprobación aún."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Módulo de salida"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Capturas de vÃdeo"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Carpeta"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Formato"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefijo"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Numeración secuencial"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Última comprobación el: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "No se hizo ninguna comprobación aún."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "La menor latencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Baja latencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Alta latencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "La mayor latencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Restaurar preferencias"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18663,23 -18658,23 +19287,40 @@@ msgstr "
"\n"
"¿Está seguro de que desea continuar?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Choose the folder to save your video snapshots to."
msgstr ""
"Seleccionar la carpeta donde guardar sus capturas de pantalla de vÃdeo."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Seleccionar"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Seleccionar"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Choose the directory or filename where the records will be stored."
msgstr ""
"Seleccionar la carpeta o nombre de archivo donde se guardarán las "
"grabaciones."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18687,17 -18682,17 +19328,30 @@@ msgstr "
"Pulse nuevas teclas para\n"
"«%@»"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Combinación no válida"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Combinación no válida"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"Lamentablemente, esas teclas no pueden asignarse como atajos de teclado."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Esta combinación ya está usada por «%@»."
@@@ -18967,7 -18962,7 +19621,11 @@@ msgstr "Posterizar
#: modules/gui/macosx/VideoEffects.m:154 modules/video_filter/posterize.c:60
msgid "Posterize level"
++<<<<<<< HEAD
+msgstr "Nivel de posterización"
++=======
+ msgstr "Nivel de Posterizacion"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:155 modules/video_filter/motionblur.c:59
#: modules/gui/qt4/ui/video_effects.h:1387
@@@ -19915,7 -19910,7 +20573,11 @@@ msgstr "Shift+L
#: modules/gui/qt4/components/controller.cpp:444
msgid "Click to toggle between loop all, loop one and no loop"
++<<<<<<< HEAD
+msgstr "Repetir una vez o indefinidamente"
++=======
+ msgstr "Repetir una vez o repetir indefinidamente"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.cpp:535
msgid "Previous Chapter/Title"
@@@ -20008,8 -20003,8 +20670,13 @@@ msgstr "
#: modules/gui/qt4/components/controller.hpp:126
msgid "Next media in the playlist, skip forward when held"
msgstr ""
++<<<<<<< HEAD
+"Medio siguiente en lista de reproducción, salta hacia adelante manteniéndolo "
+"presionado"
++=======
+ "Medio siguiente en lista de reproducción, saltar hacia adelante "
+ "manteniéndolo presionado"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:127
msgid "Toggle the video in fullscreen"
@@@ -20058,7 -20053,7 +20725,11 @@@ msgstr "Medio siguiente en lista de rep
#: modules/gui/qt4/components/controller.hpp:134
#: modules/gui/qt4/components/open_panels.cpp:252
msgid "Open subtitle file"
++<<<<<<< HEAD
+msgstr "Abrir archivo de subtÃtulos"
++=======
+ msgstr "Abrir fichero subtÃtulos"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:135
msgid "Dock/undock fullscreen controller to/from bottom of screen"
@@@ -20779,21 -20774,21 +21450,37 @@@ msgstr "Borrar el perfil seleccionado
msgid "Create a new profile"
msgstr "Crear un nuevo perfil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Crear"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This muxer is not provided directly by VLC: It could be missing."
msgstr ""
"Este muxer no se proporciona directamente por VLC: Puede estar perdido."
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Nombre de perfil ausente"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Nombre de perfil ausente"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Debe establecer un nombre para archivo para el perfil."
@@@ -21507,7 -21502,7 +22194,11 @@@ msgstr "Repetir:
#: modules/gui/qt4/dialogs/vlm.cpp:86
msgid "Repeat delay:"
++<<<<<<< HEAD
+msgstr "Retraso repetición:"
++=======
+ msgstr "Repetir retraso:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/vlm.cpp:111
#: modules/gui/qt4/ui/sprefs_interface.h:540
@@@ -24365,23 -24360,23 +25056,43 @@@ msgstr "Transcodificar salida de emisiÃ
msgid "Overlays/Subtitles"
msgstr "Superposiciones/SubtÃtulos"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Fuente monoespacio"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Familia de la fuente a usar"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Archivo de fuente para la fuente que desea utilizar"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Tamaño de fuente en pÃxels"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Fuente monoespacio"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Familia de la fuente a usar"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Archivo de fuente para la fuente que desea utilizar"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Tamaño de fuente en pÃxels"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24390,11 -24385,11 +25101,19 @@@ msgstr "
"Tamaño predeterminado de las fuentes a generar sobre el vÃdeo. Si se pone "
"algo distinto a 0, esta opción anulará el tamaño relativo de fuente."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Opacidad del texto"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Opacidad del texto"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24402,12 -24397,12 +25121,20 @@@ msgstr "
"La opacidad (opuesto de transparencia) de texto a generar sobre el vÃdeo. 0 "
"= transparente, 255 = totalmente opaco."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Color de texto predeterminado"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24416,12 -24411,12 +25143,20 @@@
"(red + green), #FFFFFF = white"
msgstr "El color del texto que se generará en el vÃdeo."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Tamaño relativo de la fuente"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24430,59 -24425,59 +25165,111 @@@ msgstr "
"Tamaño relativo predeterminado de las fuentes que se generan en el vÃdeo. Si "
"se establece un tamaño de fuente absoluto, el tamaño relativo será anulado."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Opacidad de fondo"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Color de fondo"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Opacidad del borde"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Opacidad de sombra"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Color de sombra"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Ãngulo de sombra"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Distancia de sombra"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Opacidad de fondo"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Color de fondo"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Opacidad del borde"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Opacidad de sombra"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Color de sombra"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Ãngulo de sombra"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Distancia de sombra"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Más pequeña"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Pequeña"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Grande"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Más grande"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Usar generador YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Usar generador YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24490,23 -24485,23 +25277,43 @@@ msgstr "
"Esto genera la fuente usando «YUV paletizado». Esta opción solo se necesita "
"si quiere codificar con subtÃtulos DVB"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Fina"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Grueso"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Generador de texto"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Generador de fuente Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Fina"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Grueso"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Generador de texto"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Generador de fuente Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -24697,7 -24692,7 +25504,11 @@@ msgstr "Número de fotogramas considera
#: modules/video_filter/antiflicker.c:66
msgid "antiflicker video filter"
++<<<<<<< HEAD
+msgstr "Filtro de vÃdeo antiparpadeo"
++=======
+ msgstr "Filtro de video anti parpadeo"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/antiflicker.c:67
msgid "antiflicker"
@@@ -25945,11 -25940,11 +26756,19 @@@ msgstr "Fuerza usada para modificar el
#: modules/video_filter/gradfun.c:58
msgid "Gradfun video filter"
++<<<<<<< HEAD
+msgstr "Filtro de vÃdeo Gradfun"
+
+#: modules/video_filter/gradfun.c:59
+msgid "Gradfun"
+msgstr "Gradfun"
++=======
+ msgstr "Filtro de vÃdeo «gradfun»"
+
+ #: modules/video_filter/gradfun.c:59
+ msgid "Gradfun"
+ msgstr "«gradfun»"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/gradfun.c:60
msgid "Debanding algorithm"
@@@ -26057,11 -26052,11 +26876,19 @@@ msgstr "Intensidad de chroma temporal (
#: modules/video_filter/hqdn3d.c:63
msgid "HQ Denoiser 3D"
++<<<<<<< HEAD
+msgstr "Reductor de ruido HQ 3D"
+
+#: modules/video_filter/hqdn3d.c:64
+msgid "High Quality 3D Denoiser filter"
+msgstr "Filtro reductor de rudio de alta calidad 3D "
++=======
+ msgstr "Reductor de Ruido HQ 3D"
+
+ #: modules/video_filter/hqdn3d.c:64
+ msgid "High Quality 3D Denoiser filter"
+ msgstr "Filtro de Reductor de Rudio de Alta Calidad 3D "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/invert.c:50
msgid "Invert video filter"
@@@ -29490,6 -29485,9 +30317,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Lista del administrador multimedia"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Mostrar detalles"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -33700,16 -33698,12 +34533,23 @@@
#~ msgstr "intentando añadir %s a lista de repr.\n"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Detalles de códec"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Data search path"
#~ msgstr "Búsqueda de gradientes bitmap"
#, fuzzy
#~ msgid "Toggle Normal/Repeat/Loop playlist modes"
++<<<<<<< HEAD
+#~ msgstr "Cambiar entre modos normal/bucle/repetir"
++=======
+ #~ msgstr "Cambia entre modos normal/bucle/repetir"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
@@@ -34100,7 -34094,7 +34940,11 @@@
#, fuzzy
#~ msgid "Select current widget"
++<<<<<<< HEAD
+#~ msgstr "Repetir elemento actual"
++=======
+ #~ msgstr "Repetir objeto actual"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "CPU"
@@@ -35092,7 -35086,7 +35936,11 @@@
#, fuzzy
#~ msgid "Next media in the playlist, skip forward when keep-pressed"
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Medio siguiente en lista de reproducción, salta hacia adelante "
++=======
+ #~ "Medio siguiente en lista de reproducción, saltar hacia adelante "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "manteniéndolo presionado"
#, fuzzy
@@@ -35101,7 -35095,7 +35949,11 @@@
#, fuzzy
#~ msgid "Open subtitles file"
++<<<<<<< HEAD
+#~ msgstr "Abrir archivo de subtÃtulos"
++=======
+ #~ msgstr "Abrir fichero subtÃtulos"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Preamp\n"
@@@ -37935,7 -37929,7 +38787,11 @@@
#, fuzzy
#~ msgid "Show the current item"
++<<<<<<< HEAD
+#~ msgstr "Repetir elemento actual"
++=======
+ #~ msgstr "Repetir objeto actual"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Audio Port"
diff --combined po/et.po
index ca3cc0b,949b390..21564bf
--- a/po/et.po
+++ b/po/et.po
@@@ -11,9 -11,9 +11,15 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-08 08:16+0000\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-08-25 18:40+0000\n"
+ "Last-Translator: mihkel <turakas at gmail.com>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Estonian (http://www.transifex.com/projects/p/vlc-trans/"
"language/et/)\n"
"Language: et\n"
@@@ -140,7 -140,7 +146,11 @@@ msgstr "Mitmesugused audio seaded ja mo
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -483,10 -483,10 +493,17 @@@ msgid "&About
msgstr "&Programmist"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -525,17 -525,17 +542,29 @@@ msgid "Save...
msgstr "Salvestamine..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Korda kõiki"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Korda ühte"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -640,7 -640,7 +669,11 @@@ msgstr "Maksimaalne lubatud filtrite ar
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Keelatud"
@@@ -1339,20 -1339,20 +1372,36 @@@ msgstr "Kaadrisagedus
msgid "Decoded format"
msgstr "Dekodeeritud vorming"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Määratud sisendit ei suudetud avada"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Määratud sisendit ei suudetud avada"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC ei suuda avada MRL-i '%s'. Vaata logist täpsemaid põhjuseid."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC ei tunne sisendi vormingut"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC ei tunne sisendi vormingut"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1781,7 -1781,7 +1830,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1869,7 -1869,7 +1922,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Puudub"
@@@ -1900,7 -1900,7 +1957,11 @@@ msgstr "
"See on VLC poolt kasutatav videoväljundi meetod. Vaikimisi valitakse parim "
"saadaolev meetod."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Video on lubatud"
@@@ -2109,7 -2109,7 +2170,11 @@@ msgstr "
"videot otse renderdada). Vaikimisi üritab VLC seda kasutada."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Alati pealmine"
@@@ -2160,7 -2160,7 +2225,11 @@@ msgstr "Peida kursor ja täisekraani ko
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2169,7 -2169,7 +2238,11 @@@ msgstr "Ãœlerealaotuse eemldamine
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Ülerealaotuse eemaldamise režiim"
@@@ -2227,7 -2227,7 +2300,11 @@@ msgstr "
"Tõkestab vooluhaldusteenuse igasuguse taasesitamise ajaks, vältimaks arvuti "
"peatamist tegevusetuse tõttu."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Akna dekoratsioonid"
@@@ -2427,7 -2427,7 +2504,11 @@@ msgstr "
"pikslid (1:1). Kui sul on 16:9 ekraan, siis võid muuta selle siin 4:3-ks, et "
"säilitada proportsioone."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Kaadrite vahelejätmine"
@@@ -2571,12 -2571,12 +2652,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2584,7 -2584,7 +2674,11 @@@ msgid "Default
msgstr "Vaikimisi"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2920,7 -2920,7 +3014,11 @@@ msgid "You can completely disable the s
msgstr "Sa saad täielikult keelata pildipealdiste töötlemise."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3827,7 -3827,7 +3925,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "Need sätted on globaalsed VLC klahviseosed e kiirklahvid."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Eiratakse"
@@@ -3851,8 -3851,8 +3953,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3932,10 -3932,10 +4039,17 @@@ msgid "Slower (fine)
msgstr "Pisut aeglasemalt"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3948,10 -3948,10 +4062,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Vali kiirklahv, mis hüppab esitusloendi järgmisele kirjele."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Eelmine"
@@@ -3960,9 -3960,9 +4081,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "Vali kiirklahv, mis hüppab esitusloendi eelmisele kirjele."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4197,9 -4197,9 +4324,15 @@@ msgid "Select the key to decrease audi
msgstr "Vali kiirklahv helivaljuse vähendamiseks."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Vaigistamine"
@@@ -4613,7 -4613,7 +4746,11 @@@ msgstr "Saadaolevate heliseadmete vahe
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Kaadripilt"
@@@ -4820,12 -4820,12 +4957,21 @@@ msgstr "Allalaadimine...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Loobu"
@@@ -5591,7 -5591,7 +5737,11 @@@ msgstr "Kärpimine
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Külgede suhe"
@@@ -7967,7 -7967,7 +8117,11 @@@ msgstr "Ekraani sisend
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Ekraan"
@@@ -8709,7 -8709,7 +8863,11 @@@ msgstr "Vol max #
msgid "Volume Set"
msgstr "Helitase määratud"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9862,7 -9862,7 +10020,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "ALSA audioväljund"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Audio väljastamine nurjus"
@@@ -9895,7 -9895,7 +10057,11 @@@ msgstr "AudioQueue (iOS / Mac OS) audio
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9903,30 -9903,30 +10069,54 @@@
msgid "Last audio device"
msgstr "Viimane audioseade"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit väljund"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit väljund"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr "Valitud audioväljundi seade on teise rakenduse poolt kasutuses."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Audioseade ei ole häälestatud"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Audioseade ei ole häälestatud"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (kodeeritud väljund)"
@@@ -11160,46 -11160,46 +11350,74 @@@ msgstr "Vari
msgid "Outline"
msgstr "Piirjoon"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Must"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Hall"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Hõbedane"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Valge"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Kastanpruun"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Punane"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11207,61 -11207,61 +11425,97 @@@ msgid "Fuchsia
msgstr "Fuksia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Kollane"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Oliiv"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Roheline"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Sinakasroheline"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Laim"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Lilla"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Merevägi"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Sinine"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11410,7 -11410,7 +11664,11 @@@ msgstr "Subtiitrid (laiendatud)
msgid "Subtitle renderers using libass"
msgstr "Subtiitrite renderdajad, kasutades libass-i"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Fontide puhvri loomine"
@@@ -13309,10 -13309,10 +13567,17 @@@ msgid "Fast
msgstr "Kiire"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Tavaline"
@@@ -13421,8 -13421,8 +13686,13 @@@ msgid "D-Bus control interface
msgstr "D-Busi kaudu juhtimise liides"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13767,9 -13767,9 +14037,15 @@@ msgstr "Lähtestamine
msgid "Opening"
msgstr "Avamine"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pausi"
@@@ -15679,7 -15679,7 +15955,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG Transpordi voo demukser"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletekst"
@@@ -15858,7 -15858,7 +16138,11 @@@ msgid "VLC media player Help
msgstr "VLC meediaesitaja abi"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Sisukord"
@@@ -15946,9 -15946,9 +16230,15 @@@ msgstr "Sisesta uue profiili nimi:
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Salvesta"
@@@ -16091,7 -16091,7 +16381,11 @@@ msgstr "Sisendit ei leitud
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Voog peab mängima või olema pausitud, et järjehoidjad töötaksid."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Hüppa kindale ajale"
@@@ -16111,7 -16111,7 +16405,11 @@@ msgstr "
msgid "Backward"
msgstr "Tagasi"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16121,7 -16121,7 +16419,11 @@@ msgstr "
msgid "Forward"
msgstr "Edasi"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16141,84 -16141,84 +16443,155 @@@ msgstr "Täisekraanvaate lülitamine
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Klõpsa taasesitamise peatamiseks."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Esitusloendi näitamine/peitmine"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Klõpsa taasesitamise peatamiseks."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Esitusloendi näitamine/peitmine"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Korda"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Sega"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Sega"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Täis helitase"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Täis helitase"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efektid"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16254,7 -16254,7 +16627,11 @@@ msgstr "Vali väljundi asukoht
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16439,8 -16439,8 +16816,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Oma"
@@@ -16540,36 -16540,36 +16922,68 @@@ msgstr "Ainult sinu vaikimisi e-posti a
msgid "Don't ask again"
msgstr "Ära küsi uuesti"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "CrashLog-i ei leitud"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "CrashLog-i ei leitud"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Jätka"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Ei suudetud leida ühtegi jälge eelnevast kokkujooksmisest."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Eemaldada vanad eelistused?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Me leidisme just vanema versiooni VLC eelistuste failist."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Liiguta prügikasti ja taaskäivita VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Ei suudetud leida ühtegi jälge eelnevast kokkujooksmisest."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Eemaldada vanad eelistused?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Me leidisme just vanema versiooni VLC eelistuste failist."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Liiguta prügikasti ja taaskäivita VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16733,7 -16733,7 +17147,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr "See valik lubab liidesel muuta oma ikoone erinevatel juhtudel."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Külgede suhe lukus"
@@@ -16862,7 -16862,7 +17280,11 @@@ msgstr "Peida VLC
msgid "Hide Others"
msgstr "Peida teised"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Näita kõiki"
@@@ -16947,15 -16947,15 +17369,27 @@@ msgstr "Radade sünkroonimine
msgid "A→B Loop"
msgstr "A→B kordus"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Lõpetamine pärast esitamist"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Astu edasi"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Lõpetamine pärast esitamist"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Astu edasi"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Astu tagasi"
@@@ -16971,30 -16971,30 +17405,56 @@@ msgstr "Heli vaiksemaks
msgid "Audio Device"
msgstr "Audioseade"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Pool suurust"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Normaalsuurus"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Topelt suurus"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Ekraanile mahutamine"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Pool suurust"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Normaalsuurus"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Topelt suurus"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Ekraanile mahutamine"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Kohal hõljumine"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Täisekraan-videoseade"
@@@ -17003,7 -17003,7 +17463,11 @@@
msgid "Post processing"
msgstr "Järeltöötlus"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Subtiitrite faili lisamine..."
@@@ -17231,7 -17231,7 +17695,11 @@@ msgid "Play another media synchronously
msgstr "Esita mõnda teist meediat sünkroonselt"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Vali..."
@@@ -17413,7 -17413,7 +17881,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Subtiitrite kodeering"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Kirja suurus"
@@@ -17642,12 -17642,12 +18114,20 @@@ msgstr "Viga meta salvestamisel
msgid "VLC was unable to save the meta data."
msgstr "Metaandmete salvestamine ebaõnnestus."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Eelistused"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Taasta kõik"
@@@ -17826,129 -17826,125 +18306,237 @@@ msgstr "Võimalda Growl teated (esitusl
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Vaikimisi kodeering"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Kuvasätted"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Vaikimisi kodeering"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Kuvasätted"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Kirja värv"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Kiri"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Subtiitrite keel"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Subtiitrite keel"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Subtiitrite eelistatud keel"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OSD lubatud"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OSD lubatud"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Läbipaistmatus"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Rasvane kohustuslikuks"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Rasvane kohustuslikuks"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Piirjoone värv"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Piirjoone paksus"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Mustad ekraanid täisekraanrežiimis"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Mustad ekraanid täisekraanrežiimis"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Kuva"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Väljundmoodul"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Video kaadripilt"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Kaust"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Vorming"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Eesliide"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Järjestnumbrid"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Viimati kontrolliti: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Pole veel kontrollitud"
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Väljundmoodul"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Video kaadripilt"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Kaust"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Vorming"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Eesliide"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Järjestnumbrid"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Viimati kontrolliti: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Pole veel kontrollitud"
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Madalam latentsus"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Madal latentsus"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Kõrge latentsus"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Kõrgem latentsus"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Lähtesta sätted"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17961,20 -17957,20 +18549,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Vali kataloog, kuhu video kaadripildid salvestada."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Vali"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Vali kataloog või failinimi, kuhu salvestised salvestatakse."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Vali kataloog, kuhu video kaadripildid salvestada."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Vali"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Vali kataloog või failinimi, kuhu salvestised salvestatakse."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -17982,16 -17978,16 +18587,29 @@@ msgstr "
"Vajuta uued klahvid\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Vigane kombinatsioon"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Kahjuks ei saa neid klahve kasutada kiirklahvidena."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Vigane kombinatsioon"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Kahjuks ei saa neid klahve kasutada kiirklahvidena."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Seda kombinatsiooni kasutab juba \"%@\"."
@@@ -18478,6 -18474,10 +19096,13 @@@ msgid "
"that only a small part of the MMS protocol is supported (MMS encapsulated in "
"HTTP)."
msgstr ""
++<<<<<<< HEAD
++=======
+ "Kasuta seda, et voogedastada Microsoft MMS protokolliga paljudesse "
+ "arvutitesse. Seda protokolli kasutatakse kui transpordi meetodit paljudes "
+ "Microsofti tarkvarades. Pea meeles, et ainult väike osa MMS protokollist on "
+ "toetatud (MMS HTTP sees)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:270 modules/gui/macosx/wizard.m:280
msgid "Enter the address of the computer to stream to."
@@@ -19841,8 -19841,6 +20466,11 @@@ msgid "
"Playlist is currently empty.\n"
"Drop a file here or select a media source from the left."
msgstr ""
++<<<<<<< HEAD
+"Esitusnimekiri on hetkel tühi.\n"
+"Lohista siia mõni fail või vali vasakult meediaallikas."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/standardpanel.hpp:156
msgid "Icons"
@@@ -20022,20 -20020,20 +20650,36 @@@ msgstr "Kustuta valitud profiil
msgid "Create a new profile"
msgstr "Loo uus profiil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Loo"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Profiili nimi puudub"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Profiili nimi puudub"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Sa pead panema profiilile nime."
@@@ -20800,7 -20798,7 +21444,11 @@@ msgstr "Subtii&ter
#: modules/gui/qt4/menus.cpp:335 modules/gui/qt4/menus.cpp:1068
msgid "T&ools"
++<<<<<<< HEAD
+msgstr "T&ööriistad"
++=======
+ msgstr "T%ööriistad"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:338 modules/gui/qt4/menus.cpp:1103
msgid "V&iew"
@@@ -23455,23 -23453,23 +24103,43 @@@ msgstr "Transkodeeri voo väljund
msgid "Overlays/Subtitles"
msgstr "Ãœlekate/subtiitrid"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Fondi nimi, mida soovid kasutada"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Fondi fail, mida soovid kasutada"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Kirja suurus pikslites"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Fondi nimi, mida soovid kasutada"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Fondi fail, mida soovid kasutada"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Kirja suurus pikslites"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23480,11 -23478,11 +24148,19 @@@ msgstr "
"See on fondi vaikesuurus, mis videol renderdatakse. Kui väärtuseks on "
"määratud midagi muud peale nulli, siis tühistatakse suhteline fondi suurus."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Teksti katvus"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Teksti katvus"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -23492,12 -23490,12 +24168,20 @@@ msgstr "
"Renderdatava teksti läbipaistmatus (läbipaistvuse vastand) videol. 0 = "
"läbipaistev, 255 = täiesti läbipaistmatu."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Teksti vaikevärv"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23510,12 -23508,12 +24194,20 @@@ msgstr "
"#000000 = must, #FF0000 = punane, #00FF00 = roheline, #FFFF00 = kollane "
"(punane + roheline), #FFFFFF = valge"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Suhteline fondi suurus"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -23524,59 -23522,59 +24216,111 @@@ msgstr "
"See on videol rendertatava teksti fondi suhteline suurus. Kui absoluutne "
"fondi suurus on määratud, siis suhteline suurus tühistatakse."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Tausta katvus"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Tausta värv"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Piirjoone katvus"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Varju katvus"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Varju värv"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Varju nurk"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Varju distants"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Tausta katvus"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Tausta värv"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Piirjoone katvus"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Varju katvus"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Varju värv"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Varju nurk"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Varju distants"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Väiksem"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Väike"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Suur"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Suurem"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "YUVP renderdaja kasutamine"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "YUVP renderdaja kasutamine"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -23584,23 -23582,23 +24328,43 @@@ msgstr "
"See renderdab fonte kasutades \\\"paletitud YUV-d\\\". Seda valikut "
"kasutatakse ainult siis, kui soovid kodeerida DVB subtiitritesse"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Kõhn"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Paks"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Teksti renderdaja"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 fondi renderdaja"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Kõhn"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Paks"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Teksti renderdaja"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 fondi renderdaja"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -27983,8 -27981,9 +28747,14 @@@ msgid "Default caching policy
msgstr "Vaikimisi puhverdamise reegel"
#: modules/gui/qt4/ui/sprefs_interface.h:514
++<<<<<<< HEAD
+msgid "Menus language:"
+msgstr "Menüüde keel:"
++=======
+ #, fuzzy
+ msgid "Menus language:"
+ msgstr "Audio keel"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:515
msgid "Look and feel"
@@@ -28361,6 -28360,9 +29131,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Meediahalduri loend"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Kuva detailid"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -30672,10 -30674,6 +31448,13 @@@
#~ msgstr "Salvesta väljumisel helitugevus"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Koodeki üksikasjad"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Add a subtitle file"
#~ msgstr "Kasutatakse sub&tiitrite faili"
@@@ -31824,7 -31822,7 +32603,11 @@@
#, fuzzy
#~ msgid "&Tools"
++<<<<<<< HEAD
+#~ msgstr "T&ööriistad"
++=======
+ #~ msgstr "T%ööriistad"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "&Open (advanced)..."
@@@ -31844,7 -31842,7 +32627,11 @@@
#, fuzzy
#~ msgid "Tools"
++<<<<<<< HEAD
+#~ msgstr "T&ööriistad"
++=======
+ #~ msgstr "T%ööriistad"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Hide VLC media player in taskbar"
diff --combined po/eu.po
index 2101700,3eedda9..64488b6
--- a/po/eu.po
+++ b/po/eu.po
@@@ -3,16 -3,15 +3,25 @@@
# This file is distributed under the same license as the VLC package.
#
# Translators:
++<<<<<<< HEAD
+# gorkaazk <gorkaazkarate at gmail.com>, 2013
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# Iñaki Larrañaga Murgoitio <dooteo at euskalgnu.org>, 2011
# Julen Ruiz Aizpuru <julenx at gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-30 08:06+0000\n"
+"Last-Translator: gorkaazk <gorkaazkarate at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-10-23 17:07+0000\n"
+ "Last-Translator: julen <julenx at gmail.com>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Basque (http://www.transifex.com/projects/p/vlc-trans/"
"language/eu/)\n"
"Language: eu\n"
@@@ -140,7 -139,7 +149,11 @@@ msgstr "Askotariko audio-ezarpenak eta
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -501,10 -500,10 +514,17 @@@ msgid "&About
msgstr "&Honi buruz"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -543,17 -542,17 +563,29 @@@ msgid "Save...
msgstr "Gorde..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Errepikatu dena"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Errepikatu bat"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -663,7 -662,7 +695,11 @@@ msgstr "Iragazki kopuru maximora (%u) i
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Desgaitu"
@@@ -928,31 -927,31 +964,59 @@@ msgstr "Igo distira
#: src/config/keys.c:59
msgid "Browser Back"
++<<<<<<< HEAD
+msgstr "Nabigatzailea atzera"
+
+#: src/config/keys.c:60
+msgid "Browser Favorites"
+msgstr "Nabigatzaileko laster-markak"
+
+#: src/config/keys.c:61
+msgid "Browser Forward"
+msgstr "Nabigatzailea aurrerantz"
+
+#: src/config/keys.c:62
+msgid "Browser Home"
+msgstr "Nabigatzaileko hasiera"
+
+#: src/config/keys.c:63
+msgid "Browser Refresh"
+msgstr "Nabigatzailea freskatu"
+
+#: src/config/keys.c:64
+msgid "Browser Search"
+msgstr "Nabigatzailearen bilatze lana"
+
+#: src/config/keys.c:65
+msgid "Browser Stop"
+msgstr "Nabigatzailea gelditu"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:60
+ msgid "Browser Favorites"
+ msgstr ""
+
+ #: src/config/keys.c:61
+ msgid "Browser Forward"
+ msgstr ""
+
+ #: src/config/keys.c:62
+ msgid "Browser Home"
+ msgstr ""
+
+ #: src/config/keys.c:63
+ msgid "Browser Refresh"
+ msgstr ""
+
+ #: src/config/keys.c:64
+ msgid "Browser Search"
+ msgstr ""
+
+ #: src/config/keys.c:65
+ msgid "Browser Stop"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:66 modules/gui/macosx/playlist.m:518
#: modules/gui/qt4/dialogs/bookmarks.cpp:50
@@@ -1035,75 -1034,75 +1099,147 @@@ msgstr "Txertatu
#: src/config/keys.c:86
msgid "Media Angle"
++<<<<<<< HEAD
+msgstr "Multimediaren angelua"
+
+#: src/config/keys.c:87
+msgid "Media Audio Track"
+msgstr "Multimedia audio-pista"
+
+#: src/config/keys.c:88
+msgid "Media Forward"
+msgstr "Multimedia aurrerantz"
+
+#: src/config/keys.c:89
+msgid "Media Menu"
+msgstr "Multimedia menua"
+
+#: src/config/keys.c:90
+msgid "Media Next Frame"
+msgstr "Multimedia hurrengo markoa"
+
+#: src/config/keys.c:91
+msgid "Media Next Track"
+msgstr "Multimediaren hurrengo pista"
+
+#: src/config/keys.c:92
+msgid "Media Play Pause"
+msgstr "Multimedia erreproduzitu pausatu"
+
+#: src/config/keys.c:93
+msgid "Media Prev Frame"
+msgstr "Multimedia aurreko markoa"
+
+#: src/config/keys.c:94
+msgid "Media Prev Track"
+msgstr "Multimedia aurreko pista"
+
+#: src/config/keys.c:95
+msgid "Media Record"
+msgstr "Multimedia grabazioa"
+
+#: src/config/keys.c:96
+msgid "Media Repeat"
+msgstr "Multimedia errepikatu"
+
+#: src/config/keys.c:97
+msgid "Media Rewind"
+msgstr "Multimedia birbobinatu"
+
+#: src/config/keys.c:98
+msgid "Media Select"
+msgstr "Multimedia hautatu"
+
+#: src/config/keys.c:99
+msgid "Media Shuffle"
+msgstr "Multimedia nahasketa"
+
+#: src/config/keys.c:100
+msgid "Media Stop"
+msgstr "Multimedia gelditu"
+
+#: src/config/keys.c:101
+msgid "Media Subtitle"
+msgstr "Multimedia azpititulua"
+
+#: src/config/keys.c:102
+msgid "Media Time"
+msgstr "Multimedia denbora"
+
+#: src/config/keys.c:103
+msgid "Media View"
+msgstr "Multimedia Ikusi"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:87
+ msgid "Media Audio Track"
+ msgstr ""
+
+ #: src/config/keys.c:88
+ msgid "Media Forward"
+ msgstr ""
+
+ #: src/config/keys.c:89
+ msgid "Media Menu"
+ msgstr ""
+
+ #: src/config/keys.c:90
+ msgid "Media Next Frame"
+ msgstr ""
+
+ #: src/config/keys.c:91
+ msgid "Media Next Track"
+ msgstr ""
+
+ #: src/config/keys.c:92
+ msgid "Media Play Pause"
+ msgstr ""
+
+ #: src/config/keys.c:93
+ msgid "Media Prev Frame"
+ msgstr ""
+
+ #: src/config/keys.c:94
+ msgid "Media Prev Track"
+ msgstr ""
+
+ #: src/config/keys.c:95
+ msgid "Media Record"
+ msgstr ""
+
+ #: src/config/keys.c:96
+ msgid "Media Repeat"
+ msgstr ""
+
+ #: src/config/keys.c:97
+ msgid "Media Rewind"
+ msgstr ""
+
+ #: src/config/keys.c:98
+ msgid "Media Select"
+ msgstr ""
+
+ #: src/config/keys.c:99
+ msgid "Media Shuffle"
+ msgstr ""
+
+ #: src/config/keys.c:100
+ msgid "Media Stop"
+ msgstr ""
+
+ #: src/config/keys.c:101
+ msgid "Media Subtitle"
+ msgstr ""
+
+ #: src/config/keys.c:102
+ msgid "Media Time"
+ msgstr ""
+
+ #: src/config/keys.c:103
+ msgid "Media View"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:104 modules/gui/qt4/components/controller.cpp:541
msgid "Menu"
@@@ -1369,20 -1368,20 +1505,36 @@@ msgstr "Marko-emaria
msgid "Decoded format"
msgstr "Deskodetutako formatua"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Zure sarrera ezin da ireki"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Zure sarrera ezin da ireki"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLCk ezin du ireki '%s' MRLa. Begiratu egunkaria xehetasunak jakiteko."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLCk ez du ezagutzen sarreraren formatua"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLCk ez du ezagutzen sarreraren formatua"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1729,11 -1728,11 +1881,19 @@@ msgstr "
#: src/libvlc-module.c:138
msgid "Audio gain"
++<<<<<<< HEAD
+msgstr "Audio irabazia"
+
+#: src/libvlc-module.c:140
+msgid "This linear gain will be applied to outputted audio."
+msgstr "Irabazte lineal hau irteerako audioari aplikatuko zaio."
++=======
+ msgstr ""
+
+ #: src/libvlc-module.c:140
+ msgid "This linear gain will be applied to outputted audio."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:142
msgid "Audio output volume step"
@@@ -1741,7 -1740,7 +1901,11 @@@ msgstr "Audio-irteeraren bolumenaren ur
#: src/libvlc-module.c:144
msgid "The step size of the volume is adjustable using this option."
++<<<<<<< HEAD
+msgstr "Bolumenaren aldatze-neurria doitu daiteke aukera hau erabiliz."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:147
msgid "Remember the audio volume"
@@@ -1751,8 -1750,6 +1915,11 @@@ msgstr "Gogoratu audioaren bolumena
msgid ""
"The volume can be recorded and automatically restored next time VLC is used."
msgstr ""
++<<<<<<< HEAD
+"Bolumena grabatu eta automatikoki berrezar daiteke VLC erabiltzen den "
+"hurrengo aldian."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:152
msgid "Audio desynchronization compensation"
@@@ -1769,11 -1766,11 +1936,19 @@@ msgstr "
#: src/libvlc-module.c:157
msgid "Audio resampler"
++<<<<<<< HEAD
+msgstr "Audio berlagingailua"
+
+#: src/libvlc-module.c:159
+msgid "This selects which plugin to use for audio resampling."
+msgstr "Audioa birlagintzeko erabili beharreko plugina hautatzen du."
++=======
+ msgstr ""
+
+ #: src/libvlc-module.c:159
+ msgid "This selects which plugin to use for audio resampling."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:162
msgid ""
@@@ -1818,7 -1815,7 +1993,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1838,7 -1835,7 +2017,11 @@@ msgstr "Desaktibatu
#: src/libvlc-module.c:182
msgid "Stereo audio output mode"
++<<<<<<< HEAD
+msgstr "Audioaren estereo irteera modua"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:194
msgid "This adds audio post processing filters, to modify the sound rendering."
@@@ -1909,7 -1906,7 +2092,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Bat ere ez"
@@@ -1940,7 -1937,7 +2127,11 @@@ msgstr "
"Hau da VLCk erabiltzen duen bideo-irteerako metodoa. Erabilgarri dagoen "
"metodo onena automatikoki aukeratzea da portaera lehenetsia."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Gaitu bideoa"
@@@ -2151,7 -2148,7 +2342,11 @@@ msgstr "
"da."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Beti gainean"
@@@ -2211,7 -2208,7 +2406,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2220,7 -2217,7 +2419,11 @@@ msgstr "Bereizi gurutzelarkatuak
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Gurutzelarkatuak bereizteko modua"
@@@ -2280,7 -2277,7 +2483,11 @@@ msgstr "
"Energia kudeatzeko daemon-a desaktibatu egiten du erreprodukzio baten "
"dirauen artean, ordenagailua geldirik egoteagatik eseki ez dadin."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Leiho-dekorazioak"
@@@ -2482,7 -2479,7 +2689,11 @@@ msgstr "
"karratuak dauzkate (1:1). 16:9 pantaila bat badaukazu, baliteke horren ordez "
"4:3 ezarri behar izatea proportzioak gordetzeko."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Saltatu markoak"
@@@ -2630,12 -2627,12 +2841,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2643,7 -2640,7 +2863,11 @@@ msgid "Default
msgstr "Lehenetsia"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2964,11 -2961,6 +3188,14 @@@ msgid "
"Track num<br>$p: Now playing<br>$A: Date<br>$D: Duration<br>$Z: \"Now playing"
"\" (Fall back on Title - Artist)"
msgstr ""
++<<<<<<< HEAD
+"Aukera honek ahalbidetzen dizu erreproduzitzen ari denarekin bat datorren "
+"izenburua ezartzea<br>$a: Artista<br>$b: Bilduma<br>$c: Copyrighta<br>$t: "
+"Izenburua<br>$g: Mota<br>$n: Pista zenb.<br>$p: Orain erreproduzitzen<br>$A: "
+"Data<br>$D: Iraupena<br>$Z: \"Orain erreproduzitzen\" (Atzera horra: "
+"Izenburua - Artista) "
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:688
msgid ""
@@@ -3003,7 -2995,7 +3230,11 @@@ msgid "You can completely disable the s
msgstr "Azpiirudien prozesatzea erabat desgaitu dezakezu."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3038,9 -3030,6 +3269,12 @@@ msgid "
"This adds so-called \"subpicture sources\". These filters overlay some "
"images or text over the video (like a logo, arbitrary text, ...)."
msgstr ""
++<<<<<<< HEAD
+"Honek gehitzen ditu \"azpirudi iturburuak\" delako horiek. Iragazki hauek "
+"irudi edo idazki batzuk gainean ezartzen dituzte bideoan (esaterako, logo "
+"bat, gogoko idazkia...)."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:717
msgid "Subpictures filter module"
@@@ -3051,9 -3040,6 +3285,12 @@@ msgid "
"This adds so-called \"subpicture filters\". These filter subpictures created "
"by subtitle decoders or other subpictures sources."
msgstr ""
++<<<<<<< HEAD
+"Honek gehitzen ditu \"azpirudi iragazkiak\" delako horiek. Honek iragazi "
+"egiten ditu azpititulu-dekodegailuek sortutako azpirudiak edo beste azpirudi "
+"iturburuak."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:722
msgid "Autodetect subtitle files"
@@@ -3196,12 -3182,6 +3433,15 @@@ msgid "
"127.0.0.1) or a host name (e.g. localhost) to restrict them to a specific "
"network interface."
msgstr ""
++<<<<<<< HEAD
+"Honek definitzen du zein RTSP 'Real-Time Signal Processor' zerbitzariari "
+"entzungo zaion, RTSP VOD 'Video on Demand' multimediaren laster-marka "
+"oinarriarekin batera. Sintaxia hauxe izango da: helbidea/laster-bidea. "
+"Lehenetsitakoa: zerbitzariak edozein IP lokali entzungo dio. Zehaztu IP "
+"helbide bat (adib. :1 edo 127.0.0.1) edo ostalari izen bat (adib. "
+"bertoko_ostalaria) mugatzeko zehaztutako sare interfaze batera."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:806
msgid "HTTP server port"
@@@ -3213,9 -3193,6 +3453,12 @@@ msgid "
"is 80. However allocation of port numbers below 1025 is usually restricted "
"by the operating system."
msgstr ""
++<<<<<<< HEAD
+"HTTP zerbitzariak TCP 'Transmission Control Protocol' ataka honetan adituko "
+"du. HTTP atakaren zenbaki estandarra 80 da. Hala ere, 1025 ataka zenbakitik "
+"beherako izendapenak sistema eragileak eragotzi ohi ditu."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:813
msgid "HTTPS server port"
@@@ -3227,9 -3204,6 +3470,12 @@@ msgid "
"number is 443. However allocation of port numbers below 1025 is usually "
"restricted by the operating system."
msgstr ""
++<<<<<<< HEAD
+"HTTPS zerbitzariak TCP 'Transmission Control Protocol' ataka honi adituko "
+"dio. HTTPS ataka zenbaki estandarra 443 da. Hala ere, 1025 ataka zenbakitik "
+"beherako izendapenak sistema eragileak eragotzi ohi ditu."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:820
msgid "RTSP server port"
@@@ -3241,10 -3215,6 +3487,13 @@@ msgid "
"is 554. However allocation of port numbers below 1025 is usually restricted "
"by the operating system."
msgstr ""
++<<<<<<< HEAD
+"RTSP 'Real-Time Signal Processor' zerbitzariak TCP 'Transmission Control "
+"Protocol' ataka honi adituko dio. RTSP ataka zenbaki estandarra 554 da. Hala "
+"ere, 1025 ataka zenbakitik beherako izendapenak sistema eragileak eragotzi "
+"ohi ditu."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:827
msgid "HTTP/TLS server certificate"
@@@ -3953,15 -3923,13 +4202,22 @@@ msgstr "
#: src/libvlc-module.c:1161
msgid "Pause on audio communication"
++<<<<<<< HEAD
+msgstr "Pausatu audio komunikazioan"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1163
msgid ""
"If pending audio communication is detected, playback will be paused "
"automatically."
msgstr ""
++<<<<<<< HEAD
+"Audio komunikazioren bat itxaroten dagoela atzematen bada, atzerakako "
+"erreprodukzioa automatikoki etenaldian geratuko da."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1166
msgid "Use media library"
@@@ -4003,7 -3971,7 +4259,11 @@@ msgstr "
"Ezarpen horiek VLC tekla-asoziazio orokorrak dira, \"laster-tekla\" "
"deiturikoak."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ez ikusi egin"
@@@ -4017,20 -3985,18 +4277,32 @@@ msgstr "Kokalekuaren kontrola
#: src/libvlc-module.c:1199
msgid "MouseWheel up-down axis Control"
++<<<<<<< HEAD
+msgstr "Sagu-gurpilaren gorabeherantzako ardatzaren kontrola"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1201
msgid ""
"The MouseWheel up-down (vertical) axis can control volume, position or "
"mousewheel event can be ignored"
msgstr ""
++<<<<<<< HEAD
+"Sagu-gurpilaren gorabeherako ardatzak, ardatz bertikalak, bolumena, kokapena "
+"kontrola ditzake edo sagu-gurpilaren gertakariari ez ikusiarena egin dakioke."
+
+#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
+#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+
+ #: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
+ #: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4110,10 -4076,10 +4382,17 @@@ msgid "Slower (fine)
msgstr "Mantsoago (zehatz)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4127,10 -4093,10 +4406,17 @@@ msgstr "
"Hautatu erreprodukzio-zerrendako hurrengo elementura joateko laster-tekla."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Aurrekoa"
@@@ -4140,9 -4106,9 +4426,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"Hautatu erreprodukzio-zerrendako aurreko elementura joateko laster-tekla."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4377,9 -4343,9 +4669,15 @@@ msgid "Select the key to decrease audi
msgstr "Hautatu audio-bolumena jaisteko tekla."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Mututu"
@@@ -4405,46 -4371,35 +4703,72 @@@ msgstr "Hautatu azpitituluen atzerapen
#: src/libvlc-module.c:1302
msgid "Subtitle sync / bookmark audio timestamp"
++<<<<<<< HEAD
+msgstr "Azpitituluen sinkr. / audio laster-marken denbora-zigilua"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1303
msgid "Select the key to bookmark audio timestamp when syncing subtitles."
msgstr ""
++<<<<<<< HEAD
+"Hautatu giltza audioaren denbora-zigilua laster-markatzeko azpitituluak "
+"sinkronizatzerakoan."
+
+#: src/libvlc-module.c:1304
+msgid "Subtitle sync / bookmark subtitle timestamp"
+msgstr "Azpitituluen sinkr. / audio azpitituluen denbora-zigilua"
++=======
+
+ #: src/libvlc-module.c:1304
+ msgid "Subtitle sync / bookmark subtitle timestamp"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1305
msgid "Select the key to bookmark subtitle timestamp when syncing subtitles."
msgstr ""
++<<<<<<< HEAD
+"Hautatu giltza azpitituluen denbora-zigilua laster-markartzeko, azpitituluak "
+"sinkronizatzerakoan."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1306
msgid "Subtitle sync / synchronize audio & subtitle timestamps"
msgstr ""
++<<<<<<< HEAD
+"Sinkronizatu azpitituluak / sinkronizatu audioen & azpitituluen denbora-"
+"zigiluak"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1307
msgid "Select the key to synchronize bookmarked audio & subtitle timestamps."
msgstr ""
++<<<<<<< HEAD
+"Hautatu giltza sinkronizatzeko laster-markaturiko audio & azpitituluen "
+"denbora-zigiluak."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1308
msgid "Subtitle sync / reset audio & subtitle synchronization"
msgstr ""
++<<<<<<< HEAD
+"Azpitituluen sinkronizazioa / berrezarri audio & azpitituluen sinkronizazioa"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1309
msgid "Select the key to reset synchronization of audio & subtitle timestamps."
msgstr ""
++<<<<<<< HEAD
+"Hautatu giltza berrezartzeko audio & azpitituluen denbora-zigiluen "
+"sinkronizazioa."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1310
msgid "Subtitle position up"
@@@ -4573,7 -4528,7 +4897,11 @@@ msgstr "Garbitu erreprodukzio-zerrenda
#: src/libvlc-module.c:1347
msgid "Select the key to clear the current playlist."
++<<<<<<< HEAD
+msgstr "Hautatu giltza garbitzeko oraingo erreprodukzio-zerrenda."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1349
msgid "Playlist bookmark 1"
@@@ -4639,23 -4594,19 +4967,37 @@@ msgstr "Zikloka aldatu erabilgarri daud
#: src/libvlc-module.c:1366
msgid "Cycle next program Service ID"
++<<<<<<< HEAD
+msgstr "Zikloka aldatu hurrengo programaren zerbitzuaren IDa"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1367
msgid "Cycle through the available next program Service IDs (SIDs)."
msgstr ""
++<<<<<<< HEAD
+"Zikloka aldatu eskuragarri dauden hurrengo programa zerbitzuen IDen, "
+"(Service ID horien), artean."
+
+#: src/libvlc-module.c:1368
+msgid "Cycle previous program Service ID"
+msgstr "Zikloka aldatu aurreko programaren zerbitzuaren IDa"
++=======
+
+ #: src/libvlc-module.c:1368
+ msgid "Cycle previous program Service ID"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1369
msgid "Cycle through the available previous program Service IDs (SIDs)."
msgstr ""
++<<<<<<< HEAD
+"Zikloka aldatu eskuragarri dauden aurreko programa zerbitzuen IDen, (Service "
+"ID horien), artean."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1370
msgid "Cycle source aspect ratio"
@@@ -4814,7 -4765,7 +5156,11 @@@ msgstr "Zikloka aldatu erabilgarri daud
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Argazkia"
@@@ -4892,7 -4843,7 +5238,11 @@@ msgstr "Errendimendu-aukerak
#: src/libvlc-module.c:1993
msgid "Clock source"
++<<<<<<< HEAD
+msgstr "Erloju iturburua"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:2103
msgid "Hot keys"
@@@ -5022,12 -4973,12 +5372,21 @@@ msgstr "Deskargatzen...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Utzi"
@@@ -5794,7 -5745,7 +6153,11 @@@ msgstr "Moztu
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Aspektu-erlazioa"
@@@ -5803,8 -5754,6 +6166,11 @@@ msgid "
"Pass alsa:// to open the default ALSA capture device, or alsa://SOURCE to "
"open a specific device named SOURCE."
msgstr ""
++<<<<<<< HEAD
+"Igaro alsa:// zabaltzeko lehenetsitako ALSA kapturatze-gailua edo alsa://"
+"SOURCE irekitzeko SOURCE 'ITURRIA' izeneko gailu berezia."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/alsa.c:49
msgid "192000 Hz"
@@@ -6055,8 -6004,6 +6421,11 @@@ msgstr "Audioaren lagin-emaria (Hz)
msgid ""
"Audio sampling rate (in hertz) for DeckLink captures. 0 disables audio input."
msgstr ""
++<<<<<<< HEAD
+"Audio laginketa ratioa (hertzioetan) DeckLink kapturetarako. 0 zenbakiak "
+"audio-sarrera ezgaituko du."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/decklink.cpp:66 modules/access/dshow/dshow.cpp:197
#: modules/video_output/decklink.cpp:90
@@@ -6068,8 -6015,6 +6437,11 @@@ msgid "
"Number of input audio channels for DeckLink captures. Must be 2, 8 or 16. 0 "
"disables audio input."
msgstr ""
++<<<<<<< HEAD
+"DeckLink kapturen sarrerako audio kanalen kopurua. Izan behar da 2, 8 edo "
+"16. 0ak audio sarrera ezgaitzen du."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/decklink.cpp:71 modules/video_output/decklink.cpp:95
msgid "Video connection"
@@@ -6408,7 -6353,6 +6780,10 @@@ msgstr "
msgid ""
"The device you selected cannot be used, because its type is not supported."
msgstr ""
++<<<<<<< HEAD
+"Hautatu duzun gailua ezin da erabili, gailu mota hori onartzen ez delako."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:1102
#, c-format
@@@ -6424,8 -6368,6 +6799,11 @@@ msgid "
"If there is more than one digital broadcasting adapter, the adapter number "
"must be selected. Numbering starts from zero."
msgstr ""
++<<<<<<< HEAD
+"Difusiorako egokigailu bat baino gehiago baldin badago, egokigailu kopurua "
+"hautatu beharko da. Zenbakiketa 0tik hasiko da."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:41
msgid "DVB device"
@@@ -6436,8 -6378,6 +6814,11 @@@ msgid "
"If the adapter provides multiple independent tuner devices, the device "
"number must be selected. Numbering starts from zero."
msgstr ""
++<<<<<<< HEAD
+"Egokigailuak hainbat sintonizazio gailu independente eskaintzen baditu, "
+"gailu kopurua hautatu beharko. Zenbaketa zerotik hasten da."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:45
msgid "Do not demultiplex"
@@@ -6511,7 -6451,7 +6892,11 @@@ msgstr "
#: modules/access/dtv/access.c:86
msgid "Spectrum inversion"
++<<<<<<< HEAD
+msgstr "Espektroaren ifrentzua"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:88
msgid ""
@@@ -6581,7 -6521,7 +6966,11 @@@ msgstr "1.712 MHz
#: modules/access/dtv/access.c:128
msgid "Guard interval"
++<<<<<<< HEAD
+msgstr "Zaintza aldia"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:136
msgid "Hierarchy mode"
@@@ -6590,8 -6530,6 +6979,11 @@@ msgstr "Hierarkia modua
#: modules/access/dtv/access.c:144
msgid "DVB-T2 Physical Layer Pipe"
msgstr ""
++<<<<<<< HEAD
+"Bideo-difusio digital lurrekoa, bigarren belaunaldikoa, PLP, Physical Layer "
+"Pipe, konprimitua"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:146
msgid "Layer A segments count"
@@@ -6619,11 -6557,11 +7011,19 @@@ msgstr "C geruzaren denbora-tartekatzea
#: modules/access/dtv/access.c:154
msgid "Pilot"
++<<<<<<< HEAD
+msgstr "Pilotua"
+
+#: modules/access/dtv/access.c:156
+msgid "Roll-off factor"
+msgstr "<i>Roll-off factor</i>; kosinu altxatuaren iragazkia"
++=======
+ msgstr ""
+
+ #: modules/access/dtv/access.c:156
+ msgid "Roll-off factor"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:161
msgid "0.35 (same as DVB-S)"
@@@ -6639,7 -6577,7 +7039,11 @@@ msgstr "0.25
#: modules/access/dtv/access.c:164
msgid "Transport stream ID"
++<<<<<<< HEAD
+msgstr "Garraio korrontearen IDa"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:166
msgid "Polarization (Voltage)"
@@@ -6665,11 -6603,11 +7069,19 @@@ msgstr "Horizontala (18V)
#: modules/access/dtv/access.c:173
msgid "Circular Right Hand (13V)"
++<<<<<<< HEAD
+msgstr "Eskuin esku biribildua (13V)"
+
+#: modules/access/dtv/access.c:173
+msgid "Circular Left Hand (18V)"
+msgstr "Ezker esku biribildua (18V)"
++=======
+ msgstr ""
+
+ #: modules/access/dtv/access.c:173
+ msgid "Circular Left Hand (18V)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:175
msgid "High LNB voltage"
@@@ -6684,11 -6622,11 +7096,19 @@@ msgstr "
#: modules/access/dtv/access.c:181
msgid "Local oscillator low frequency (kHz)"
++<<<<<<< HEAD
+msgstr "Tokiko osziladoreak maiztasun baxua (kHz)"
+
+#: modules/access/dtv/access.c:182
+msgid "Local oscillator high frequency (kHz)"
+msgstr "Frekuentzia altuko osziladore lokala (kHz)"
++=======
+ msgstr ""
+
+ #: modules/access/dtv/access.c:182
+ msgid "Local oscillator high frequency (kHz)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:184
msgid ""
@@@ -6700,8 -6638,6 +7120,11 @@@ msgstr "
#: modules/access/dtv/access.c:187
msgid "Universal LNB switch frequency (kHz)"
msgstr ""
++<<<<<<< HEAD
+"Universal LNB seinalearen, universal low-noise block seinalearen, kommutatze "
+"maiztasuna (kHz)"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:189
msgid ""
@@@ -6712,7 -6648,7 +7135,11 @@@ msgstr "
#: modules/access/dtv/access.c:192
msgid "Continuous 22kHz tone"
++<<<<<<< HEAD
+msgstr "22 kHz tonu jarraia"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:194
msgid ""
@@@ -6755,45 -6691,43 +7182,84 @@@ msgstr "Sareko identifikatzailea
#: modules/access/dtv/access.c:219
msgid "Satellite azimuth"
++<<<<<<< HEAD
+msgstr "Satelitearen azimuta"
+
+#: modules/access/dtv/access.c:220
+msgid "Satellite azimuth in tenths of degree"
+msgstr "Satelite azimuta gradu hamarrenetan"
+
+#: modules/access/dtv/access.c:221
+msgid "Satellite elevation"
+msgstr "Satelitearen igoera"
+
+#: modules/access/dtv/access.c:222
+msgid "Satellite elevation in tenths of degree"
+msgstr "Satelite igoera gradu hamarrenetan"
+
+#: modules/access/dtv/access.c:223
+msgid "Satellite longitude"
+msgstr "Satelitearen longitudea"
+
+#: modules/access/dtv/access.c:225
+msgid "Satellite longitude in tenths of degree. West is negative."
+msgstr "Satelite longitudea gradu hamarrenetan. Mendebaldea negatiboa da."
+
+#: modules/access/dtv/access.c:227
+msgid "Satellite range code"
+msgstr "Satelitearen irismen kodea"
++=======
+ msgstr ""
+
+ #: modules/access/dtv/access.c:220
+ msgid "Satellite azimuth in tenths of degree"
+ msgstr ""
+
+ #: modules/access/dtv/access.c:221
+ msgid "Satellite elevation"
+ msgstr ""
+
+ #: modules/access/dtv/access.c:222
+ msgid "Satellite elevation in tenths of degree"
+ msgstr ""
+
+ #: modules/access/dtv/access.c:223
+ msgid "Satellite longitude"
+ msgstr ""
+
+ #: modules/access/dtv/access.c:225
+ msgid "Satellite longitude in tenths of degree. West is negative."
+ msgstr ""
+
+ #: modules/access/dtv/access.c:227
+ msgid "Satellite range code"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:228
msgid "Satellite range code as defined by manufacturer e.g. DISEqC switch code"
msgstr ""
++<<<<<<< HEAD
+"Satelitearen irismen kodea ekoizleak zehaztua da, adib. DISEqC aldagailu "
+"kodea"
+
+#: modules/access/dtv/access.c:232
+msgid "Major channel"
+msgstr "Kanal nagusia"
+
+#: modules/access/dtv/access.c:233
+msgid "ATSC minor channel"
+msgstr "ATSC 'Advanced Television Systems Committee' kanal txikia"
++=======
+
+ #: modules/access/dtv/access.c:232
+ msgid "Major channel"
+ msgstr ""
+
+ #: modules/access/dtv/access.c:233
+ msgid "ATSC minor channel"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:234
msgid "Physical channel"
@@@ -6809,23 -6743,19 +7275,37 @@@ msgstr "Telebista digitala eta irratia
#: modules/access/dtv/access.c:279
msgid "Terrestrial reception parameters"
++<<<<<<< HEAD
+msgstr "Lurreko seinaleko hartze parametroak"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:291
msgid "DVB-T reception parameters"
msgstr ""
++<<<<<<< HEAD
+"DVB-T 'Digital Video Broadcasting — Terrestrial' seinalearen hartze "
+"parametroak"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:307
msgid "ISDB-T reception parameters"
msgstr ""
++<<<<<<< HEAD
+"ISDB-T 'Integrated Services Digital Broadcasting - Terrestial' seinalearen "
+"hartze parametroak"
+
+#: modules/access/dtv/access.c:348
+msgid "Cable and satellite reception parameters"
+msgstr "Kable eta satelite seinalearen hartze parametroak"
++=======
+
+ #: modules/access/dtv/access.c:348
+ msgid "Cable and satellite reception parameters"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:360
msgid "DVB-S2 parameters"
@@@ -6837,16 -6767,15 +7317,27 @@@ msgstr "ISDB-S parametroak
#: modules/access/dtv/access.c:373
msgid "Satellite equipment control"
++<<<<<<< HEAD
+msgstr "Satelitearen tresneriaren kontrola"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:415
msgid "ATSC reception parameters"
msgstr ""
++<<<<<<< HEAD
+"ATSC 'Advanced Television Systems Committee' seinalearen hartze parametroak"
+
+#: modules/access/dtv/access.c:471
+msgid "Digital broadcasting"
+msgstr "Seinale-difusio digitala"
++=======
+
+ #: modules/access/dtv/access.c:471
+ msgid "Digital broadcasting"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:472
msgid ""
@@@ -7382,8 -7311,6 +7873,11 @@@ msgid "
"Allows you to set the desired link of the board for the capture (starting at "
"0)."
msgstr ""
++<<<<<<< HEAD
+"Ahalbidetzen dizu taulako nahi duzun esteka kapturatzeko prestatzea (0tik "
+"hasita)"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/linsys/linsys_hdsdi.c:75
#: modules/access/linsys/linsys_sdi.c:70
@@@ -7398,7 -7325,7 +7892,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:80
#: modules/access/linsys/linsys_sdi.c:75
msgid "Allows you to force the aspect ratio of the video."
++<<<<<<< HEAD
+msgstr "Baimentzen dizu bideoaren itxura ratioa behartzen"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/linsys/linsys_hdsdi.c:81
#: modules/access/linsys/linsys_sdi.c:76
@@@ -7498,16 -7425,13 +7996,23 @@@ msgstr "
#: modules/access/live555.cpp:94
msgid "RTSP frame buffer size"
++<<<<<<< HEAD
+msgstr "RTSP fotograma buffer neurria"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/live555.cpp:95
msgid ""
"RTSP start frame buffer size of the video track, can be increased in case of "
"broken pictures due to too small buffer."
msgstr ""
++<<<<<<< HEAD
+"Real Time Streaming Protocol-aren, RTSPren, bideo-pistaren hasierako "
+"fotograma buffer tamaina, handitu egin daiteke irudi hautsiak baldin badaude "
+"buffer txikiegiaren ondorioz."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/live555.cpp:101
msgid "RTP/RTSP/SDP demuxer (using Live555)"
@@@ -7560,7 -7484,7 +8065,11 @@@ msgstr "RTSP konexioak huts egin du
#: modules/access/live555.cpp:656
msgid "Access to the stream is denied by the server configuration."
++<<<<<<< HEAD
+msgstr "Zerbitzariaren konfigurazioak ukatu du jariorako sarbidea."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/mms/mms.c:49
msgid "Force selection of all streams"
@@@ -7674,11 -7598,11 +8183,19 @@@ msgstr "Erantsi fitxategiari baldin bad
#: modules/access_output/file.c:71
msgid "Format time and date"
++<<<<<<< HEAD
+msgstr "Orduaren eta dataren formatua"
+
+#: modules/access_output/file.c:72
+msgid "Perform ISO C time and date formatting on the file path"
+msgstr "Egin ISO C ordua eta eguna formateatzea fitxategiranzko bidean"
++=======
+ msgstr ""
+
+ #: modules/access_output/file.c:72
+ msgid "Perform ISO C time and date formatting on the file path"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/file.c:74
msgid "Synchronous writing"
@@@ -7751,7 -7675,7 +8268,11 @@@ msgstr "
#: modules/access_output/livehttp.c:72
msgid "Split segments anywhere"
++<<<<<<< HEAD
+msgstr "Bereizi segmentuak edonon"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/livehttp.c:73
msgid ""
@@@ -7829,7 -7753,7 +8350,11 @@@ msgstr "
#: modules/access_output/livehttp.c:104
msgid "Use randomized IV for encryption"
++<<<<<<< HEAD
+msgstr "Erabili ausazko IV zifratzeko"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/livehttp.c:105
msgid "Generate IV instead using segment-number as IV"
@@@ -8040,7 -7964,7 +8565,11 @@@ msgstr "Zifratutako konexioa
#: modules/access/rdp.c:54
msgid "Acquisition rate (in fps)"
++<<<<<<< HEAD
+msgstr "Eskuratze ratioa (zenbat fotograma segundoko)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/rdp.c:65
msgid "RDP"
@@@ -8254,7 -8178,7 +8783,11 @@@ msgstr "Pantaila-sarrera
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Pantaila"
@@@ -8305,7 -8229,7 +8838,11 @@@ msgstr "SDP
#: modules/access/sdp.c:34
msgid "Session Description Protocol"
++<<<<<<< HEAD
+msgstr "Saioaren deskripzio protokoloa"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/sftp.c:51
msgid "SFTP port"
@@@ -8448,7 -8372,7 +8985,11 @@@ msgstr "TCP sarrera
#: modules/access/timecode.c:43
msgid "Time code"
++<<<<<<< HEAD
+msgstr "Denbora kodea"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/timecode.c:44
msgid "Time code subpicture elementary stream generator"
@@@ -8519,8 -8443,6 +9060,11 @@@ msgid "
"The specified pixel resolution is forced (if both width and height are "
"strictly positive)."
msgstr ""
++<<<<<<< HEAD
+"Zehaztutako pixel bereizmena behartua da (baldin zabaleran eta altueran, "
+"bietan, erabat positiboak badira)."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:73
msgid "Radio device"
@@@ -8528,7 -8450,7 +9072,11 @@@ msgstr "Irrati-gailua
#: modules/access/v4l2/v4l2.c:74
msgid "Radio tuner device node."
++<<<<<<< HEAD
+msgstr "Irrati sintonizadorearen nodoa."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:75
#: modules/gui/qt4/components/open_panels.cpp:1060
@@@ -8695,11 -8617,11 +9243,19 @@@ msgstr "Kontrolatu automatikoki kromina
#: modules/access/v4l2/v4l2.c:127
msgid "Power line frequency"
++<<<<<<< HEAD
+msgstr "Piztu lineako maiztasuna"
+
+#: modules/access/v4l2/v4l2.c:129
+msgid "Power line frequency anti-flicker filter."
+msgstr "Piztu anti-flicker iragazkiaren lineako maiztasuna"
++=======
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:129
+ msgid "Power line frequency anti-flicker filter."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:137
msgid "50 Hz"
@@@ -8716,13 -8638,11 +9272,20 @@@ msgstr "Atzeko argiaren konpentsazioa
#: modules/access/v4l2/v4l2.c:141
msgid "Band-stop filter"
++<<<<<<< HEAD
+msgstr "Banda gelditzeko iragazkia"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:143
msgid "Cut a light band induced by fluorescent lighting (unit undocumented)."
msgstr ""
++<<<<<<< HEAD
+"Moztu argi koloreko banda bat argi fluoreszente batek eragindakoa "
+"(dokumentatu gabeko unitatea)."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:144
msgid "Horizontal flip"
@@@ -8875,7 -8795,7 +9438,11 @@@ msgstr "Denak
#: modules/access/v4l2/v4l2.c:246
msgid "Multichannel television sound (MTS)"
++<<<<<<< HEAD
+msgstr "Kanal anitzeko telebista soinua (MTS)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:247
msgid "525 lines / 60 Hz"
@@@ -8907,7 -8827,7 +9474,11 @@@ msgstr "Hizkuntza nagusia
#: modules/access/v4l2/v4l2.c:270
msgid "Secondary language or program"
++<<<<<<< HEAD
+msgstr "Bigarren hizkuntza edo programa"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:271 modules/codec/twolame.c:70
msgid "Dual mono"
@@@ -8939,11 -8859,11 +9510,19 @@@ msgstr "Bideo-kapturaren kontrolak (gai
#: modules/access/v4l2/v4l2.c:425
msgid "Video4Linux compressed A/V input"
++<<<<<<< HEAD
+msgstr "Bideo4Linux Audio/Bideo sarrera konprimitua"
+
+#: modules/access/v4l2/v4l2.c:432
+msgid "Video4Linux radio tuner"
+msgstr "Bideo4Linux irrati sintonizadorea"
++=======
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:432
+ msgid "Video4Linux radio tuner"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vcd/vcd.c:47
msgid "VCD"
@@@ -9005,7 -8925,7 +9584,11 @@@ msgstr "Geh. bol. zk.
msgid "Volume Set"
msgstr "Ezarri bolumena"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9139,15 -9059,15 +9722,27 @@@ msgstr "VDR grabazioen laguntza (http:/
#: modules/access/vdr.c:78
msgid "Chapter offset in ms"
++<<<<<<< HEAD
+msgstr "Kapituluaren desplazamendua ms-etan"
+
+#: modules/access/vdr.c:80
+msgid "Move all chapters. This value should be set in milliseconds."
+msgstr "Mugitu kapitulu guztiak. Balioa milisegundoetan ezarri beharko da."
+
+#: modules/access/vdr.c:84
+msgid "Default frame rate for chapter import."
+msgstr "Lehenetsitako fotograma ratioa kapituluak inportatzeko."
++=======
+ msgstr ""
+
+ #: modules/access/vdr.c:80
+ msgid "Move all chapters. This value should be set in milliseconds."
+ msgstr ""
+
+ #: modules/access/vdr.c:84
+ msgid "Default frame rate for chapter import."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vdr.c:88
msgid "VDR"
@@@ -9159,7 -9079,7 +9754,11 @@@ msgstr "VDR grabazioak
#: modules/access/vdr.c:809
msgid "VDR Cut Marks"
++<<<<<<< HEAD
+msgstr "VDR -Voice Digitization Rate- mozketa markak"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vdr.c:872
msgid "Start"
@@@ -9171,7 -9091,7 +9770,11 @@@ msgstr "X.509 ziurtagiri-emailea
#: modules/access/vnc.c:49
msgid "Certificate of the Authority to verify server's against"
++<<<<<<< HEAD
+msgstr "Agintarien ziurtagiria zerbitzarien egiaztapenetarako"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:50
msgid "X.509 Certificate Revocation List"
@@@ -9187,7 -9107,7 +9790,11 @@@ msgstr "X.509 bezero-ziurtagiria
#: modules/access/vnc.c:53
msgid "Certificate for client authentification"
++<<<<<<< HEAD
+msgstr "Bezeroak egiaztatzeko ziurtagiria"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:54
msgid "X.509 Client private key"
@@@ -9195,7 -9115,7 +9802,11 @@@ msgstr "X.509 bezeroaren gako pribatua
#: modules/access/vnc.c:55
msgid "Private key for authentification by certificate"
++<<<<<<< HEAD
+msgstr "Giltza pribatua ziurtagiriaren bidez egiaztatzeko"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:58
msgid "RGB chroma (RV32, RV24, RV16, RGB2)"
@@@ -9596,19 -9516,19 +10207,35 @@@ msgstr "
#: modules/audio_filter/compressor.c:158
msgid "Attack time"
++<<<<<<< HEAD
+msgstr "Erreakzio denbora"
+
+#: modules/audio_filter/compressor.c:160
+msgid "Set the attack time in milliseconds (1.5 ... 400)."
+msgstr "Ezarri erreakzio denbora milisegundoetan (1.5 ... 400)."
+
+#: modules/audio_filter/compressor.c:162
+msgid "Release time"
+msgstr "Askatze denbora"
+
+#: modules/audio_filter/compressor.c:164
+msgid "Set the release time in milliseconds (2 ... 800)."
+msgstr "Ezarri askatze denbora milisegundoetan (2 ... 800)."
++=======
+ msgstr ""
+
+ #: modules/audio_filter/compressor.c:160
+ msgid "Set the attack time in milliseconds (1.5 ... 400)."
+ msgstr ""
+
+ #: modules/audio_filter/compressor.c:162
+ msgid "Release time"
+ msgstr ""
+
+ #: modules/audio_filter/compressor.c:164
+ msgid "Set the release time in milliseconds (2 ... 800)."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/compressor.c:166
msgid "Threshold level"
@@@ -9637,11 -9557,11 +10264,19 @@@ msgstr "Ezarri knee erradioa dB-tan (1
#: modules/audio_filter/compressor.c:175 modules/gui/macosx/AudioEffects.m:125
msgid "Makeup gain"
++<<<<<<< HEAD
+msgstr "Dezibelioen hazkundea"
+
+#: modules/audio_filter/compressor.c:176
+msgid "Set the makeup gain in dB (0 ... 24)."
+msgstr "Ezarri dezibelioen hazkundea, dB (0 ... 24)."
++=======
+ msgstr ""
+
+ #: modules/audio_filter/compressor.c:176
+ msgid "Set the makeup gain in dB (0 ... 24)."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/compressor.c:179 modules/gui/macosx/AudioEffects.m:144
#: modules/gui/qt4/dialogs/extended.cpp:67
@@@ -9730,13 -9650,12 +10365,20 @@@ msgstr "
#: modules/audio_filter/equalizer.c:67
msgid "Use VLC frequency bands"
++<<<<<<< HEAD
+msgstr "Erabili VLC maiztasun bandak"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/equalizer.c:69
msgid ""
"Use the VLC frequency bands. Otherwise, use the ISO Standard frequency bands."
msgstr ""
++<<<<<<< HEAD
+"Erabili VLC maiztasun bandak. Bestela, erabili ISO estandar maiztasun bandak."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/equalizer.c:72
msgid "Two pass"
@@@ -9844,11 -9763,11 +10486,19 @@@ msgstr "Irabaziaren biderkatzailea
#: modules/audio_filter/gain.c:59
msgid "Increase or decrease the gain (default 1.0)"
++<<<<<<< HEAD
+msgstr "Handiagotu edo txikiagotu dezibelioen hazkundea (lehenetsita 1,0)"
+
+#: modules/audio_filter/gain.c:63
+msgid "Gain control filter"
+msgstr "Dezibelioen hazkundea kontrolatzeko iragazkia"
++=======
+ msgstr ""
+
+ #: modules/audio_filter/gain.c:63
+ msgid "Gain control filter"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/karaoke.c:35 modules/demux/xiph_metadata.h:49
#: modules/gui/macosx/AudioEffects.m:140
@@@ -9993,7 -9912,7 +10643,11 @@@ msgstr "
#: modules/audio_filter/resampler/src.c:50
msgid "Linear (fastest)"
++<<<<<<< HEAD
+msgstr "Lineala (azkarrena)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/resampler/src.c:58
msgid "SRC resampler"
@@@ -10122,11 -10041,11 +10776,19 @@@ msgstr "
#: modules/audio_filter/stereo_widen.c:77
msgid "Stereo Enhancer"
++<<<<<<< HEAD
+msgstr "Areagotzaile estereoa"
+
+#: modules/audio_filter/stereo_widen.c:78
+msgid "Simple stereo widening effect"
+msgstr "Zabaltze efektuko estereo sinplea"
++=======
+ msgstr ""
+
+ #: modules/audio_filter/stereo_widen.c:78
+ msgid "Simple stereo widening effect"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_mixer/float.c:49
msgid "Single precision audio volume"
@@@ -10183,7 -10102,7 +10845,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "ALSA audio-irteera"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Audio-irteerak huts egin du"
@@@ -10216,7 -10135,7 +10882,11 @@@ msgstr "AudioQueue (iOS / Mac OS) audio
msgid "Android AudioTrack audio output"
msgstr "Android AudioTrack audio-irteera"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -10224,32 -10143,32 +10894,56 @@@
msgid "Last audio device"
msgstr "Azken audioko gailuak"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit irteera"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit irteera"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Beste programa bat ari da hautatutako audio-irteeraren gailua modu "
"esklusiboan erabiltzen."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Audio-gailua ez dago konfiguratuta"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Audio-gailua ez dago konfiguratuta"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (kodetutako irteera)"
@@@ -10362,7 -10281,7 +11056,11 @@@ msgstr "
#: modules/audio_output/kai.c:98
msgid "Open audio in exclusive mode."
++<<<<<<< HEAD
+msgstr "Ireki audioa modu esklusiboan."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/kai.c:100
msgid ""
@@@ -10618,7 -10537,7 +11316,11 @@@ msgstr "
#: modules/codec/avcodec/avcodec.h:112
msgid "Discard cropping information"
++<<<<<<< HEAD
+msgstr "Baztertu mozketa informazioa"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:113
msgid "Discard internal cropping parameters (e.g. from H.264 SPS)."
@@@ -10638,7 -10557,7 +11340,11 @@@ msgstr "Kodekaren izena
#: modules/codec/avcodec/avcodec.h:119
msgid "Internal libavcodec codec name"
++<<<<<<< HEAD
+msgstr "Barneko libavcodec kodek izena"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:122
msgid "Visualize motion vectors"
@@@ -10688,7 -10607,7 +11394,11 @@@ msgstr "
#: modules/codec/avcodec/avcodec.h:140
msgid "The pixel format for output image buffers."
++<<<<<<< HEAD
+msgstr "Irteera irudi bufferrentzako pixel formatua."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:142
msgid "Threads"
@@@ -11386,7 -11305,7 +12096,11 @@@ msgstr "
#: modules/codec/fdkaac.c:76
msgid "Enable afterburner library"
++<<<<<<< HEAD
+msgstr "Gaitu erre-ondorengo liburutegia"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fdkaac.c:77
msgid ""
@@@ -11450,7 -11369,7 +12164,11 @@@ msgstr "Soinuen letra-tipoen fitxategi
#: modules/codec/fluidsynth.c:49 modules/demux/mp4/id3genres.h:129
msgid "Chorus"
++<<<<<<< HEAD
+msgstr "Abesbatza"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fluidsynth.c:51
msgid "Synthesis gain"
@@@ -11464,7 -11383,7 +12182,11 @@@ msgstr "
#: modules/codec/fluidsynth.c:55
msgid "Polyphony"
++<<<<<<< HEAD
+msgstr "Polifonia"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fluidsynth.c:57
msgid ""
@@@ -11526,46 -11445,46 +12248,74 @@@ msgstr "Itzala
msgid "Outline"
msgstr "Ingerada"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Beltza"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Grisa"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Zilarra"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Zuria"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Granatea"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Gorria"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11573,61 -11492,61 +12323,97 @@@ msgid "Fuchsia
msgstr "Fuksia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Horia"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Oliba"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Berdea"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Urdin berdexka"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lima"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Morea"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Urdin iluna"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Urdina"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11786,7 -11705,7 +12572,11 @@@ msgstr "Azpitituluak (aurreratua)
msgid "Subtitle renderers using libass"
msgstr "libass erabiltzen duten azpitituluen errendatzaileak"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Letra-tipoaren cachea eraikitzea"
@@@ -11828,7 -11747,7 +12618,11 @@@ msgstr "MPEG audio layer I/II/III paket
#: modules/codec/omxil/android_mediacodec.c:163
msgid "Video decoder using Android MediaCodec"
++<<<<<<< HEAD
+msgstr "Bideo dekodetzea Android MediaCodec erabiliz"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/omxil/omxil.c:72
msgid "Audio/Video decoder (using OpenMAX IL)"
@@@ -12059,7 -11978,7 +12853,11 @@@ msgstr "Pseudo raw bideo-paketatzailea
#: modules/codec/schroedinger.c:63
msgid "Rate control method"
++<<<<<<< HEAD
+msgstr "Ratioa kontrolatzeko metodoa"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:64
msgid "Method used to encode the video sequence"
@@@ -12067,7 -11986,7 +12865,11 @@@ msgstr "Bideo-sekuentzia kodetzeko erab
#: modules/codec/schroedinger.c:77
msgid "Constant noise threshold mode"
++<<<<<<< HEAD
+msgstr "Etengabeko zarataren muga modua"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:78
msgid "Constant bitrate mode (CBR)"
@@@ -12087,11 -12006,11 +12889,19 @@@ msgstr "
#: modules/codec/schroedinger.c:82
msgid "Constant error mode"
++<<<<<<< HEAD
+msgstr "Etengabeko errore modua"
+
+#: modules/codec/schroedinger.c:83
+msgid "Constant quality mode"
+msgstr "Etengabeko kalitatezko modua"
++=======
+ msgstr ""
+
+ #: modules/codec/schroedinger.c:83
+ msgid "Constant quality mode"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:87
msgid "GOP structure"
@@@ -12125,11 -12044,11 +12935,19 @@@ msgstr "
#: modules/codec/schroedinger.c:113
msgid "Noise Threshold"
++<<<<<<< HEAD
+msgstr "Zarataren muga"
+
+#: modules/codec/schroedinger.c:114
+msgid "Noise threshold to use in constant noise threshold mode"
+msgstr "Zarata-muga konstante moduan erabiltzeko zarata-muga"
++=======
+ msgstr ""
+
+ #: modules/codec/schroedinger.c:114
+ msgid "Noise threshold to use in constant noise threshold mode"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:118
msgid "Target bitrate in kbps when encoding in constant bitrate mode"
@@@ -13726,10 -13645,10 +14544,17 @@@ msgid "Fast
msgstr "Azkarra"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normala"
@@@ -13839,8 -13758,8 +14664,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus kontroleko interfazea"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14191,9 -14110,9 +15021,15 @@@ msgstr "Hasieratzen
msgid "Opening"
msgstr "Irekitzen"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pausarazi"
@@@ -16154,7 -16073,7 +16990,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG garraioko transmisio jarraituaren demultiplexadorea"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletestua"
@@@ -16333,7 -16252,7 +17173,11 @@@ msgid "VLC media player Help
msgstr "VLC multimedia-erreproduzigailuaren laguntza"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Indizea"
@@@ -16421,9 -16340,9 +17265,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Gorde"
@@@ -16569,7 -16488,7 +17419,11 @@@ msgstr "
"Transmisio jarraituak erreproduzitzen edo pausarazita egon behar du laster-"
"markek funtziona dezaten."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Jauzi ordura"
@@@ -16589,7 -16508,7 +17443,11 @@@ msgstr "
msgid "Backward"
msgstr "Atzerantz"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16599,7 -16518,7 +17457,11 @@@ msgstr "
msgid "Forward"
msgstr "Aurrerantz"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16619,84 -16538,84 +17481,155 @@@ msgstr "Txandakatu pantaila osoko modua
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Erakutsi/Ezkutatu erreprodukzio-zerrenda"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Erakutsi/Ezkutatu erreprodukzio-zerrenda"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Errepikatu"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Nahastu"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Nahastu"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Bolumen osoa"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Bolumen osoa"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efektuak"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16732,7 -16651,7 +17665,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16917,8 -16836,8 +17854,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Pertsonalizatua"
@@@ -17022,36 -16941,36 +17964,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "Ez galdetu berriro"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Ez da CrashLog-ik aurkitu"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Ez da CrashLog-ik aurkitu"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Jarraitu"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Ezin izan da aurreko kraskadura baten arrastorik aurkitu."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Hobespen zaharrak kendu?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "VLCren hobespen-fitxategien bertsio zaharragoa aurkitu dugu."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Eraman zakar-ontzira eta berrabiarazi VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Ezin izan da aurreko kraskadura baten arrastorik aurkitu."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Hobespen zaharrak kendu?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "VLCren hobespen-fitxategien bertsio zaharragoa aurkitu dugu."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Eraman zakar-ontzira eta berrabiarazi VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC arazketa-egunkaria (%s).rtf"
@@@ -17224,7 -17143,7 +18198,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Blokeatu aspektu-erlazioa"
@@@ -17353,7 -17272,7 +18331,11 @@@ msgstr "Ezkutatu VLC
msgid "Hide Others"
msgstr "Ezkutatu besteak"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Erakutsi dena"
@@@ -17438,15 -17357,15 +18420,27 @@@ msgstr "Pista-sinkronizazioa
msgid "A→B Loop"
msgstr "A→B begizta"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Irten erreproduzitu ondoren"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Urrats bat aurrera"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Irten erreproduzitu ondoren"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Urrats bat aurrera"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Urrats bat atzera"
@@@ -17462,30 -17381,30 +18456,56 @@@ msgstr "Jaitsi bolumena
msgid "Audio Device"
msgstr "Audio-gailua"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Tamainaren erdia"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Tamaina normala"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Tamaina bikoitza"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Doitu pantailari"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Tamainaren erdia"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Tamaina normala"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Tamaina bikoitza"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Doitu pantailari"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Flotatu goian"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Pantaila osoko bideo-gailua"
@@@ -17494,7 -17413,7 +18514,11 @@@
msgid "Post processing"
msgstr "Ondorengo prozesatzea"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Gehitu azpitituluen fitxategia..."
@@@ -17725,7 -17644,7 +18749,11 @@@ msgid "Play another media synchronously
msgstr "Erreproduzitu beste multimedia-fitxategi bat sinkronizatuta"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Aukeratu..."
@@@ -17907,7 -17826,7 +18935,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Azpitituluaren kodeketa"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Letra-tamaina"
@@@ -17936,7 -17855,7 +18968,11 @@@ msgstr "Ireki fitxategia
#: modules/gui/macosx/open.m:983
#, c-format
msgid "%i tracks"
++<<<<<<< HEAD
+msgstr "%i pistak"
++=======
+ msgstr "%i pista"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:1483
msgid "Composite input"
@@@ -18136,12 -18055,12 +19172,20 @@@ msgstr "Errorea datuak bidaltzean
msgid "VLC was unable to save the meta data."
msgstr "VLCk ezin izan ditu metadatuak gorde."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Hobespenak"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Berrezarri guztia"
@@@ -18321,129 -18240,125 +19365,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Kodeketa lehenetsia"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Bistaratu ezarpenak"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Kodeketa lehenetsia"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Bistaratu ezarpenak"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Letra-kolorea"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Letra-tipoa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Azpitituluen hizkuntzak"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Azpitituluen hizkuntzak"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Azpitituluen hizkuntza hobetsia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Gaitu OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Gaitu OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Opakutasuna"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Behartu lodia"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Behartu lodia"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Ingeradaren kolorea"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Pantaila beltzak pantaila osoaren moduan"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Pantaila beltzak pantaila osoaren moduan"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Bistaratu"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Irteera-modulua"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Bideoaren argazkiak"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Karpeta"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Formatua"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Aurrizkia"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Zenbakitze sekuentziala"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Azkenekoz noiz begiratu zen: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Oraindik ez da begiratu."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Irteera-modulua"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Bideoaren argazkiak"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Karpeta"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Formatua"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Aurrizkia"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Zenbakitze sekuentziala"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Azkenekoz noiz begiratu zen: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Oraindik ez da begiratu."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Latentzia txikiena"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Latentzia txikia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Latentzia handia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Latentzia handiagoa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Berrezarri hobespenak"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18456,20 -18371,20 +19608,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Aukeratu zer karpetatan gorde behar diren bideoaren argazkiak."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Aukeratu"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Aukeratu grabazioak gordeko diren direktorioa edo fitxategi-izena."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Aukeratu zer karpetatan gorde behar diren bideoaren argazkiak."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Aukeratu"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Aukeratu grabazioak gordeko diren direktorioa edo fitxategi-izena."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18477,16 -18392,16 +19646,29 @@@ msgstr "
"Sakatu honentzako laster-tekla berria:\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Konbinazio okerra"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Zoritxarrez, tekla horiek ezin dira laster-tekla gisa esleitu."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Konbinazio okerra"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Zoritxarrez, tekla horiek ezin dira laster-tekla gisa esleitu."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Tekla-konbinazio hori jada honentzat hartuta dago: \"%@\"."
@@@ -19155,8 -19070,6 +20337,11 @@@ msgid "
"This page allows changing the compression format of the audio or video "
"tracks. To change only the container format, proceed to next page."
msgstr ""
++<<<<<<< HEAD
+"Orri honek ahalbidetzen du audio- edo bideo-pisten konpresio formatua "
+"aldatzea. Edukiontziaren formatua bakarrik aldatzeko, joan hurrengo orrira."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:379 modules/gui/macosx/wizard.m:438
msgid "Transcode audio"
@@@ -19171,16 -19084,12 +20356,22 @@@ msgid "
"Enabling this allows transcoding the audio track if one is present in the "
"stream."
msgstr ""
++<<<<<<< HEAD
+"Hau gaituz gero, ahalbideratuko da audio-pista transkodetzea, dagoeneko "
+"pista bat audio-korrontean baldin badago."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:385 modules/gui/macosx/wizard.m:1759
msgid ""
"Enabling this allows transcoding the video track if one is present in the "
"stream."
msgstr ""
++<<<<<<< HEAD
+"Hau gaituz gero, ahalbideratuko da bideo-pista transkodetzea, dagoeneko "
+"pista bat bideo-korrontean baldin badago."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:389
msgid "Encapsulation format"
@@@ -20574,20 -20483,20 +21765,36 @@@ msgstr "Ezabatu hautatutako profila
msgid "Create a new profile"
msgstr "Sortu profil berria"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Sortu"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Profilaren izena falta da"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Profilaren izena falta da"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "]Profilaren izena adierazi behar duzu."
@@@ -20806,17 -20715,6 +22013,20 @@@ msgid "
"entities. Therefore the <i>VLC</i> developers require your express consent "
"for the media player to access the Internet automatically.</p>\n"
msgstr ""
++<<<<<<< HEAD
+"<p>Zeure pribatutasuna babesteko, <i>VLC media player</i> honek <b>ez</b> "
+"dizu inoiz datu pertsonalik eskatuko, ezta modu anonimoan eman daitezkeenak "
+"ere.</p>\n"
+"<p>Dena den, <i>VLC</i> VLC gai da modu automatikoan informazioa eskuratzeko "
+"zure erreprodukzio-zerrendatik sarean oinarrituriko hirugarrenen "
+"zerbitzuengandik. Honek guztiak bere baitan sartzen ditu isilpeko arteak, "
+"pista izenak, egiletzak eta beste metadatu batzuk. </p>\n"
+"Horrek ere, berarekin dakar zure media-fitxategi batzuk identifikatzea "
+"hirugarren erakundeen aurrean. Hortaz <i>VLC</i>ko garatzaileok eskatzen "
+"dizugu zure berariazko baimena <i>media player</i> honek internetera modu "
+"automatikoa sartzen uzteko .</p>\n"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:91
msgid "Network Access Policy"
@@@ -21545,7 -21443,7 +22755,11 @@@ msgstr "Gehitu &azpitituluen fitxategia
#: modules/gui/qt4/menus.cpp:639
msgid "Sub &Track"
++<<<<<<< HEAD
+msgstr "Azpi &Pista"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:662
msgid "Video &Track"
@@@ -24136,23 -24034,23 +25350,43 @@@ msgstr "Transkodetu transmisio jarraitu
msgid "Overlays/Subtitles"
msgstr "Gainjartzeak/Azpitituluak"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Tarte bakarreko letra-tipoa"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Erabili nahi duzun letra-tipoaren familia"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Erabili nahi duzun letra-tipoaren fitxategia"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Letra-tamaina pixeletan"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Tarte bakarreko letra-tipoa"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Erabili nahi duzun letra-tipoaren familia"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Erabili nahi duzun letra-tipoaren fitxategia"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Letra-tamaina pixeletan"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24162,11 -24060,11 +25396,19 @@@ msgstr "
"beste balio batean ezartzen bada, aukera honek letra-tamaina erlatiboa "
"indargabetuko du."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Testuaren opakutasuna"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Testuaren opakutasuna"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24174,12 -24072,12 +25416,20 @@@ msgstr "
"Bideoan errendatuko den testuaren opakutasuna (gardentasunaren aurkakoa). 0 "
"= gardena, 255 = guztiz opakua. "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Testuaren kolore lehenetsia"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24192,12 -24090,12 +25442,20 @@@ msgstr "
"eta, gero, urdinerako. #000000 = beltza, #FF0000 = gorria, #00FF00 = berdea, "
"#FFFF00 = horia (gorria + berdea), #FFFFFF = zuria"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Letra-tamaina erlatiboa"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24207,59 -24105,59 +25465,111 @@@ msgstr "
"Letra-tamaina absolutua ezartzen baduzu, tamaina erlatiboa indargabetu "
"egingo da."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Atzeko planoaren opakutasuna"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Atzeko planoaren kolorea"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Itzalaren opakotasuna"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Itzalaren kolorea"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Itzalaren distantzia"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Atzeko planoaren opakutasuna"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Atzeko planoaren kolorea"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Itzalaren opakotasuna"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Itzalaren kolorea"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Itzalaren distantzia"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Txikiagoa"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Txikia"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Handia"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Handiagoa"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Erabili YUVP errendatzailea"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Erabili YUVP errendatzailea"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24267,23 -24165,23 +25577,43 @@@ msgstr "
"Honek \"YUV paletaduna\" erabiliz errendatzen du letra-tipoa. DVB "
"azpitituluetara kodetu nahi baduzu bakarrik beharko duzu aukera hau"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Mehea"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Lodia"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Testu-errendatzailea"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 letra-tipoen errendatzailea"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Mehea"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Lodia"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Testu-errendatzailea"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 letra-tipoen errendatzailea"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -29176,6 -29074,9 +30506,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Multimedia-fitxategien kudeatzaileen zerrenda"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Erakutsi xehetasunak"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -30014,6 -29915,9 +31350,12 @@@
#~ "eransten zaio. Horrela, gutxienez zehaztutako denboran ikusgai egongo "
#~ "direla ziurtatzen da."
++<<<<<<< HEAD
++=======
+ #~ msgid "Menu update interval"
+ #~ msgstr "Menua eguneratzeko tartea"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "The default is to update the OSD menu picture every 200 ms. Shorten the "
#~ "update time for environments that experience transmissions errors. Be "
@@@ -30095,6 -29999,10 +31437,13 @@@
#~ "izenaren arabera. Izendapen arauek lehentasuna dute moten arauen "
#~ "gainetik. Nabaritu -vvv erabili behar duzula garbiketa mezua ikusteko."
++<<<<<<< HEAD
++=======
+ #, fuzzy
+ #~ msgid "Satellite scanning config"
+ #~ msgstr "Satelitearen irismen kodea"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Different resampling algorithm are supported. The best one is slower, "
#~ "while the fast one exhibits low quality."
@@@ -30326,6 -30234,14 +31675,17 @@@
#~ "hauek dira: -1 (lehenetsia), 48000, 44100, 32000, 22050, 16000, 11025, "
#~ "8000."
++<<<<<<< HEAD
++=======
+ #~ msgid ""
+ #~ "This adds so-called \"subpicture filters\". These filters overlay some "
+ #~ "images or text over the video (like a logo, arbitrary text, ...)."
+ #~ msgstr ""
+ #~ "Ezarpen honek \"azpiirudien iragazkiak\" deiturikoak eransten ditu. "
+ #~ "Iragazki hauek irudi batzuk edo testua gainjartzen diote bideoari "
+ #~ "(adibidez, logotipo bat, zuk nahi duzun testua, ...)."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Prefer system plugins over VLC"
#~ msgstr "Hobetsi sistemaren pluginak VLCren aurretik"
@@@ -30482,6 -30398,9 +31842,12 @@@
#~ "Gaitu tentsio handia kableak bereziki luzeak badira. Interfaze guztiek ez "
#~ "dute aukera hau eskaintzen."
++<<<<<<< HEAD
++=======
+ #~ msgid "22 kHz tone"
+ #~ msgstr "22 kHz tonua"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "[0=off, 1=on, -1=auto]."
#~ msgstr "[0=desaktibatuta, 1=aktibatuta, -1=automatikoa]."
@@@ -30566,6 -30485,9 +31932,12 @@@
#~ msgid "Terrestrial bandwidth [0=auto,6,7,8 in MHz]"
#~ msgstr "Lurreko banda-zabalera [0=automatikoa,6,7,8 MHz-tan]"
++<<<<<<< HEAD
++=======
+ #~ msgid "Terrestrial guard interval"
+ #~ msgstr "Lurreko babes-bitartea"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Guard interval [Undefined,1/4,1/8,1/16,1/32]"
#~ msgstr "Babes-bitartea [zehaztugabea,1/4,1/8,1/16,1/32]"
@@@ -30590,6 -30512,39 +31962,42 @@@
#~ msgid "Hierarchy alpha value [Undefined,1,2,4]"
#~ msgstr "Hierarkiaren alfa balioa [zehaztugabea,1,2,4]"
++<<<<<<< HEAD
++=======
+ #~ msgid "Satellite Azimuth"
+ #~ msgstr "Satelitearen azimuta"
+
+ #~ msgid "Satellite Azimuth in tenths of degree"
+ #~ msgstr "Satelitearen azimuta gradu-hamarrenetan"
+
+ #~ msgid "Satellite Elevation"
+ #~ msgstr "Satelitearen altxatzea"
+
+ #~ msgid "Satellite Elevation in tenths of degree"
+ #~ msgstr "Satelitearen altxadura gradu-hamarrenetan"
+
+ #~ msgid "Satellite Longitude"
+ #~ msgstr "Satelitearen longitudea"
+
+ #~ msgid "Satellite Longitude in 10ths of degree, -ve=West"
+ #~ msgstr "Satelitearen longitudea gradu-hamarrenetan, -ve=Mendebaldea"
+
+ #~ msgid "Satellite Polarisation [H/V/L/R]"
+ #~ msgstr "Satelitearen polarizazioa [H/V/L/R]"
+
+ #~ msgid "Circular Right"
+ #~ msgstr "Zirkular eskuina"
+
+ #~ msgid "Satellite Range Code"
+ #~ msgstr "Satelitearen barruti-kodea"
+
+ #~ msgid ""
+ #~ "Satellite Range Code as defined by manufacturer e.g. DISEqC switch code"
+ #~ msgstr ""
+ #~ "Satelitearen barruti-kodea fabrikatzaileak definitu bezala, adibidez: "
+ #~ "DISEqC kommutadore-kodea"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Modulation type for front-end device."
#~ msgstr "Interfaze-gailurako modulazio modua."
@@@ -30925,6 -30880,14 +32333,17 @@@
#~ msgid "Subpage"
#~ msgstr "Azpiorria"
++<<<<<<< HEAD
++=======
+ #~ msgid ""
+ #~ "MouseWheel x-axis can control volume, position or mousewheel event can be "
+ #~ "ignored"
+ #~ msgstr ""
+ #~ "MouseWheel x ardatzaren kontrolak bolumena eta kokalekua kontrola "
+ #~ "ditzake, edo saguaren gurpilarekin eragindako gertaerari ez ikusi egin "
+ #~ "dakioke"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "1.00x"
#~ msgstr "1.00x"
@@@ -31025,6 -30988,9 +32444,12 @@@
#~ msgid "VLC was brought to you by:"
#~ msgstr "Hauei esker duzu VLC:"
++<<<<<<< HEAD
++=======
+ #~ msgid "Rewind"
+ #~ msgstr "Birbobinatu"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Apply the equalizer filter twice. The effect will be sharper."
#~ msgstr ""
#~ "Aplikatu ekualizadorearen iragazkia bi aldiz. Efektua garbiagoa izango da."
@@@ -31157,6 -31123,28 +32582,31 @@@
#~ "aukera ematen dizu."
#~ msgid ""
++<<<<<<< HEAD
++=======
+ #~ "This page allows to change the compression format of the audio or video "
+ #~ "tracks. To change only the container format, proceed to next page."
+ #~ msgstr ""
+ #~ "Orri honek audio- edo bideo-pisten konprimaketa-formatua aldatzeko aukera "
+ #~ "ematen du. Edukiontziaren formatua bakarrik aldatzeko, joan hurrengo "
+ #~ "orrira."
+
+ #~ msgid ""
+ #~ "Enabling this allows to transcode the audio track if one is present in "
+ #~ "the stream."
+ #~ msgstr ""
+ #~ "Hau gaitzen baduzu, transmisio jarraituan audio-pistarik badago, "
+ #~ "transkodetu egin ahal izango duzu."
+
+ #~ msgid ""
+ #~ "Enabling this allows to transcode the video track if one is present in "
+ #~ "the stream."
+ #~ msgstr ""
+ #~ "Hau gaitzen baduzu, transmisio jarraituan bideo-pistarik badago, "
+ #~ "transkodetu egin ahal izango duzu."
+
+ #~ msgid ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "This page allows to select how the stream will be encapsulated. Depending "
#~ "on previously chosen settings all formats won't be available."
#~ msgstr ""
@@@ -31992,116 -31980,6 +33442,119 @@@
#~ msgstr "Berezgaitasunez gorde bolumena irteterakoan"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Kodekaren xehetasunak"
+
+#, fuzzy
+#~ msgid "Menu update interval"
+#~ msgstr "Zaintza aldia"
+
+#, fuzzy
+#~ msgid "Satellite scanning config"
+#~ msgstr "Satelitearen irismen kodea"
+
+#, fuzzy
+#~ msgid ""
+#~ "This adds so-called \"subpicture filters\". These filters overlay some "
+#~ "images or text over the video (like a logo, arbitrary text, ...)."
+#~ msgstr ""
+#~ "Honek gehitzen ditu \"azpirudi iturburuak\" delako horiek. Iragazki hauek "
+#~ "irudi edo idazki batzuk gainean ezartzen dituzte bideoan (esaterako, logo "
+#~ "bat, gogoko idazkia...)."
+
+#, fuzzy
+#~ msgid "22 kHz tone"
+#~ msgstr "22 kHz tonu jarraia"
+
+#, fuzzy
+#~ msgid "Terrestrial guard interval"
+#~ msgstr "Zaintza aldia"
+
+#, fuzzy
+#~ msgid "Satellite Azimuth"
+#~ msgstr "Satelitearen azimuta"
+
+#, fuzzy
+#~ msgid "Satellite Azimuth in tenths of degree"
+#~ msgstr "Satelite azimuta gradu hamarrenetan"
+
+#, fuzzy
+#~ msgid "Satellite Elevation"
+#~ msgstr "Satelitearen igoera"
+
+#, fuzzy
+#~ msgid "Satellite Elevation in tenths of degree"
+#~ msgstr "Satelite igoera gradu hamarrenetan"
+
+#, fuzzy
+#~ msgid "Satellite Longitude"
+#~ msgstr "Satelitearen longitudea"
+
+#, fuzzy
+#~ msgid "Satellite Longitude in 10ths of degree, -ve=West"
+#~ msgstr "Satelite longitudea gradu hamarrenetan. Mendebaldea negatiboa da."
+
+#, fuzzy
+#~ msgid "Satellite Polarisation [H/V/L/R]"
+#~ msgstr "Satelitearen igoera"
+
+#, fuzzy
+#~ msgid "Circular Right"
+#~ msgstr "Eskuin esku biribildua (13V)"
+
+#, fuzzy
+#~ msgid "Satellite Range Code"
+#~ msgstr "Satelitearen irismen kodea"
+
+#, fuzzy
+#~ msgid ""
+#~ "Satellite Range Code as defined by manufacturer e.g. DISEqC switch code"
+#~ msgstr ""
+#~ "Satelitearen irismen kodea ekoizleak zehaztua da, adib. DISEqC aldagailu "
+#~ "kodea"
+
+#, fuzzy
+#~ msgid ""
+#~ "MouseWheel x-axis can control volume, position or mousewheel event can be "
+#~ "ignored"
+#~ msgstr ""
+#~ "Sagu-gurpilaren gorabeherako ardatzak, ardatz bertikalak, bolumena, "
+#~ "kokapena kontrola ditzake edo sagu-gurpilaren gertakariari ez ikusiarena "
+#~ "egin dakioke."
+
+#, fuzzy
+#~ msgid "Rewind"
+#~ msgstr "Multimedia birbobinatu"
+
+#, fuzzy
+#~ msgid ""
+#~ "This page allows to change the compression format of the audio or video "
+#~ "tracks. To change only the container format, proceed to next page."
+#~ msgstr ""
+#~ "Orri honek ahalbidetzen du audio- edo bideo-pisten konpresio formatua "
+#~ "aldatzea. Edukiontziaren formatua bakarrik aldatzeko, joan hurrengo "
+#~ "orrira."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enabling this allows to transcode the audio track if one is present in "
+#~ "the stream."
+#~ msgstr ""
+#~ "Hau gaituz gero, ahalbideratuko da audio-pista transkodetzea, dagoeneko "
+#~ "pista bat audio-korrontean baldin badago."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enabling this allows to transcode the video track if one is present in "
+#~ "the stream."
+#~ msgstr ""
+#~ "Hau gaituz gero, ahalbideratuko da bideo-pista transkodetzea, dagoeneko "
+#~ "pista bat bideo-korrontean baldin badago."
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Add a subtitle file"
#~ msgstr "Erabili &azpitituluen fitxategi bat"
@@@ -32548,7 -32426,7 +34001,11 @@@
#, fuzzy
#~ msgid "Dump buffer size"
++<<<<<<< HEAD
+#~ msgstr "RTSP fotograma buffer neurria"
++=======
+ #~ msgstr "Framebufferraren fitxategia"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Video aspect ratio"
@@@ -32793,7 -32671,7 +34250,11 @@@
#, fuzzy
#~ msgid "List View"
++<<<<<<< HEAD
+#~ msgstr "Multimedia Ikusi"
++=======
+ #~ msgstr "Zerrenda-identifikatzailea"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Hotkey for "
@@@ -33281,7 -33159,7 +34742,11 @@@
#, fuzzy
#~ msgid "Seek Time"
++<<<<<<< HEAD
+#~ msgstr "Multimedia denbora"
++=======
+ #~ msgstr "Hasiera-ordua"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "VLC media player - Flash Viewer"
@@@ -33337,7 -33215,7 +34802,11 @@@
#, fuzzy
#~ msgid "Clear Menu"
++<<<<<<< HEAD
+#~ msgstr "Multimedia menua"
++=======
+ #~ msgstr "Garbitu"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Override parametters"
@@@ -33701,7 -33579,9 +35170,13 @@@
#, fuzzy
#~ msgid ""
#~ "Caching value for Alsa captures. This value should be set in milliseconds."
++<<<<<<< HEAD
+#~ msgstr "Mugitu kapitulu guztiak. Balioa milisegundoetan ezarri beharko da."
++=======
+ #~ msgstr ""
+ #~ "Bidalitako UDP transmisio jarraituetarako cache-balio lehenetsia. Balio "
+ #~ "hori milisegundotan zehaztu behar da."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Alsa audio capture input"
@@@ -33758,11 -33638,11 +35233,19 @@@
#, fuzzy
#~ msgid "ATSC Major Channel"
++<<<<<<< HEAD
+#~ msgstr "ATSC 'Advanced Television Systems Committee' kanal txikia"
+
+#, fuzzy
+#~ msgid "ATSC Minor Channel"
+#~ msgstr "ATSC 'Advanced Television Systems Committee' kanal txikia"
++=======
+ #~ msgstr "Audio-kanalak"
+
+ #, fuzzy
+ #~ msgid "ATSC Minor Channel"
+ #~ msgstr "Audio-kanalak"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "ATSC Physical Channel"
@@@ -33786,11 -33666,11 +35269,19 @@@
#, fuzzy
#~ msgid "Satellite Polarisation"
++<<<<<<< HEAD
+#~ msgstr "Satelitearen igoera"
+
+#, fuzzy
+#~ msgid "Circular Left"
+#~ msgstr "Ezker esku biribildua (18V)"
++=======
+ #~ msgstr "Hasierako posizioa"
+
+ #, fuzzy
+ #~ msgid "Circular Left"
+ #~ msgstr "Garbitu zerrenda"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Network Name"
@@@ -34402,7 -34282,7 +35893,11 @@@
#, fuzzy
#~ msgid "MouseWheel x-axis Control"
++<<<<<<< HEAD
+#~ msgstr "Sagu-gurpilaren gorabeherantzako ardatzaren kontrola"
++=======
+ #~ msgstr "Saguaren gurpila behera"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Host address"
@@@ -35032,7 -34912,7 +36527,11 @@@
#, fuzzy
#~ msgid "Mi&nimal View"
++<<<<<<< HEAD
+#~ msgstr "Multimedia Ikusi"
++=======
+ #~ msgstr "Interfaze mi&nimala"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Always &On Top"
@@@ -35281,7 -35161,7 +36780,11 @@@
#, fuzzy
#~ msgid "OMAP framebuffer"
++<<<<<<< HEAD
+#~ msgstr "RTSP fotograma buffer neurria"
++=======
+ #~ msgstr "Framebufferraren sarrera"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "OMAP framebuffer video output"
@@@ -36229,7 -36109,7 +37732,11 @@@
#, fuzzy
#~ msgid "Image inversion"
++<<<<<<< HEAD
+#~ msgstr "Espektroaren ifrentzua"
++=======
+ #~ msgstr "Kolore-alderantzikatzea"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
diff --combined po/fa.po
index 476b953,fb2e15c..21bb667
--- a/po/fa.po
+++ b/po/fa.po
@@@ -12,9 -12,9 +12,15 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-08 08:17+0000\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-10-26 18:58+0000\n"
+ "Last-Translator: Arshad <hossein.arshad at gmail.com>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Persian (http://www.transifex.com/projects/p/vlc-trans/"
"language/fa/)\n"
"Language: fa\n"
@@@ -141,7 -141,7 +147,11 @@@ msgstr "تنظیمات Ùˆ پیمانهâ
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -196,8 -196,6 +206,11 @@@ msgid "
"Settings related to the various access methods. Common settings you may want "
"to alter are HTTP proxy or caching settings."
msgstr ""
++<<<<<<< HEAD
+"تنظیمات مربوط به روش های مختل٠دسترسی است. تنظیمات متداولی که ممکن است شما "
+"بخواهید تغییر دهید شامل HHTP proxy یا تنظیمات caching است."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:103
msgid "Stream filters"
@@@ -208,8 -206,6 +221,11 @@@ msgid "
"Stream filters are special modules that allow advanced operations on the "
"input side of VLC. Use with care..."
msgstr ""
++<<<<<<< HEAD
+"Ùیلترهای استریم ماژول های مخصوصی هستند Ú©Ù‡ امکان عملیات پیشرÙته را روی ورودی "
+"VLC Ù…ÛŒ دهند. با اØتیاط استÙاده کنید..."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:108
msgid "Demuxers"
@@@ -262,13 -258,6 +278,16 @@@ msgid "
"Sout streams modules allow advanced stream processing (transcoding, "
"duplicating...)."
msgstr ""
++<<<<<<< HEAD
+"تنظیمات خروجی استریم در مواقعی Ú©Ù‡ به عنوان سرور استریم Ùˆ یا در Øال ذخیره "
+"استریم ورودی هستید، استÙاده Ù…ÛŒ شوند.\n"
+"استریم ها ابتدا مالتی پلکس شده و سپس از میان ماژول \"خروجی دسترسی\" عبور "
+"میکنند Ú©Ù‡ یا Ù…ÛŒ تواند استریم را در یک Ùایل ذخیره Ùˆ یا آنرا استریم کند(RTSP/"
+"RTP ,HTTP ,UDP).\n"
+"ماژول های استریم های Sout امکان پردازش پیشرÙته استریم ها را Ùراهم Ù…ÛŒ "
+"کند(کدگذاری، تکثیر و...)."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:133
msgid "General stream output settings"
@@@ -324,9 -313,6 +343,12 @@@ msgid "
"the Streaming Howto for more information. You can configure default options "
"for each sout stream module here."
msgstr ""
++<<<<<<< HEAD
+"ماژول استریم Sout به شما اجازه Ù…ÛŒ دهد تا یک زنجیر پردازشی بسازید. لطÙا برای "
+"اطلاعات بیشتر به راهنمای استریم ها مراجعه نمایید. شما میتوانید انتخاب های "
+"پیشÙرض را برای هر ماژول استریم Sout در اینجا تنظیم نمایید."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:164
msgid "VOD"
@@@ -377,7 -363,7 +399,11 @@@ msgstr "پیشرÙته
#: include/vlc_config_cat.h:181
msgid "Advanced settings. Use with care..."
++<<<<<<< HEAD
+msgstr "تنظیمات پیشرÙته. با اØتیاط استÙاده کنید..."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:183
msgid "Advanced settings"
@@@ -473,10 -459,10 +499,17 @@@ msgid "&About
msgstr "درباره"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -515,17 -501,17 +548,29 @@@ msgid "Save...
msgstr "ذخیره..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "تکرار همه"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "تکرار یکی"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -601,11 -587,11 +646,19 @@@ msgstr "صاÙÛŒ کردن صدا شکس
#: src/audio_output/filters.c:248
#, c-format
msgid "The maximum number of filters (%u) was reached."
++<<<<<<< HEAD
+msgstr "تعداد Ùیلترها به Øداکثر (%u) رسید."
+
+#: src/audio_output/output.c:220 src/audio_output/output.c:267
+#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ msgstr ""
+
+ #: src/audio_output/output.c:220 src/audio_output/output.c:267
+ #: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "غیر‌Ùعال"
@@@ -623,7 -609,7 +676,11 @@@ msgstr "Ø·ÛŒÙ
#: src/audio_output/output.c:232
msgid "Vu meter"
++<<<<<<< HEAD
+msgstr "اندازه گیر Vu"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/audio_output/output.c:264 modules/audio_filter/equalizer.c:81
#: modules/gui/macosx/AudioEffects.m:143 share/lua/http/index.html:219
@@@ -641,7 -627,7 +698,11 @@@ msgstr "پخش دوباره
#: src/audio_output/output.c:377 modules/gui/macosx/MainMenu.m:383
#: modules/gui/macosx/MainMenu.m:384
msgid "Stereo audio mode"
++<<<<<<< HEAD
+msgstr "Øالت صدای استریو"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/audio_output/output.c:412 src/libvlc-module.c:189
msgid "Dolby Surround"
@@@ -808,8 -794,6 +869,11 @@@ msgid "
"\n"
"Press the RETURN key to continue...\n"
msgstr ""
++<<<<<<< HEAD
+"\n"
+"برای ادامه کلید RETURN را Ùشار دهید...\n"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:56
msgid "Backspace"
@@@ -944,7 -928,7 +1008,11 @@@ msgstr "
#: src/config/keys.c:89
msgid "Media Menu"
++<<<<<<< HEAD
+msgstr "منوی رسانه"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:90
msgid "Media Next Frame"
@@@ -968,11 -952,11 +1036,19 @@@ msgstr "
#: src/config/keys.c:95
msgid "Media Record"
++<<<<<<< HEAD
+msgstr "ضبط رسانه"
+
+#: src/config/keys.c:96
+msgid "Media Repeat"
+msgstr "تکرار رسانه"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:96
+ msgid "Media Repeat"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:97
msgid "Media Rewind"
@@@ -980,27 -964,27 +1056,51 @@@ msgstr "
#: src/config/keys.c:98
msgid "Media Select"
++<<<<<<< HEAD
+msgstr "انتخاب رسانه"
+
+#: src/config/keys.c:99
+msgid "Media Shuffle"
+msgstr "بر زدن رسانه"
+
+#: src/config/keys.c:100
+msgid "Media Stop"
+msgstr "توق٠رسانه"
+
+#: src/config/keys.c:101
+msgid "Media Subtitle"
+msgstr "زیرنویس رسانه"
+
+#: src/config/keys.c:102
+msgid "Media Time"
+msgstr "زمان رسانه"
+
+#: src/config/keys.c:103
+msgid "Media View"
+msgstr "دید رسانه"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:99
+ msgid "Media Shuffle"
+ msgstr ""
+
+ #: src/config/keys.c:100
+ msgid "Media Stop"
+ msgstr ""
+
+ #: src/config/keys.c:101
+ msgid "Media Subtitle"
+ msgstr ""
+
+ #: src/config/keys.c:102
+ msgid "Media Time"
+ msgstr ""
+
+ #: src/config/keys.c:103
+ msgid "Media View"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:104 modules/gui/qt4/components/controller.cpp:541
msgid "Menu"
@@@ -1008,19 -992,19 +1108,35 @@@ msgstr "منو
#: src/config/keys.c:105
msgid "Mouse Wheel Down"
++<<<<<<< HEAD
+msgstr "Øرکت ماوس به پایین"
+
+#: src/config/keys.c:106
+msgid "Mouse Wheel Left"
+msgstr "Øرکت ماوس به Ú†Ù¾"
+
+#: src/config/keys.c:107
+msgid "Mouse Wheel Right"
+msgstr "Øرکت ماوس به راست"
+
+#: src/config/keys.c:108
+msgid "Mouse Wheel Up"
+msgstr "Øرکت ماوس به بالا"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:106
+ msgid "Mouse Wheel Left"
+ msgstr ""
+
+ #: src/config/keys.c:107
+ msgid "Mouse Wheel Right"
+ msgstr ""
+
+ #: src/config/keys.c:108
+ msgid "Mouse Wheel Up"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:109
msgid "Page Down"
@@@ -1042,11 -1026,11 +1158,19 @@@ msgstr "Tab
#: modules/gui/qt4/components/preferences_widgets.cpp:1425
#: modules/gui/qt4/util/customwidgets.cpp:294
msgid "Unset"
++<<<<<<< HEAD
+msgstr "بازنشاندن"
+
+#: src/config/keys.c:115
+msgid "Up"
+msgstr "بالا"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:115
+ msgid "Up"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:116 modules/gui/macosx/MainMenu.m:469
msgid "Volume Down"
@@@ -1054,7 -1038,7 +1178,11 @@@ msgstr "کم کردن صدا
#: src/config/keys.c:117
msgid "Volume Mute"
++<<<<<<< HEAD
+msgstr "صدا قطع"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:118 modules/gui/macosx/MainMenu.m:468
msgid "Volume Up"
@@@ -1062,31 -1046,31 +1190,59 @@@ msgstr "زیاد کردن صدا
#: src/config/keys.c:119
msgid "Zoom In"
++<<<<<<< HEAD
+msgstr "زوم به داخل"
+
+#: src/config/keys.c:120
+msgid "Zoom Out"
+msgstr "زوم به بیرون"
+
+#: src/config/keys.c:248
+msgid "Ctrl+"
+msgstr "Ctrl+"
+
+#: src/config/keys.c:249
+msgid "Alt+"
+msgstr "Alt+"
+
+#: src/config/keys.c:250
+msgid "Shift+"
+msgstr "Shift+"
+
+#: src/config/keys.c:251
+msgid "Meta+"
+msgstr "Meta+"
+
+#: src/config/keys.c:252
+msgid "Command+"
+msgstr "Command+"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:120
+ msgid "Zoom Out"
+ msgstr ""
+
+ #: src/config/keys.c:248
+ msgid "Ctrl+"
+ msgstr ""
+
+ #: src/config/keys.c:249
+ msgid "Alt+"
+ msgstr ""
+
+ #: src/config/keys.c:250
+ msgid "Shift+"
+ msgstr ""
+
+ #: src/config/keys.c:251
+ msgid "Meta+"
+ msgstr ""
+
+ #: src/config/keys.c:252
+ msgid "Command+"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/control.c:226
#, c-format
@@@ -1095,11 -1079,11 +1251,19 @@@ msgstr "نشانک %Ii
#: src/input/decoder.c:267
msgid "packetizer"
++<<<<<<< HEAD
+msgstr "بسته بندی کننده"
+
+#: src/input/decoder.c:267
+msgid "decoder"
+msgstr "دیکدر"
++=======
+ msgstr ""
+
+ #: src/input/decoder.c:267
+ msgid "decoder"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/decoder.c:276 src/input/decoder.c:467
#: modules/codec/avcodec/encoder.c:255 modules/codec/avcodec/encoder.c:263
@@@ -1176,7 -1160,7 +1340,11 @@@ msgstr "نوع
#: src/input/es_out.c:2883
msgid "Original ID"
++<<<<<<< HEAD
+msgstr "شناسه اصلی"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/es_out.c:2891 src/input/es_out.c:2894 modules/access/imem.c:67
#: modules/gui/macosx/ConvertAndSave.m:177
@@@ -1211,7 -1195,7 +1379,11 @@@ msgstr "نرخ نمونه
#: src/input/es_out.c:2915
#, c-format
msgid "%u Hz"
++<<<<<<< HEAD
+msgstr "%u Hz"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/es_out.c:2925
msgid "Bits per sample"
@@@ -1228,7 -1212,7 +1400,11 @@@ msgstr "نرخ بیتی
#: src/input/es_out.c:2930
#, c-format
msgid "%u kb/s"
++<<<<<<< HEAD
+msgstr "%u kb/s"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/es_out.c:2942
msgid "Track replay gain"
@@@ -1241,7 -1225,7 +1417,11 @@@ msgstr "
#: src/input/es_out.c:2945
#, c-format
msgid "%.2f dB"
++<<<<<<< HEAD
+msgstr "%.2f دسی بل"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/es_out.c:2954 modules/gui/macosx/ConvertAndSave.m:180
#: modules/gui/qt4/ui/profiles.h:732
@@@ -1262,26 -1246,26 +1442,49 @@@ msgstr "سرعت Ùریم‌ها
#: src/input/es_out.c:2980
msgid "Decoded format"
++<<<<<<< HEAD
+msgstr "Ùرمت دیکد شده"
+
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "ورودی شما باز نمی‌شود"
+
+#: src/input/input.c:2428
+#, c-format
+msgid "VLC is unable to open the MRL '%s'. Check the log for details."
+msgstr "VLC قادر به باز کردن MRL '%s' نیست. برای دیدن جزییات لاگ را ببینید."
+
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC قادر به شناسایی Ùرمت ورودی نیست."
+
+#: src/input/input.c:2550
+#, c-format
+msgid ""
+"The format of '%s' cannot be detected. Have a look at the log for details."
+msgstr "Ùرمت '%s' شناسایی نشد. برای دیدن جزییات به لاگ مراجعه کنید."
++=======
+ msgstr ""
+
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "ورودی شما باز نمی‌شود"
+
+ #: src/input/input.c:2427
+ #, c-format
+ msgid "VLC is unable to open the MRL '%s'. Check the log for details."
+ msgstr ""
+
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
+ #, c-format
+ msgid ""
+ "The format of '%s' cannot be detected. Have a look at the log for details."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/meta.c:55 src/input/var.c:177 modules/gui/macosx/MainMenu.m:69
#: modules/gui/macosx/MainMenu.m:372 modules/gui/macosx/MainMenu.m:373
@@@ -1314,7 -1298,7 +1517,11 @@@ msgstr "آلبوم
#: src/input/meta.c:60
msgid "Track number"
++<<<<<<< HEAD
+msgstr "شماره قطعه"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/meta.c:62 modules/mux/asf.c:64
msgid "Rating"
@@@ -1699,7 -1683,7 +1906,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1782,7 -1766,7 +1993,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "هیچ‌کدام"
@@@ -1808,7 -1792,7 +2023,11 @@@ msgstr "
"این روش خروجی ویدئوی مورد استÙادهٔ وی‌ال‌سی است. رÙتار پیش‌Ùرض انتخاب خودکار "
"بهترین روش موجود است."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "به کار انداختن ویدئو"
@@@ -2015,7 -1999,7 +2234,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "همیشه در بالا"
@@@ -2066,7 -2050,7 +2289,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2075,7 -2059,7 +2302,11 @@@ msgstr "نادرهم‌باÙÛŒ
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Øالت نادرهم‌باÙÛŒ"
@@@ -2131,7 -2115,7 +2362,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "تزئینات پنجره"
@@@ -2304,9 -2288,9 +2539,15 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
+msgid "Skip frames"
+msgstr "ردکردن Ùریم ها"
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
+ msgid "Skip frames"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:470
msgid ""
@@@ -2316,7 -2300,7 +2557,11 @@@ msgstr "
#: src/libvlc-module.c:473
msgid "Drop late frames"
++<<<<<<< HEAD
+msgstr "ØØ°Ù Ùریم های آخر"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:475
msgid ""
@@@ -2344,7 -2328,7 +2589,11 @@@ msgstr "
#: src/libvlc-module.c:487 modules/video_filter/remoteosd.c:90
msgid "Mouse events"
++<<<<<<< HEAD
+msgstr "رخدادهای ماوس"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:489
msgid "This enables handling of mouse clicks on the video."
@@@ -2359,35 -2343,35 +2608,67 @@@ msgstr "
#: src/libvlc-module.c:501
msgid "File caching (ms)"
++<<<<<<< HEAD
+msgstr "کشینگ Ùایل (ms)"
+
+#: src/libvlc-module.c:503
+msgid "Caching value for local files, in milliseconds."
+msgstr "مقدار کشینگ برای Ùایلهای Ù…Øلی، به میلی ثانیه."
+
+#: src/libvlc-module.c:505
+msgid "Live capture caching (ms)"
+msgstr "کشینگ ضبط زنده (ms)"
+
+#: src/libvlc-module.c:507
+msgid "Caching value for cameras and microphones, in milliseconds."
+msgstr "مقدار کشینگ برای دوربین ها Ùˆ میکروÙÙ† ها، به میلی ثانیه."
+
+#: src/libvlc-module.c:509
+msgid "Disc caching (ms)"
+msgstr "کشینگ دیسک (ms)"
+
+#: src/libvlc-module.c:511
+msgid "Caching value for optical media, in milliseconds."
+msgstr "مقدار کشینگ برای رسانه نوری، به میلی ثانیه."
+
+#: src/libvlc-module.c:513
+msgid "Network caching (ms)"
+msgstr "کشینگ شبکه (ms)"
+
+#: src/libvlc-module.c:515
+msgid "Caching value for network resources, in milliseconds."
+msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
++=======
+ msgstr ""
+
+ #: src/libvlc-module.c:503
+ msgid "Caching value for local files, in milliseconds."
+ msgstr ""
+
+ #: src/libvlc-module.c:505
+ msgid "Live capture caching (ms)"
+ msgstr ""
+
+ #: src/libvlc-module.c:507
+ msgid "Caching value for cameras and microphones, in milliseconds."
+ msgstr ""
+
+ #: src/libvlc-module.c:509
+ msgid "Disc caching (ms)"
+ msgstr ""
+
+ #: src/libvlc-module.c:511
+ msgid "Caching value for optical media, in milliseconds."
+ msgstr ""
+
+ #: src/libvlc-module.c:513
+ msgid "Network caching (ms)"
+ msgstr ""
+
+ #: src/libvlc-module.c:515
+ msgid "Caching value for network resources, in milliseconds."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:517
msgid "Clock reference average counter"
@@@ -2401,7 -2385,7 +2682,11 @@@ msgstr "
#: src/libvlc-module.c:522
msgid "Clock synchronisation"
++<<<<<<< HEAD
+msgstr "همزمان سازی کلاک"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:524
msgid ""
@@@ -2432,12 -2416,12 +2717,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2445,7 -2429,7 +2739,11 @@@ msgid "Default
msgstr "پیش‌Ùرض"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2750,7 -2734,7 +3048,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3584,7 -3568,7 +3886,11 @@@ msgid "These settings are the global VL
msgstr ""
"این تنظیمات مقیدسازی‌های کلیدی سراسری وی‌ال‌سی هستند که «میان‌بر» نامیده می‌شوند."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3608,8 -3592,8 +3914,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3689,10 -3673,10 +4000,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3706,10 -3690,10 +4024,17 @@@ msgstr "
"میان‌بر مورد استÙاده برای گذشتن از مورد بعدی در Ùهرست پخش را انتخاب کنید."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "قبلی"
@@@ -3719,9 -3703,9 +4044,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"میان‌بر مورد استÙاده برای گذشتن از مورد قبلی در Ùهرست پخش را انتخاب کنید."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3960,9 -3944,9 +4291,15 @@@ msgid "Select the key to decrease audi
msgstr "کلید کم کردن صدا را انتخاب کنید."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "بی‌صدا"
@@@ -4376,7 -4360,7 +4713,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "عکس"
@@@ -4573,12 -4557,12 +4914,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "انصراÙ"
@@@ -5334,7 -5318,7 +5684,11 @@@ msgstr "Øاشیه‌گیری
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "نسبت طول و عرض"
@@@ -7638,7 -7622,7 +7992,11 @@@ msgstr "ورودی صÙØÙ‡Ù” نمایØ
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "صÙØÙ‡Ù” نمایش"
@@@ -8370,7 -8354,7 +8728,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -8877,7 -8861,7 +9239,11 @@@ msgstr "
#: modules/audio_filter/chorus_flanger.c:89
#: modules/audio_filter/stereo_widen.c:62
msgid "Feedback gain"
++<<<<<<< HEAD
+msgstr "بهره ی بازخورد"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/chorus_flanger.c:89
msgid "Gain on Feedback loop"
@@@ -9200,7 -9184,7 +9566,11 @@@ msgstr "بسامد پایین (هرتز
#: modules/audio_filter/param_eq.c:60
msgid "Low freq gain (dB)"
++<<<<<<< HEAD
+msgstr "بهره Ùرکانسی پایین (دسی بل)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/param_eq.c:61
msgid "High freq (Hz)"
@@@ -9208,7 -9192,7 +9578,11 @@@ msgstr "بسامد بالا (هرتز)â
#: modules/audio_filter/param_eq.c:63
msgid "High freq gain (dB)"
++<<<<<<< HEAD
+msgstr "بهره Ùرکانسی بالا (دسی بل)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/param_eq.c:64
msgid "Freq 1 (Hz)"
@@@ -9216,35 -9200,35 +9590,67 @@@ msgstr "بسامد Û± (هرتز)â€
#: modules/audio_filter/param_eq.c:66
msgid "Freq 1 gain (dB)"
++<<<<<<< HEAD
+msgstr "بهره Ùرکانس 1 (دسی بل)"
+
+#: modules/audio_filter/param_eq.c:68
+msgid "Freq 1 Q"
+msgstr "Ùرکانس 1 Q"
+
+#: modules/audio_filter/param_eq.c:69
+msgid "Freq 2 (Hz)"
+msgstr "Ùرکانس 2 (هرتز)"
+
+#: modules/audio_filter/param_eq.c:71
+msgid "Freq 2 gain (dB)"
+msgstr "بهره Ùرکانس 2 (دسی بل)"
+
+#: modules/audio_filter/param_eq.c:73
+msgid "Freq 2 Q"
+msgstr "Ùرکانس 2 Q"
+
+#: modules/audio_filter/param_eq.c:74
+msgid "Freq 3 (Hz)"
+msgstr "Ùرکانس 3 (هرتز)"
+
+#: modules/audio_filter/param_eq.c:76
+msgid "Freq 3 gain (dB)"
+msgstr "بهره Ùرکانس 3 (دسی بل)"
+
+#: modules/audio_filter/param_eq.c:78
+msgid "Freq 3 Q"
+msgstr "Ùرکانس 3 Q"
++=======
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:68
+ msgid "Freq 1 Q"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:69
+ msgid "Freq 2 (Hz)"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:71
+ msgid "Freq 2 gain (dB)"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:73
+ msgid "Freq 2 Q"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:74
+ msgid "Freq 3 (Hz)"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:76
+ msgid "Freq 3 gain (dB)"
+ msgstr ""
+
+ #: modules/audio_filter/param_eq.c:78
+ msgid "Freq 3 Q"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/resampler/bandlimited.c:89
msgid "Audio filter for band-limited interpolation resampling"
@@@ -9291,11 -9275,11 +9697,19 @@@ msgstr "
#: modules/audio_filter/resampler/src.c:50
msgid "Linear (fastest)"
++<<<<<<< HEAD
+msgstr "خطی (سریع ترین)"
+
+#: modules/audio_filter/resampler/src.c:58
+msgid "SRC resampler"
+msgstr "نمونه گیر مجدد SRC"
++=======
+ msgstr ""
+
+ #: modules/audio_filter/resampler/src.c:58
+ msgid "SRC resampler"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/resampler/src.c:59
msgid "Secret Rabbit Code (libsamplerate) resampler"
@@@ -9331,7 -9315,7 +9745,11 @@@ msgstr "
#: modules/audio_filter/scaletempo.c:58
msgid "Search Length"
++<<<<<<< HEAD
+msgstr "طول جستجو"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/scaletempo.c:58
msgid "Length in milliseconds to search for best overlap position"
@@@ -9339,7 -9323,7 +9757,11 @@@ msgstr "
#: modules/audio_filter/spatializer/spatializer.cpp:54
msgid "Room size"
++<<<<<<< HEAD
+msgstr "اندازه Ùضا"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/spatializer/spatializer.cpp:55
msgid "Defines the virtual surface of the room emulated by the filter."
@@@ -9347,23 -9331,23 +9769,39 @@@ msgstr "
#: modules/audio_filter/spatializer/spatializer.cpp:58
msgid "Room width"
++<<<<<<< HEAD
+msgstr "عرض Ùضا"
+
+#: modules/audio_filter/spatializer/spatializer.cpp:59
+msgid "Width of the virtual room"
+msgstr "عرض Ùضای مجازی"
++=======
+ msgstr ""
+
+ #: modules/audio_filter/spatializer/spatializer.cpp:59
+ msgid "Width of the virtual room"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/spatializer/spatializer.cpp:61
#: modules/gui/macosx/AudioEffects.m:132
#: modules/gui/qt4/components/extended_panels.cpp:1403
msgid "Wet"
++<<<<<<< HEAD
+msgstr "خیس"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/spatializer/spatializer.cpp:64
#: modules/gui/macosx/AudioEffects.m:133
#: modules/gui/qt4/components/extended_panels.cpp:1404
msgid "Dry"
++<<<<<<< HEAD
+msgstr "خشک"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/spatializer/spatializer.cpp:67
#: modules/gui/macosx/AudioEffects.m:134
@@@ -9412,7 -9396,7 +9850,11 @@@ msgstr "
#: modules/audio_filter/stereo_widen.c:70
msgid "Dry mix"
++<<<<<<< HEAD
+msgstr "میکس خشک"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/stereo_widen.c:71
msgid "Level of input signal of original channel."
@@@ -9481,7 -9465,7 +9923,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "خروجی صدای ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9494,15 -9478,15 +9940,27 @@@ msgstr "
#: modules/audio_output/amem.c:34
msgid "Audio memory"
++<<<<<<< HEAD
+msgstr "ØاÙظه صدا"
+
+#: modules/audio_output/amem.c:35
+msgid "Audio memory output"
+msgstr "خروجی ØاÙظه صدا"
+
+#: modules/audio_output/amem.c:42
+msgid "Sample format"
+msgstr "Ùرمت نمونه"
++=======
+ msgstr ""
+
+ #: modules/audio_output/amem.c:35
+ msgid "Audio memory output"
+ msgstr ""
+
+ #: modules/audio_output/amem.c:42
+ msgid "Sample format"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/audioqueue.c:66
msgid "AudioQueue (iOS / Mac OS) audio output"
@@@ -9512,7 -9496,7 +9970,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9520,30 -9504,30 +9982,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10709,46 -10693,46 +11195,74 @@@ msgstr "
msgid "Outline"
msgstr "خط دور"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "سیاه"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "خاکستری"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "نقره‌ای"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "سÙید"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "قهوه‌ای"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "قرمز"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10756,61 -10740,61 +11270,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "زرد"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "زیتونی"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "سبز"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "سبزآبی"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "سبز لیمویی"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "بنÙØ´"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "سورمه‌ای"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "آبی"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10940,7 -10924,7 +11490,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12732,10 -12716,10 +13286,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "عادی"
@@@ -12840,8 -12824,8 +13401,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13177,9 -13161,9 +13743,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Ù…Ú©Ø«"
@@@ -13762,7 -13746,7 +14334,11 @@@ msgstr "
#: modules/demux/image.c:70
msgid "Real-time"
++<<<<<<< HEAD
+msgstr "در آن واØد"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/image.c:72
msgid ""
@@@ -13783,15 -13767,13 +14359,22 @@@ msgstr "
#: modules/demux/subtitle.c:75 modules/demux/vc1.c:43
#: modules/gui/macosx/open.m:210
msgid "Frames per Second"
++<<<<<<< HEAD
+msgstr "Ùریم بر ثانیه"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mjpeg.c:47
msgid ""
"This is the desired frame rate when playing MJPEG from a file. Use 0 (this "
"is the default value) for a live stream (from a camera)."
msgstr ""
++<<<<<<< HEAD
+"نرخ Ùریم مطلوب در موقع پخش MJPEG از یک Ùایل است. از 0 (مقدار پیش Ùرض است) "
+"برای استریم زنده (از دوربین) استÙاده کنید."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mjpeg.c:53
msgid "M-JPEG camera demuxer"
@@@ -13815,7 -13797,7 +14398,11 @@@ msgstr "----- عنوان
#: modules/demux/mkv/mkv.cpp:47
msgid "Matroska stream demuxer"
++<<<<<<< HEAD
+msgstr "دی مالتی پلکسر استریم Matroska"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mkv/mkv.cpp:54
msgid "Respect ordered chapters"
@@@ -13854,7 -13836,7 +14441,11 @@@ msgstr "
#: modules/demux/mkv/mkv.cpp:70
msgid "Dummy Elements"
++<<<<<<< HEAD
+msgstr "عناصر مصنوعی"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mkv/mkv.cpp:71
msgid "Read and discard unknown EBML elements (not good for broken files)."
@@@ -14557,7 -14539,7 +15148,11 @@@ msgstr "
#: modules/demux/mp4/mp4.c:1074 modules/demux/xiph_metadata.h:55
#: modules/demux/xiph_metadata.h:62
msgid "Lyrics"
++<<<<<<< HEAD
+msgstr "متن شعر"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1075
msgid "Record Company"
@@@ -15059,7 -15041,7 +15654,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15165,35 -15147,35 +15764,67 @@@ msgstr "
#: modules/demux/xiph_metadata.h:52
msgid "Semantic annotations"
++<<<<<<< HEAD
+msgstr "تÙسیر معنایی"
+
+#: modules/demux/xiph_metadata.h:54
+msgid "Transcript"
+msgstr "رونوشت"
+
+#: modules/demux/xiph_metadata.h:56
+msgid "Linguistic markup"
+msgstr "نشانه گذاری زبانی"
+
+#: modules/demux/xiph_metadata.h:57
+msgid "Cue points"
+msgstr "نقاط نشانه"
+
+#: modules/demux/xiph_metadata.h:61 modules/demux/xiph_metadata.h:65
+msgid "Subtitles (images)"
+msgstr "زیرنویس ها (تصاویر)"
+
+#: modules/demux/xiph_metadata.h:66
+msgid "Slides (text)"
+msgstr "اسلایدها (متن)"
+
+#: modules/demux/xiph_metadata.h:67
+msgid "Slides (images)"
+msgstr "اسلایدها (تصاویر)"
+
+#: modules/demux/xiph_metadata.c:296
+msgid "Unknown category"
+msgstr "دسته ناشناخته"
++=======
+ msgstr ""
+
+ #: modules/demux/xiph_metadata.h:54
+ msgid "Transcript"
+ msgstr ""
+
+ #: modules/demux/xiph_metadata.h:56
+ msgid "Linguistic markup"
+ msgstr ""
+
+ #: modules/demux/xiph_metadata.h:57
+ msgid "Cue points"
+ msgstr ""
+
+ #: modules/demux/xiph_metadata.h:61 modules/demux/xiph_metadata.h:65
+ msgid "Subtitles (images)"
+ msgstr ""
+
+ #: modules/demux/xiph_metadata.h:66
+ msgid "Slides (text)"
+ msgstr ""
+
+ #: modules/demux/xiph_metadata.h:67
+ msgid "Slides (images)"
+ msgstr ""
+
+ #: modules/demux/xiph_metadata.c:296
+ msgid "Unknown category"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/about.m:92 modules/gui/macosx/MainMenu.m:306
msgid "About VLC media player"
@@@ -15238,7 -15220,7 +15869,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15326,9 -15308,9 +15961,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "ذخیره"
@@@ -15468,7 -15450,7 +16109,11 @@@ msgstr "ورودی‌ای پیدا نش
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "پرش به زمان"
@@@ -15488,7 -15470,7 +16133,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15498,7 -15480,7 +16147,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15518,84 -15500,84 +16171,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
- msgid ""
- "Click to switch between video output and playlist. If no video is shown in "
- "the main window, this allows you to hide the playlist."
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+ msgid ""
+ "Click to switch between video output and playlist. If no video is shown in "
+ "the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "جلوه ها"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15631,7 -15613,7 +16355,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15814,8 -15796,8 +16542,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -15908,36 -15890,36 +16641,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "ثبت Ùروپاشی پیدا نشد"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "ثبت Ùروپاشی پیدا نشد"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "ادامه"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "اثری از Ùروپاشی قبلی دیده نمی‌شود."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "اثری از Ùروپاشی قبلی دیده نمی‌شود."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16093,7 -16075,7 +16858,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16222,7 -16204,7 +16991,11 @@@ msgstr "مخÙÛŒ کردن وی‌الâ€
msgid "Hide Others"
msgstr "مخÙÛŒ کردن بقیه"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "نمایش همه"
@@@ -16307,15 -16289,15 +17080,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "یک قدم به جلو"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "یک قدم به جلو"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "یک قدم به عقی"
@@@ -16331,30 -16313,30 +17116,56 @@@ msgstr "
msgid "Audio Device"
msgstr "دستگاه صدا"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "اندازهٔ نصÙ"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "اندازهٔ عادی"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "اندازهٔ دو برابر"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "جا کردن در صÙØÙ‡"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "اندازهٔ نصÙ"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "اندازهٔ عادی"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "اندازهٔ دو برابر"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "جا کردن در صÙØÙ‡"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16363,7 -16345,7 +17174,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16591,7 -16573,7 +17406,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -16762,7 -16744,7 +17581,11 @@@ msgstr "â€EPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "اندازهٔ قلم"
@@@ -16991,12 -16973,12 +17814,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "تنظیمات"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "برگرداندن همه به مقادیر اولیه"
@@@ -17173,129 -17155,125 +18004,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "کدگشای پیش Ùرش"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "تنظیمات نمایش"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "کدگشای پیش Ùرش"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "تنظیمات نمایش"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "رنگ متن"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "قلم"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "زیر نویس Ùعال"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "زیر نویس Ùعال"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "کدری"
-#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
++#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "صÙØÙ‡Ù” سیاه در Øالت تمام‌صÙØÙ‡"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "صÙØÙ‡Ù” سیاه در Øالت تمام‌صÙØÙ‡"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "برگرداندن تنظیمات به مقادیر پیش‌Ùرض"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17308,35 -17286,35 +18247,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "انتخاب"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "انتخاب"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -18663,82 -18641,82 +19632,158 @@@ msgstr "
#: modules/gui/qt4/components/extended_panels.cpp:1384
#: modules/gui/qt4/components/extended_panels.cpp:1385
msgid "dB"
++<<<<<<< HEAD
+msgstr "دسی بل"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1192
+msgid "170 Hz"
+msgstr "170 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1193
+msgid "310 Hz"
+msgstr "310 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1194
+msgid "600 Hz"
+msgstr "600 Hz"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1192
+ msgid "170 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1193
+ msgid "310 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1194
+ msgid "600 Hz"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1195
#: modules/gui/qt4/components/extended_panels.cpp:1209
msgid "1 KHz"
++<<<<<<< HEAD
+msgstr "1 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1196
+msgid "3 KHz"
+msgstr "3 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1197
+msgid "6 KHz"
+msgstr "6 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1198
+msgid "12 KHz"
+msgstr "12 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1199
+msgid "14 KHz"
+msgstr "14 KHz"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1196
+ msgid "3 KHz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1197
+ msgid "6 KHz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1198
+ msgid "12 KHz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1199
+ msgid "14 KHz"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1200
#: modules/gui/qt4/components/extended_panels.cpp:1213
msgid "16 KHz"
++<<<<<<< HEAD
+msgstr "16 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1204
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1205
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1206
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1207
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1208
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1210
+msgid "2 KHz"
+msgstr "2 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1211
+msgid "4 KHz"
+msgstr "4 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1212
+msgid "8 KHz"
+msgstr "8 KHz"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1204
+ msgid "31 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1205
+ msgid "63 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1206
+ msgid "125 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1207
+ msgid "250 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1208
+ msgid "500 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1210
+ msgid "2 KHz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1211
+ msgid "4 KHz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1212
+ msgid "8 KHz"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1380
#: modules/gui/qt4/components/extended_panels.cpp:1381
msgid "ms"
++<<<<<<< HEAD
+msgstr "ms"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1384
msgid ""
@@@ -19275,20 -19253,20 +20320,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22591,23 -22569,23 +23652,43 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "اندازهٔ قلم به نقطه"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "اندازهٔ قلم به نقطه"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -22616,23 -22594,23 +23697,39 @@@ msgstr "
"این اندازهٔ پیش‌Ùرض قلم‌هایی است Ú©Ù‡ روی ویدئو رسم خواهند شد. این گزینه اگر چیزی "
"غیر از Û° تنظیم شود بر اندازهٔ نسبی قلم ارجØیت خواهد داشت."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
"کدری (عکس Ø´ÙاÙیت) متن Ú©Ù‡ بر ویدئو رسم خواهد شد. Û° = Ø´ÙاÙØŒ Û²ÛµÛµ = کاملاً مات. "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "رنگ پیش‌Ùرض متن"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22641,93 -22619,93 +23738,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "ریزتر"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "ریز"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "درشت"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "درشت‌تر"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "رسم‌کنندهٔ متن"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "رسم‌کنندهٔ متن"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -27362,6 -27340,9 +28539,12 @@@ msgstr "
msgid "Media Manager List"
msgstr ""
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "نمایش جزئیات"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "CPU features"
#~ msgstr "امکانات پردازنده"
@@@ -27869,6 -27850,19 +29052,22 @@@
#~ msgid "Go forward in browsing history"
#~ msgstr "جلو رÙتن در مرور تاریخچه"
++<<<<<<< HEAD
++=======
+ #, fuzzy
+ #~ msgid ""
+ #~ "Caching value for Alsa captures. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای ضبط از صÙØÙ‡Ù” نمایش. این مقدار باید به میلی‌ثانیه وارد "
+ #~ "شود."
+
+ #, fuzzy
+ #~ msgid ""
+ #~ "Caching value for DVB streams. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های DV. این مقدار باید به میلی‌ثانیه وارد شود."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Satellite number in the Diseqc system"
#~ msgstr "شماره‌ٔ ماهواره در سیستم Diseqc"
@@@ -27884,6 -27878,27 +29083,30 @@@
#~ msgstr "â€EPS"
#~ msgid ""
++<<<<<<< HEAD
++=======
+ #~ "Default caching value for Audio CDs. This value should be set in "
+ #~ "milliseconds."
+ #~ msgstr ""
+ #~ "مقدار پیش‌Ùرض ØاÙظه‌ٔ نهان برای سی‌دی‌های صوتی. این مقدار باید به میلی‌ثانیه "
+ #~ "وارد شود."
+
+ #, fuzzy
+ #~ msgid ""
+ #~ "Caching value for DirectShow streams. This value should be set in "
+ #~ "milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های دیرکت‌شو. این مقدار باید به میلی‌ثانیه داده "
+ #~ "شود."
+
+ #, fuzzy
+ #~ msgid ""
+ #~ "Caching value for DV streams. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های DV. این مقدار باید به میلی‌ثانیه وارد شود."
+
+ #~ msgid ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "User name the administrator will use to log into the internal HTTP server."
#~ msgstr ""
#~ "نام کاربر‌ی‌ای Ú©Ù‡ مدیر برای ورود به سیستم کارگزار HTTP داخلی استÙاده خواهد "
@@@ -27894,6 -27909,24 +29117,27 @@@
#~ msgstr ""
#~ "گذرواژه‌ای Ú©Ù‡ مدیر برای ورود به سیستم کارگزار HTTP داخلی استÙاده خواهد کرد."
++<<<<<<< HEAD
++=======
+ #~ msgid "Caching value for DVDs. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای دی‌وی‌دی‌ها. این مقدار باید به میلی‌ثانیه وارد شود."
+
+ #, fuzzy
+ #~ msgid ""
+ #~ "Caching value for EyeTV captures. This value should be set in "
+ #~ "milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای ضبط از صÙØÙ‡Ù” نمایش. این مقدار باید به میلی‌ثانیه وارد "
+ #~ "شود."
+
+ #~ msgid ""
+ #~ "Caching value for fake streams. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های قلابی. این مقدار باید به میلی‌ثانیه تنظیم "
+ #~ "شود."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Number of frames per second (eg. 24, 25, 29.97, 30)."
#~ msgstr "تعداد Ùریم بر ثانیه (مثلاً Û²Û´ØŒ â€Û²ÛµØŒâ€ Û²Û¹Ù«Û¹Û·ØŒ â€Û³Û°)."
@@@ -27901,10 -27934,109 +29145,115 @@@
#~ msgstr "قلابی"
#, fuzzy
++<<<<<<< HEAD
++=======
+ #~ msgid "Supplementary caching value for remote files, in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان در جریان‌های FTP. این مقدار باید به میلی‌ثانیه وارد شود."
+
+ #~ msgid ""
+ #~ "Caching value for FTP streams. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان در جریان‌های FTP. این مقدار باید به میلی‌ثانیه وارد شود."
+
+ #~ msgid ""
+ #~ "Caching value for GnomeVFS streams.This value should be set in "
+ #~ "milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های GnomeVFS. این مقدار باید به میلی‌ثانیه وارد "
+ #~ "شود."
+
+ #~ msgid ""
+ #~ "Caching value for HTTP streams. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های HTTP. این مقدار باید به میلی‌ثانیه داه شود."
+
+ #, fuzzy
+ #~ msgid ""
+ #~ "Caching value for imem streams. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های قلابی. این مقدار باید به میلی‌ثانیه تنظیم "
+ #~ "شود."
+
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Memory-mapped file input"
#~ msgstr "خروجی ویدئوی تصویر"
#~ msgid ""
++<<<<<<< HEAD
++=======
+ #~ "Caching value for MMS streams. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های MMS. این مقدار باید به میلی‌ثانیه داده شود."
+
+ #~ msgid "Caching value for files. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای پرونده‌ها. این مقدار باید به میلی‌ثانیه وارد شود."
+
+ #, fuzzy
+ #~ msgid ""
+ #~ "Caching value for OSS captures. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای ضبط از صÙØÙ‡Ù” نمایش. این مقدار باید به میلی‌ثانیه وارد "
+ #~ "شود."
+
+ #, fuzzy
+ #~ msgid ""
+ #~ "Default caching value for PVR streams. This value should be set in "
+ #~ "milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان در جریان‌های FTP. این مقدار باید به میلی‌ثانیه وارد شود."
+
+ #, fuzzy
+ #~ msgid ""
+ #~ "Caching value for RTMP streams. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های RTSP. این مقدار باید به میلی‌ثانیه داده شود."
+
+ #~ msgid ""
+ #~ "Caching value for RTSP streams. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های RTSP. این مقدار باید به میلی‌ثانیه داده شود."
+
+ #~ msgid ""
+ #~ "Caching value for screen capture. This value should be set in "
+ #~ "milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای ضبط از صÙØÙ‡Ù” نمایش. این مقدار باید به میلی‌ثانیه وارد "
+ #~ "شود."
+
+ #, fuzzy
+ #~ msgid ""
+ #~ "Caching value for SFTP streams. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان در جریان‌های FTP. این مقدار باید به میلی‌ثانیه وارد شود."
+
+ #~ msgid ""
+ #~ "Caching value for SMB streams. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های سامبا. این مقدار باید به میلی‌ثانیه وارد "
+ #~ "شود."
+
+ #~ msgid ""
+ #~ "Caching value for TCP streams. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های TCP. این مقدار باید به میلی‌ثانیه داده شود."
+
+ #~ msgid ""
+ #~ "Caching value for UDP streams. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های UDP. این مقدار باید به میلی‌ثانیه داده شود."
+
+ #, fuzzy
+ #~ msgid ""
+ #~ "Caching value for V4L captures. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای ضبط از صÙØÙ‡Ù” نمایش. این مقدار باید به میلی‌ثانیه وارد "
+ #~ "شود."
+
+ #~ msgid ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "Channel of the card to use (Usually, 0 = tuner, 1 = composite, 2 = "
#~ "svideo)."
#~ msgstr ""
@@@ -27969,6 -28101,19 +29318,22 @@@
#~ msgstr "روشنی ورودی ویدئو."
#, fuzzy
++<<<<<<< HEAD
++=======
+ #~ msgid ""
+ #~ "Caching value for V4L2 captures. This value should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای ضبط از صÙØÙ‡Ù” نمایش. این مقدار باید به میلی‌ثانیه وارد "
+ #~ "شود."
+
+ #~ msgid "Caching value for VCDs. This value should be set in milliseconds."
+ #~ msgstr "مقدار ØاÙظهٔ نهان برای وی‌سی‌دی.این مقدار باید به میلی‌ثانیه داده شود."
+
+ #~ msgid "Unknown soundcard"
+ #~ msgstr "کارت صدای نامعلوم"
+
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "AltiVec FFmpeg audio/video decoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)"
#~ msgstr "تنظیمات کدگذارها Ùˆ کدگشاهای Ùقط ویدئویی."
@@@ -28196,6 -28341,13 +29561,16 @@@
#~ msgstr "هم‌پوشانی"
#~ msgid ""
++<<<<<<< HEAD
++=======
+ #~ "Caching value for CDDA streams. This value should be set in millisecond "
+ #~ "units."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های CDDA. این مقدار باید به واØد میلی‌ثانیه "
+ #~ "وارد شود."
+
+ #~ msgid ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "How many CD blocks to get on a single CD read. Generally on newer/faster "
#~ "CDs, this increases throughput at the expense of a little more memory "
#~ "usage and initial delay. SCSI-MMC limitations generally don't allow for "
@@@ -28349,6 -28501,10 +29724,13 @@@
#~ msgstr "همگام‌سازی شبکه"
#, fuzzy
++<<<<<<< HEAD
++=======
+ #~ msgid "Transcode:"
+ #~ msgstr "گزینه‌های تبدیل کد"
+
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "secam"
#~ msgstr "ثانیه"
@@@ -28488,6 -28644,11 +29870,14 @@@
#~ "این گزینه تعداد رشته‌های مورد نیاز برای اجرای وی‌ال‌سی را به میزان ممکن "
#~ "تقلیل می‌دهد."
++<<<<<<< HEAD
++=======
+ #~ msgid ""
+ #~ "Caching value for DV streams. Thisvalue should be set in milliseconds."
+ #~ msgstr ""
+ #~ "مقدار ØاÙظهٔ نهان برای جریان‌های DV. این مقدار باید به میلی‌ثانیه وارد شود."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "The above message had unknown log level"
#~ msgstr "پیغام Ùوق Ø³Ø·Ø Ø«Ø¨ØªÛŒ نامعلومی داشت"
@@@ -28528,6 -28689,9 +29918,12 @@@
#~ msgid "Choose a filename to save the VLM configuration..."
#~ msgstr "Ùهرست پخش پیدا نمی‌شود"
++<<<<<<< HEAD
++=======
+ #~ msgid "Minimal View..."
+ #~ msgstr "Øالت نمایشی Ú©ÙˆÚ†Ú©"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Cube"
#~ msgstr "مکعب"
@@@ -28554,174 -28718,6 +29950,177 @@@
#~ msgstr "زمان باقی‌مانده: %Ii ثانیه"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "&Codec Details"
+#~ msgstr "نمایش جزئیات"
+
+#, fuzzy
+#~ msgid "Show Details"
+#~ msgstr "نمایش تنظیمات"
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for Alsa captures. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای Ùایلهای Ù…Øلی، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for DVB streams. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Default caching value for Audio CDs. This value should be set in "
+#~ "milliseconds."
+#~ msgstr "مقدار کشینگ برای Ùایلهای Ù…Øلی، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for DirectShow streams. This value should be set in "
+#~ "milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for DV streams. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid "Caching value for DVDs. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای Ùایلهای Ù…Øلی، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for EyeTV captures. This value should be set in "
+#~ "milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for fake streams. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid "Supplementary caching value for remote files, in milliseconds."
+#~ msgstr "مقدار کشینگ برای Ùایلهای Ù…Øلی، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for FTP streams. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for GnomeVFS streams.This value should be set in "
+#~ "milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for HTTP streams. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for imem streams. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for MMS streams. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid "Caching value for files. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای Ùایلهای Ù…Øلی، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for OSS captures. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای Ùایلهای Ù…Øلی، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Default caching value for PVR streams. This value should be set in "
+#~ "milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for RTMP streams. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for RTSP streams. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for screen capture. This value should be set in "
+#~ "milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for SFTP streams. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for SMB streams. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for TCP streams. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for UDP streams. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for V4L captures. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای Ùایلهای Ù…Øلی، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for V4L2 captures. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای Ùایلهای Ù…Øلی، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid "Caching value for VCDs. This value should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای Ùایلهای Ù…Øلی، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid "Unknown soundcard"
+#~ msgstr "دسته ناشناخته"
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for CDDA streams. This value should be set in millisecond "
+#~ "units."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid "Transcode:"
+#~ msgstr "رونوشت"
+
+#, fuzzy
+#~ msgid ""
+#~ "Caching value for DV streams. Thisvalue should be set in milliseconds."
+#~ msgstr "مقدار کشینگ برای منابع شبکه، به میلی ثانیه."
+
+#, fuzzy
+#~ msgid "Minimal View..."
+#~ msgstr "دید رسانه"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Audio volume (0-65535)."
#~ msgstr "Øجم صدا"
@@@ -28755,7 -28751,7 +30154,11 @@@
#, fuzzy
#~ msgid "Unknown command!"
++<<<<<<< HEAD
+#~ msgstr "دسته ناشناخته"
++=======
+ #~ msgstr "نامشخص"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Size:"
@@@ -28915,7 -28911,7 +30318,11 @@@
#, fuzzy
#~ msgid "B Frames"
++<<<<<<< HEAD
+#~ msgstr "ردکردن Ùریم ها"
++=======
+ #~ msgstr "Ùریم‌های گم‌شده"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Bitrate peak"
@@@ -29037,7 -29033,7 +30444,11 @@@
#, fuzzy
#~ msgid "Commands"
++<<<<<<< HEAD
+#~ msgstr "Command+"
++=======
+ #~ msgstr "توضیØ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Maemo hildon interface"
@@@ -29141,7 -29137,7 +30552,11 @@@
#, fuzzy
#~ msgid "List View"
++<<<<<<< HEAD
+#~ msgstr "دید رسانه"
++=======
+ #~ msgstr "شناسهٔ Ùهرست"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Hotkey for "
@@@ -29471,7 -29467,7 +30886,11 @@@
#, fuzzy
#~ msgid "Clear Menu"
++<<<<<<< HEAD
+#~ msgstr "منوی رسانه"
++=======
+ #~ msgstr "پاک‌سازی"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Fullscreen controller width toggle"
@@@ -29491,7 -29487,7 +30910,11 @@@
#, fuzzy
#~ msgid "Seek Time"
++<<<<<<< HEAD
+#~ msgstr "زمان رسانه"
++=======
+ #~ msgstr "زمان"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Graphical Equalizer"
@@@ -29777,7 -29773,7 +31200,11 @@@
#, fuzzy
#~ msgid "Subtitles (asa demuxer)"
++<<<<<<< HEAD
+#~ msgstr "زیرنویس ها (تصاویر)"
++=======
+ #~ msgstr "زبان زیرنویس"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "CSA ck"
@@@ -29888,6 -29884,10 +31315,13 @@@
#~ msgstr "متاداده"
#, fuzzy
++<<<<<<< HEAD
++=======
+ #~ msgid "&Codec Details"
+ #~ msgstr "نمایش جزئیات"
+
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "C&lear"
#~ msgstr "پاک‌سازی"
@@@ -30046,7 -30046,7 +31480,11 @@@
#, fuzzy
#~ msgid "Set"
++<<<<<<< HEAD
+#~ msgstr "خیس"
++=======
+ #~ msgstr "انتخاب"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "SDL video driver name"
@@@ -30110,7 -30110,7 +31548,11 @@@
#, fuzzy
#~ msgid "Caching value in microseconds"
++<<<<<<< HEAD
+#~ msgstr "مقدار کشینگ برای Ùایلهای Ù…Øلی، به میلی ثانیه."
++=======
+ #~ msgstr "مقدار ØاÙظهٔ نهان (میلی‌ثانیه)â€"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Use CD audio controls and output?"
@@@ -30166,7 -30166,7 +31608,11 @@@
#, fuzzy
#~ msgid "Tarkin decoder"
++<<<<<<< HEAD
+#~ msgstr "دیکدر"
++=======
+ #~ msgstr "کدگشای ویدئوی تئورا"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "MPEG I/II hw video decoder (using libmpeg2)"
@@@ -30484,7 -30484,7 +31930,11 @@@
#, fuzzy
#~ msgid "Transrate"
++<<<<<<< HEAD
+#~ msgstr "رونوشت"
++=======
+ #~ msgstr "نوع تبدیل"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "VIDEO_TS directory"
@@@ -30608,7 -30608,7 +32058,11 @@@
#, fuzzy
#~ msgid "Audio method"
++<<<<<<< HEAD
+#~ msgstr "ØاÙظه صدا"
++=======
+ #~ msgstr "کدگذار صدا"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
diff --combined po/ff.po
index 02ab424,c55dd62..9ccdddc
--- a/po/ff.po
+++ b/po/ff.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-05-04 07:53+0000\n"
"Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
"Language-Team: Fulah (http://www.transifex.com/projects/p/vlc-trans/language/"
@@@ -137,7 -137,7 +141,11 @@@ msgstr "GulÉ—e e teelte ojoo cariiÉ—e.
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -455,10 -455,10 +463,17 @@@ msgid "&About
msgstr "&BaÉ—te"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -497,17 -497,17 +512,29 @@@ msgid "Save...
msgstr "Danndu..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Rewto Fof"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Rewto Gooto"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -587,7 -587,7 +614,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "DaaÆ´"
@@@ -1245,20 -1245,20 +1276,36 @@@ msgstr "Cookol kaarewe
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1649,7 -1649,7 +1696,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1731,7 -1731,7 +1782,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Hay huunde"
@@@ -1755,7 -1755,7 +1810,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "DaaÆ´tu widewoo"
@@@ -1945,7 -1945,7 +2004,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Dow e sahaa kala"
@@@ -1996,7 -1996,7 +2059,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2005,7 -2005,7 +2072,11 @@@ msgstr "Ittu jiñol
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Mbayka jiñtol"
@@@ -2061,7 -2061,7 +2132,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Ŋeñi kenorɗe"
@@@ -2230,7 -2230,7 +2305,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Diw kaarewe"
@@@ -2358,12 -2358,12 +2437,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2371,7 -2371,7 +2459,11 @@@ msgid "Default
msgstr "GoowaaÉ—i"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2674,7 -2674,7 +2766,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3486,7 -3486,7 +3582,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Faalkiso"
@@@ -3510,8 -3510,8 +3610,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3591,10 -3591,10 +3696,17 @@@ msgid "Slower (fine)
msgstr "Leeltin (seeÉ—a)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3607,10 -3607,10 +3719,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "ÆennuÉ—o"
@@@ -3619,9 -3619,9 +3738,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3856,9 -3856,9 +3981,15 @@@ msgid "Select the key to decrease audi
msgstr "Labu sodorde ngam ustude daande ojoo."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "MuumÉ—in"
@@@ -4272,7 -4272,7 +4403,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Nattorol"
@@@ -4469,12 -4469,12 +4604,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Haaytu"
@@@ -5230,7 -5230,7 +5374,11 @@@ msgstr "Hoolto
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7526,7 -7526,7 +7674,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Yaynirde"
@@@ -8258,7 -8258,7 +8410,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9369,7 -9369,7 +9525,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9400,7 -9400,7 +9560,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9408,30 -9408,30 +9572,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10597,46 -10597,46 +10785,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Æaleejo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Puro"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Kalis"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Daneejo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Sireejo"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "BoÉ—eejo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10644,61 -10644,61 +10860,97 @@@ msgid "Fuchsia
msgstr "Fusiyeejo"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Oolo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Situuno"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Haakeejo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Tiilo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Liimeejo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Boru"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Naweejo"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Bulaajo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10828,7 -10828,7 +11080,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12622,10 -12622,10 +12878,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "PotÉ—um"
@@@ -12730,8 -12730,8 +12993,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13067,9 -13067,9 +13335,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Sabbo"
@@@ -14948,7 -14948,7 +15222,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teleteks"
@@@ -15127,7 -15127,7 +15405,11 @@@ msgid "VLC media player Help
msgstr "Ballal VLC media player"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Jooporol"
@@@ -15215,9 -15215,9 +15497,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Danndu"
@@@ -15356,7 -15356,7 +15644,11 @@@ msgstr "Hay naatna yiytaaka
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Alaa e sago ciiɓorol ngol taree walla sabbinee ngam maantore yahde."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Taaɓo To Waktu"
@@@ -15376,7 -15376,7 +15668,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15386,7 -15386,7 +15682,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15406,84 -15406,84 +15706,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Pilte"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15519,7 -15519,7 +15890,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15702,8 -15702,8 +16077,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Peŋtoro"
@@@ -15796,36 -15796,36 +16176,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Hay CrashLog yiytaaka"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Hay CrashLog yiytaaka"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Jokku"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Horiima yiytude pele hookre yawtunde."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Momtu cuɓoraaɗe ɓooyɗe?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Min njiytii yamre ɓooynde piille cuɓoraaɗe VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Weddo to Jinnde, Kurmitinaa VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Horiima yiytude pele hookre yawtunde."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Momtu cuɓoraaɗe ɓooyɗe?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Min njiytii yamre ɓooynde piille cuɓoraaɗe VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Weddo to Jinnde, Kurmitinaa VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15979,7 -15979,7 +16391,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "DaaÆ´ Jeendondiral"
@@@ -16108,7 -16108,7 +16524,11 @@@ msgstr "SuuÉ— VLC
msgid "Hide Others"
msgstr "SuuÉ— GoÉ—É—i"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Hollu Fof"
@@@ -16193,15 -16193,15 +16613,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Yaltu É“aawo Taro"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Taaɓal Yeeso"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Yaltu É“aawo Taro"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Taaɓal Yeeso"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Taaɓal Caggal"
@@@ -16217,30 -16217,30 +16649,56 @@@ msgstr "Ustu Daande
msgid "Audio Device"
msgstr "Kaɓirgol Ojoo"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Feccere Æetol"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Æetol Potngol"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Æetol É—iÉ—É—iÉ—ol"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "HeÆ´nu e Yaynirde"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Feccere Æetol"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Æetol Potngol"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Æetol É—iÉ—É—iÉ—ol"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "HeÆ´nu e Yaynirde"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Weeynu to Dow"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Kaɓirgol widewo e Njaajeendi Yaynirde"
@@@ -16249,7 -16249,7 +16707,11 @@@
msgid "Post processing"
msgstr "Æaawo juÉ“É“inol"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16477,7 -16477,7 +16939,11 @@@ msgid "Play another media synchronously
msgstr "Tarodo mejaare woÉ—nde laawol gootol"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Suɓo..."
@@@ -16648,7 -16648,7 +17114,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Æetol fontere"
@@@ -16877,12 -16877,12 +17347,20 @@@ msgstr "Juumre e danndugol metaa
msgid "VLC was unable to save the meta data."
msgstr "VLC horiima danndude metaa keɓe ɗee."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Cuɓoraaɗe"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Firlit Fof"
@@@ -17059,129 -17059,125 +17537,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Dokkitol Goowangol"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Teelte Jaytino"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Dokkitol Goowangol"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Teelte Jaytino"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Goobu fontere"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Fontere"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Hurmin OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Hurmin OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Niɓɓitere"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "JaynirÉ—e Æaleeje e mbaydi Njaajeendi Yaynirde"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "JaynirÉ—e Æaleeje e mbaydi Njaajeendi Yaynirde"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Jaytono"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Wulnde jaltal"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Nokitannde widewoo"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Runngere"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Mbaydi"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Pefix"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Limtinol deggontirol"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Ƴeewto sakkitiingi ñalnde: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Alaa Æ´eewto waÉ—aa tawo."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Wulnde jaltal"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Nokitannde widewoo"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Runngere"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Mbaydi"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Pefix"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Limtinol deggontirol"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Ƴeewto sakkitiingi ñalnde: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Alaa Æ´eewto waÉ—aa tawo."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Daasre É“urtunde lesÉ—ude"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Daasre lesÉ—unde"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Daasre toownde"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Daasre É“urnde toownde"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Firlit Cuɓoraaɗe"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17194,20 -17190,20 +17780,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Suɓo runngere ɗo nokitannɗe ndanndaa."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Suɓo"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Suɓo runngere ɗo nokitannɗe ndanndaa."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Suɓo"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -17215,16 -17211,16 +17818,29 @@@ msgstr "
"Ñoƴƴu ŋiire hesere lomtin\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Jaadingol ngol moÆ´Æ´aani"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Njaafo-É—aa, É—ee Å‹iiÆ´e mbaawaa huutoreede ngam joopaade codorÉ—e."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Jaadingol ngol moÆ´Æ´aani"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Njaafo-É—aa, É—ee Å‹iiÆ´e mbaawaa huutoreede ngam joopaade codorÉ—e."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Ndee sodorde ko ko huutora e \"%@\"."
@@@ -19169,20 -19165,20 +19785,36 @@@ msgstr "Momtu heftinirde labaande
msgid "Create a new profile"
msgstr "Sos heftinirde hesere"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Sos"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Alaa e sago cosaa innde heftinirde ndee."
@@@ -22487,45 -22483,45 +23119,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22534,93 -22530,93 +23202,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/fi.po
index 5f1b415,c1ba6aa..01fc3aa
--- a/po/fi.po
+++ b/po/fi.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc 1.0.0\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2012-02-08 21:42+0200\n"
"Last-Translator: Juha Jeronen <juha.jeronen at jyu.fi>\n"
"Language-Team: Finnish <fi at li.org>\n"
@@@ -137,7 -137,7 +141,11 @@@ msgstr "Muut ääniasetukset ja -moduul
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -500,10 -500,10 +508,17 @@@ msgid "&About
msgstr "Tietoj&a"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -542,17 -542,17 +557,29 @@@ msgid "Save...
msgstr "Tallenna..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Toista kaikkia"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Toista yhtä"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -670,7 -670,7 +697,11 @@@ msgstr "Suodattimia on jo käytössä e
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Poista käytöstä"
@@@ -1424,21 -1424,21 +1455,37 @@@ msgstr "Ruutunopeus
msgid "Decoded format"
msgstr "Purettu formaatti"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Lähdettä ei voi avata"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Lähdettä ei voi avata"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC ei kyennyt avaamaan MRL-sijaintia \"%s\". Katso lokista lisätietoja."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "Syötteen muotoa ei voi tunnistaa"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "Syötteen muotoa ei voi tunnistaa"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1881,7 -1881,7 +1928,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1972,7 -1972,7 +2023,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Ei mikään"
@@@ -2003,7 -2003,7 +2058,11 @@@ msgstr "
"Tämä on VLC:n käyttämä videon ulostulotapa. Oletustoiminto valitsee "
"automaattisesti parhaan mahdollisen tavan."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Käytä videota"
@@@ -2214,7 -2214,7 +2273,11 @@@ msgstr "
"käyttää sitä, mikäli mahdollista."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Aina päällimmäisenä"
@@@ -2267,7 -2267,7 +2330,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2276,7 -2276,7 +2343,11 @@@ msgstr "Lomituksenpoisto
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Lomituksen poistotapa"
@@@ -2334,7 -2334,7 +2405,11 @@@ msgstr "
"Tämä estää virranhallinnan järjestelmäpalvelua siirtämästä tietokonetta "
"valmiustilaan soiton aikana (koska se voi luulla, että mitään ei tapahdu)."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Ikkunan reunukset"
@@@ -2544,7 -2544,7 +2619,11 @@@ msgstr "
"kuvasuhde on 16:9, voi olla, että mittasuhteiden säilyttämiseksi täytyy "
"käyttää kuvapisteen muodolle arvoa 4:3."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Ohita ruutuja"
@@@ -2697,12 -2697,12 +2776,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2710,7 -2710,7 +2798,11 @@@ msgid "Default
msgstr "Oletusarvo"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -3081,7 -3081,7 +3173,11 @@@ msgid "You can completely disable the s
msgstr "Alikuvien käsittely voidaan kytkeä kokonaan pois käytöstä."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -4054,7 -4054,7 +4150,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "Nämä asetukset ovat VLC:n globaaleja pikanäppäimiä."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Älä huomioi"
@@@ -4080,8 -4080,8 +4180,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4163,10 -4163,10 +4268,17 @@@ msgid "Slower (fine)
msgstr "Hitaammin (hivenen)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4180,10 -4180,10 +4292,17 @@@ msgstr "
"Valitse pikanäppäin, jolla siirrytään soittolistassa seuraavaan kohteeseen."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Edellinen"
@@@ -4193,9 -4193,9 +4312,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"Valitse pikanäppäin, jolla siirrytään soittolistassa edelliseen kohteeseen."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4431,9 -4431,9 +4556,15 @@@ msgid "Select the key to decrease audi
msgstr "Valitse näppäin, joka vähentää äänenvoimakkuutta."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Vaimenna"
@@@ -4880,7 -4880,7 +5011,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Ruudunkaappaus"
@@@ -5085,12 -5085,12 +5220,21 @@@ msgstr "Ladataan ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Peruuta"
@@@ -5859,7 -5859,7 +6003,11 @@@ msgstr "Rajaus
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Kuvasuhde"
@@@ -8424,7 -8424,7 +8572,11 @@@ msgstr "Kuvaruutulähde
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Kuvaruutu"
@@@ -9197,7 -9197,7 +9349,11 @@@ msgstr "Niteitä yhteensä #
msgid "Volume Set"
msgstr "Nidekokoelma"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10419,7 -10419,7 +10575,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "ALSA-äänilähtö"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Äänilähtö ei toiminut"
@@@ -10453,7 -10453,7 +10613,11 @@@ msgstr "AudioQueue (iOS / Mac OS) -ää
msgid "Android AudioTrack audio output"
msgstr "Android Surface -videolähtö"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "HAL AudioUnit -äänilähtö"
@@@ -10463,20 -10463,20 +10627,36 @@@
msgid "Last audio device"
msgstr "Äänilaite"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit -äänilähtö"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit -äänilähtö"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr "Toinen ohjelma on varannut valitun äänilähtölaitteen kokonaan."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Äänilaitteen asetuksia ei ole määrätty."
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Äänilaitteen asetuksia ei ole määrätty."
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
@@@ -10486,12 -10486,12 +10666,20 @@@ msgstr "
"työkalulla (sijaitsee /Ohjelmat/Lisäohjelmat -kansiossa). Nyt käytetään "
"stereotilaa."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Valitse äänilähtölaite"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Pakattu lähtö)"
@@@ -11806,46 -11806,46 +11994,74 @@@ msgstr "Varjo
msgid "Outline"
msgstr "Ääriviiva"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Musta"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Harmaa"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Hopea"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Valkoinen"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Ruskeanpunainen"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Punainen"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11853,61 -11853,61 +12069,97 @@@ msgid "Fuchsia
msgstr "Fuksianpunainen"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Keltainen"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Oliivi"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Vihreä"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Vihertävän sininen"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Limetti"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Purppura"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Laivastonsininen"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Sininen"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -12063,7 -12063,7 +12315,11 @@@ msgstr "Tekstitys (edistynyt)
msgid "Subtitle renderers using libass"
msgstr "Libass:ää käyttävät tekstitysrenderöijät"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Luodaan fonttivälimuistia"
@@@ -14100,10 -14100,10 +14356,17 @@@ msgid "Fast
msgstr "Nopeammin"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normaali"
@@@ -14223,8 -14223,8 +14486,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus -etäohjauskäyttöliittymä"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14587,9 -14587,9 +14855,15 @@@ msgstr "Alustetaan
msgid "Opening"
msgstr "Avataan"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Tauko"
@@@ -16616,7 -16616,7 +16890,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG Transport Stream -kanavoinninpurkaja"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teksti-TV"
@@@ -16805,7 -16805,7 +17083,11 @@@ msgid "VLC media player Help
msgstr "VLC-mediasoittimen ohjeet"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Indeksi"
@@@ -16897,9 -16897,9 +17179,15 @@@ msgstr "Uuden kansion nimi
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Tallenna"
@@@ -17048,7 -17048,7 +17336,11 @@@ msgid "The stream must be playing or pa
msgstr ""
"Jotta kirjanmerkit toimisivat, toiston täytyy olla käynnissä tai tauolla."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Siirry ajankohtaan"
@@@ -17068,7 -17068,7 +17360,11 @@@ msgstr "
msgid "Backward"
msgstr "Taaksepäin"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -17078,7 -17078,7 +17374,11 @@@ msgstr "
msgid "Forward"
msgstr "Eteenpäin"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -17099,93 -17099,93 +17399,164 @@@ msgstr "Kokoruututila päälle/pois
msgid "Click to enable fullscreen video playback."
msgstr "Estä näytönsäästäjä videotoiston aikana."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "Valitse pikanäppäin toiston pysäyttämistä varten."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Näytä/piilota soittolista"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Näytä/piilota soittolista"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
# FIXME: it's silly to use the same word for "play" and "repeat".
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Toista"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Satunnaistoisto"
+
+#: modules/gui/macosx/ControlsBar.m:484
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Satunnaistoisto"
+
+ #: modules/gui/macosx/ControlsBar.m:450
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to enable or disable random playback."
msgstr ""
"Valitse yksittäisiä ES:iä, jotka haluat sisällyttää suoratoistoon tai jättää "
"siitä pois."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "Valitse, millä näppäimellä äänet vaimenevat (mute)."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Täysi äänenvoimakkuus"
+
+#: modules/gui/macosx/ControlsBar.m:493
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Täysi äänenvoimakkuus"
+
+ #: modules/gui/macosx/ControlsBar.m:459
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to play the audio at maximum volume."
msgstr "Käytä leveyttä ja korkeutta suurimpina sallittuina arvoina."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Tehosteet"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr "Edellinen soittolistassa"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the next playlist item."
msgstr "VLC soittaa nykyistä kohdetta toistuvasti kunnes keskeytetään."
++<<<<<<< HEAD
++=======
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -17226,7 -17226,7 +17597,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17425,8 -17425,8 +17800,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Mukauta"
@@@ -17526,37 -17526,37 +17906,69 @@@ msgstr "Vain oletussähköpostiosoittee
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "VLC-mediasoitin"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Kaatumislokia ei löydy"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Kaatumislokia ei löydy"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Jatka"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Edellisestä kaatumisesta ei löydy mitään jälkeä."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Nollaa asetukset?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Löytyi vanha versio VLC:n asetustiedostoista."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Siirrä roskakoriin ja käynnistä VLC uudelleen"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Edellisestä kaatumisesta ei löydy mitään jälkeä."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Nollaa asetukset?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Löytyi vanha versio VLC:n asetustiedostoista."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Siirrä roskakoriin ja käynnistä VLC uudelleen"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC Debug Log (%s).rtfd"
@@@ -17734,7 -17734,7 +18146,11 @@@ msgid "
msgstr ""
"Tämä sallii käyttöliittymän vaihtavan VLC:n ikonia tietyissä tilanteissa."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Lukitse kuvasuhde"
@@@ -17875,7 -17875,7 +18291,11 @@@ msgstr "Piilota VLC
msgid "Hide Others"
msgstr "Piilota muut"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Näytä kaikki"
@@@ -17965,16 -17965,16 +18385,28 @@@ msgstr "Raidan synkronoin&ti
msgid "A→B Loop"
msgstr "A->B -silmukka"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Quit after Playback"
msgstr "Lopeta toiston jälkeen"
# NOTE: these are time skips, not playlist item changes.
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Siirry eteenpäin"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Siirry eteenpäin"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Siirry taaksepäin"
@@@ -17990,30 -17990,30 +18422,56 @@@ msgstr "Vähennä äänenvoimakkuutta
msgid "Audio Device"
msgstr "Äänilaite"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Puolikoko"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Normaali koko"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Kaksinkertainen koko"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Sovita näytölle"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Puolikoko"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Normaali koko"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Kaksinkertainen koko"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Sovita näytölle"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Pysy päällimmäisenä"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Koko näytön videolaite"
@@@ -18022,7 -18022,7 +18480,11 @@@
msgid "Post processing"
msgstr "Jälkikäsittely"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Tekstitystiedosto"
@@@ -18267,7 -18267,7 +18729,11 @@@ msgid "Play another media synchronously
msgstr "Toista toista mediaa samalla (esim. lisä-äänitiedostoa)"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Valitse..."
@@@ -18460,7 -18460,7 +18926,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Tekstityksen koodaus"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Fonttikoko"
@@@ -18691,12 -18691,12 +19161,20 @@@ msgstr "Metatiedon tallennus epäonnist
msgid "VLC was unable to save the meta data."
msgstr "VLC ei voinut tallentaa metatietoja."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Asetukset"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Nollaa kaikki"
@@@ -18878,134 -18878,129 +19356,243 @@@ msgstr "Käytä Growl-ilmoituksia (soit
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Toisto tauolle"
+
+# TOCHECK/FIXME
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Oletusmerkistö"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Näkymän asetukset"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ # TOCHECK/FIXME
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Oletusmerkistö"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Näkymän asetukset"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Kirjasimen väri"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Fontti"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Tekstityskieli"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Suosittava tekstityksen kieli"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Enable OSD"
msgstr "Käytä OSD:tä"
# NOTE: no word in Finnish for "opacity". Better to call it "transparency" and explain the value range.
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Läpinäkyvyys"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Pakota lihavointi"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Pakota lihavointi"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Ääriviivan väri"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Ääriviivan paksuus"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Musta koko näytön tila"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Musta koko näytön tila"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Näyttö"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Lähtömoduuli"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Videoruudunkaappaukset"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Kansio"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Muoto"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Etuliite"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Järjestysnumerot"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Viimeksi tarkistettu: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Ei ole vielä tarkistettu."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Lähtömoduuli"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Videoruudunkaappaukset"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Kansio"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Muoto"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Etuliite"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Järjestysnumerot"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Viimeksi tarkistettu: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Ei ole vielä tarkistettu."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Alhaisin latenssi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Alhainen latenssi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Korkea latenssi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Korkein latenssi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Nollaa asetukset"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -19018,21 -19013,21 +19605,38 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Valitse kansio, johon videoruudunkaappaukset tallennetaan."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Valitse kansio, johon videoruudunkaappaukset tallennetaan."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Choose"
msgstr "Valitse"
# TOCHECK/FIXME: what are "the records" here?
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Kansio (tai tiedostonimi), johon tallennetaan."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Kansio (tai tiedostonimi), johon tallennetaan."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -19040,16 -19035,16 +19644,29 @@@ msgstr "
"Paina uusia näppäimiä toiminnolle\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Virheellinen näppäinyhdistelmä"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Valitettavasti tätä näppäinyhdistelmää ei voi käyttää pikanäppäimenä."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Virheellinen näppäinyhdistelmä"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Valitettavasti tätä näppäinyhdistelmää ei voi käyttää pikanäppäimenä."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Tämä näppäinyhdistelmä on jo käytössä toiminnolle \"%@\"."
@@@ -21202,20 -21197,20 +21819,36 @@@ msgstr "Poista valittu profiili
msgid "Create a new profile"
msgstr "Luo uusi profiili"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Luo"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Profiilin nimi puuttuu"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Profiilin nimi puuttuu"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Profiilille on asetettava nimi."
@@@ -24836,23 -24831,23 +25469,43 @@@ msgstr "Transkoodaava suoratoistolähtÃ
msgid "Overlays/Subtitles"
msgstr "Ylipiirrot/Tekstitys"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Käytettävän kirjasimen fonttiperhe"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Käytettävän kirjasimen fonttitiedosto"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Kirjasinkoko pikseleinä"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Käytettävän kirjasimen fonttiperhe"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Käytettävän kirjasimen fonttitiedosto"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Kirjasinkoko pikseleinä"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24861,11 -24856,11 +25514,19 @@@ msgstr "
"Tämä on videon päälle renderöitävän kirjasimen oletuskoko. Ollessaan jotain "
"muuta kuin 0, tämä yliajaa suhtellisen fontin koon."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Tekstin läpinäkyvyys"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Tekstin läpinäkyvyys"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24873,12 -24868,12 +25534,20 @@@ msgstr "
"Videon päälle renderöitävän tekstin läpinäkyvyys. 0 = läpinäkyvä, 255 = "
"täysin läpinäkymätön. "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Tekstin oletusväri"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24891,12 -24886,12 +25560,20 @@@ msgstr "
"musta, #FF0000 = punainen, #00FF00 = vihreä, #FFFF00 = keltainen (pun. + "
"vi.), #FFFFFF = valkoinen."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Fontin suhteellinen koko"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24905,59 -24900,59 +25582,111 @@@ msgstr "
"Videon päälle renderöitävän tekstin oletuskoko (suhteellinen). Jos "
"absoluuttinen koko on määrätty, suhteellinen koko yliajetaan."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Taustan läpinäkyvyys"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Taustaväri"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Ääriviivan läpinäkyvyys"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Varjon läpinäkyvyys"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Varjon väri"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Varjon suunta"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Varjon etäisyys"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Taustan läpinäkyvyys"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Taustaväri"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Ääriviivan läpinäkyvyys"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Varjon läpinäkyvyys"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Varjon väri"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Varjon suunta"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Varjon etäisyys"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Pienempi"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Pieni"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Suuri"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Suurempi"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Käytä YUVP-renderöijää"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Käytä YUVP-renderöijää"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24965,23 -24960,23 +25694,43 @@@ msgstr "
"Tämä renderöi tekstin käyttäen 'paletti-YUV'-renderöijää. Tätä tarvitaan "
"vain, jos haluat pakata tekstityksiä DVB-muotoon."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Ohut"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Paksu"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Tekstirenderöijä"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 -tekstirenderöijä"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Ohut"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Paksu"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Tekstirenderöijä"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 -tekstirenderöijä"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/fr.po
index ed88657,0779ca9..489dccc
--- a/po/fr.po
+++ b/po/fr.po
@@@ -4,7 -4,6 +4,10 @@@
#
# Translators:
# Calixte, 2013
++<<<<<<< HEAD
+# Christophe Lherieau <skimpax at gmail.com>, 2013
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# Eramdam <damien.erambert at me.com>, 2013
# Éric Lassauge <lassauge {AT} users {dot} sourceforge {dot} net>, 2013
# sebasthug <sebhug at free.fr>, 2013
@@@ -17,9 -16,9 +20,15 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-12-02 20:57+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-10-15 18:13+0000\n"
+ "Last-Translator: Eric Lassauge <lassauge at users.sourceforge.net>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: French (http://www.transifex.com/projects/p/vlc-trans/"
"language/fr/)\n"
"Language: fr\n"
@@@ -147,7 -146,7 +156,11 @@@ msgstr "Paramètres et modules audio di
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -505,10 -504,10 +518,17 @@@ msgid "&About
msgstr "À &propos"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -547,17 -546,17 +567,29 @@@ msgid "Save...
msgstr "Enregistrer…"
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Tout répéter"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Répéter un"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -666,7 -665,7 +698,11 @@@ msgstr "Le nombre maximum de filtres (%
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Désactiver"
@@@ -873,7 -872,7 +909,11 @@@ msgid_plural "
"%u modules were not displayed because they only have advanced options.\n"
msgstr[0] "%u module n'est pas affiché car il n'a que des options avancées.\n"
msgstr[1] ""
++<<<<<<< HEAD
+"%u module ne sont pas affichés car ils n'ont que des options avancées.\n"
++=======
+ "%u modules ne sont pas affichés car ils n'ont que des options avancées.\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/help.c:704 src/config/help.c:708
msgid ""
@@@ -1373,21 -1372,21 +1413,37 @@@ msgstr "Débit d'images
msgid "Decoded format"
msgstr "Format décodé"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Votre média d'entrée ne peut être ouvert"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Votre média d'entrée ne peut être ouvert"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC ne peut pas ouvrir « %s ». Vérifiez les messages pour plus de détails."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "Impossible de reconnaître le format du média d'entrée"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "Impossible de reconnaître le format du média d'entrée"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1822,7 -1821,7 +1878,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1910,7 -1909,7 +1970,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Aucun"
@@@ -1941,7 -1940,7 +2005,11 @@@ msgstr "
"Module de sortie vidéo utilisé par VLC. Le comportement par défaut est de "
"choisir automatiquement le meilleur module disponible."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Activer la vidéo"
@@@ -2150,7 -2149,7 +2218,11 @@@ msgstr "
"défaut."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Toujours au-dessus"
@@@ -2204,7 -2203,7 +2276,11 @@@ msgstr "Cacher le curseur et le contrô
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2213,7 -2212,7 +2289,11 @@@ msgstr "Désentrelacer
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Mode de désentrelacement"
@@@ -2273,7 -2272,7 +2353,11 @@@ msgstr "
"Désactiver le gestionnaire d'énergie pendant la lecture, pour éviter que "
"l'ordinateur soit mis en veille pour cause d'inactivité."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Décorations de fenêtres"
@@@ -2474,7 -2473,7 +2558,11 @@@ msgstr "
"carrés (1:1). Si vous avez un écran 16:9, vous devrez peut-être utiliser 4:3 "
"afin de préserver les proportions."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Sauter des images"
@@@ -2622,12 -2621,12 +2710,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2635,7 -2634,7 +2732,11 @@@ msgid "Default
msgstr "Prédéfini(e)"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2987,7 -2986,7 +3088,11 @@@ msgstr "
"incrustations."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3938,7 -3937,7 +4043,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "Réglages des raccourcis clavier (« hotkeys »)."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignorer"
@@@ -3964,8 -3963,8 +4073,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4054,10 -4053,10 +4168,17 @@@ msgid "Slower (fine)
msgstr "Ralentir un peu"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4072,10 -4071,10 +4193,17 @@@ msgstr "
"suivant de la liste de lecture."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Précédent"
@@@ -4086,9 -4085,9 +4214,15 @@@ msgstr "
"Sélectionnez la combinaison de touches à utiliser pour passer à l'élément "
"précédent de la liste de lecture."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4360,9 -4359,9 +4494,15 @@@ msgstr "
"Sélectionnez la combinaison de touches à utiliser pour diminuer le volume."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Couper le son"
@@@ -4799,7 -4798,7 +4939,11 @@@ msgstr "Boucler entre les différents p
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Capture d'écran"
@@@ -5007,12 -5006,12 +5151,21 @@@ msgstr "Téléchargement…
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Annuler"
@@@ -5780,7 -5779,7 +5933,11 @@@ msgstr "Rognages
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Format d'écran"
@@@ -8230,7 -8229,7 +8387,11 @@@ msgstr "Module de capture d'écran
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Écran"
@@@ -8981,7 -8980,7 +9142,11 @@@ msgstr "Vol max #
msgid "Volume Set"
msgstr "Volume"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10160,7 -10159,7 +10325,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "Sortie audio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "La sortie audio a échoué"
@@@ -10193,7 -10192,7 +10362,11 @@@ msgstr "Sortie audio « AudioQueue Â
msgid "Android AudioTrack audio output"
msgstr "Sortie audio « AudioTrack » (Android)"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "Sortie AudioUnit pour iOS"
@@@ -10201,22 -10200,22 +10374,38 @@@
msgid "Last audio device"
msgstr "Dernier périphérique audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Sortie HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Sortie HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Le périphérique audio sélectionné est utilisé en exclusivité par un autre "
"programme."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Le périphérique audio n'est pas configuré"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Le périphérique audio n'est pas configuré"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10225,11 -10224,11 +10414,19 @@@ msgstr "
"« Audio Midi Setup » du menu « /Applications/Utilitaire ». Le mode stéréo "
"est actuellement utilisé."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Périphérique audio « System Sound » en sortie"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Périphérique audio « System Sound » en sortie"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (sortie encodée)"
@@@ -11516,46 -11515,46 +11713,74 @@@ msgstr "Ombre
msgid "Outline"
msgstr "Contour"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Noir"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Gris"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Argent"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Blanc"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Marron"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Rouge"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11563,61 -11562,61 +11788,97 @@@ msgid "Fuchsia
msgstr "Fuchsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Jaune"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Olive"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Vert"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Emeraude"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Citron vert"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Violet"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Marine"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Bleu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11751,7 -11750,7 +12012,11 @@@ msgstr "Sous-titres (avancé)
msgid "Subtitle renderers using libass"
msgstr "Paramètres de sous-titres avec libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Mise à jour du cache pour les polices de caractères"
@@@ -13689,10 -13688,10 +13954,17 @@@ msgid "Fast
msgstr "Rapide"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -13801,8 -13800,8 +14073,13 @@@ msgid "D-Bus control interface
msgstr "Interface de contrôle D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14156,9 -14155,9 +14433,15 @@@ msgstr "Initialisation
msgid "Opening"
msgstr "Ouverture"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pause"
@@@ -16102,7 -16101,7 +16385,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Démultiplexeur MPEG Transport Stream"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Télétexte"
@@@ -16294,7 -16293,7 +16581,11 @@@ msgid "VLC media player Help
msgstr "Aide du Lecteur multimédia VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Index"
@@@ -16382,9 -16381,9 +16673,15 @@@ msgstr "Entrer le nom du nouveau profil
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Enregistrer"
@@@ -16529,7 -16528,7 +16826,11 @@@ msgstr "
"Le flux doit être en cours de lecture ou en pause pour que les signets "
"fonctionnent."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Aller à "
@@@ -16549,7 -16548,7 +16850,11 @@@ msgstr "
msgid "Backward"
msgstr "Reculer"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16559,7 -16558,7 +16864,11 @@@ msgstr "
msgid "Forward"
msgstr "Avancer"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16579,84 -16578,84 +16888,155 @@@ msgstr "Passer au plein écran
msgid "Click to enable fullscreen video playback."
msgstr "Cliquez pour passer au plein écran pendant la lecture"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Cliquez pour arrêter la lecture."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Afficher/cacher la liste de lecture"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Cliquez pour arrêter la lecture."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Afficher/cacher la liste de lecture"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Répéter"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Aléatoire"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Aléatoire"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Cliquez pour couper/activer le son."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Volume max"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Clic pour jouer l'audio au volume maximal."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Cliquez pour couper/activer le son."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Volume max"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Clic pour jouer l'audio au volume maximal."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Effets"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Cliquer pour aller à l'élément précédent de la liste de lecture."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Cliquer pour aller à l'élément suivant de la liste de lecture."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Cliquer pour aller à l'élément précédent de la liste de lecture."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Cliquer pour aller à l'élément suivant de la liste de lecture."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Conversion & Flux"
@@@ -16692,7 -16691,7 +17072,11 @@@ msgstr "Choisir une destination
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16879,8 -16878,8 +17263,13 @@@ msgid "A SDP export is requested, but n
msgstr "Un support SDP est demandé, mais aucune URL n'est fournie."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Personnalisé"
@@@ -16982,36 -16981,36 +17371,68 @@@ msgstr "Aucune autre information que vo
msgid "Don't ask again"
msgstr "Ne plus redemander"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "Lecteur multimédia VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Aucun fichier CrashLog trouvé"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "Lecteur multimédia VLC"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Aucun fichier CrashLog trouvé"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Continuer"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Impossible de trouver un plantage précédent."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Effacer les anciennes préférences ?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Un ancien fichier de préférences de VLC a été trouvé."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Déplacer le dans la corbeille et relancez VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Impossible de trouver un plantage précédent."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Effacer les anciennes préférences ?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Un ancien fichier de préférences de VLC a été trouvé."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Déplacer le dans la corbeille et relancez VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC Debug Log (%s).rtf"
@@@ -17186,7 -17185,7 +17607,11 @@@ msgid "
msgstr ""
"Cette option permet à l'interface de changer son icône en diverses occasions."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Forcer le format d'affichage"
@@@ -17317,7 -17316,7 +17742,11 @@@ msgstr "Masquer VLC
msgid "Hide Others"
msgstr "Masquer les autres"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Tout afficher"
@@@ -17402,15 -17401,15 +17831,27 @@@ msgstr "Synchronisation de piste
msgid "A→B Loop"
msgstr "Boucle A→B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Quitter après la lecture"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Avancer"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Quitter après la lecture"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Avancer"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Reculer"
@@@ -17426,30 -17425,30 +17867,56 @@@ msgstr "Réduire le volume
msgid "Audio Device"
msgstr "Périphérique audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Taille moitiée"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Taille normale"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Taille double"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Ajuster à l'écran"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Taille moitiée"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Taille normale"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Taille double"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Ajuster à l'écran"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Flotter au-dessus"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Sortie vidéo en plein écran"
@@@ -17458,7 -17457,7 +17925,11 @@@
msgid "Post processing"
msgstr "Post-traitement"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Ajouter un fichier de sous-titres…"
@@@ -17690,7 -17689,7 +18161,11 @@@ msgstr "
"Jouer en synchronisation avec autre média (fichier audio supplémentaire, …)"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Choisir…"
@@@ -17760,8 -17759,6 +18235,11 @@@ msgid "
"Enter a URL here to open the network stream. To open RTP or UDP streams, "
"click on the respective button below."
msgstr ""
++<<<<<<< HEAD
+"Saisir ici un URL pour ouvrir le flux réseau. Pour ouvrir un flux RTP ou "
+"UDP, cliquer sur le bouton correspondant ci-dessous."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:192
msgid "Open RTP/UDP Stream"
@@@ -17874,7 -17871,7 +18352,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Encodage des sous-titres"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Taille"
@@@ -18103,12 -18100,12 +18585,20 @@@ msgstr "Erreur lors de l'enregistremen
msgid "VLC was unable to save the meta data."
msgstr "VLC est incapable d'enregistrer les méta-données."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Préférences"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Tout rétablir"
@@@ -18289,130 -18286,125 +18779,238 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Interface Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Pause de iTunes pendant la lecture VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Encodage par défaut"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Préférences d'affichage"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Encodage par défaut"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Préférences d'affichage"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Couleur de la police"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Police"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Langue des sous-titres"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Langue des sous-titres"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Langue sous-titres préférée"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Activer OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Activer OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Opacité"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Forcer l'affichage en gras"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Forcer l'affichage en gras"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Couleur du contour"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Épaisseur des contours"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Passer au noir en plein écran"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Passer au noir en plein écran"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Affichage"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Modules de sortie"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Captures d'écran"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Dossier"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Format"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Préfixe"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Numérotation séquentielle"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Dernière vérification le : %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Pas de contrôle effectué."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Modules de sortie"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Captures d'écran"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Dossier"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Format"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Préfixe"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Numérotation séquentielle"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Dernière vérification le : %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Pas de contrôle effectué."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Latence la plus basse"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Latence faible"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Latence élevée"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Latence la plus haute"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Rétablir"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18433,20 -18425,20 +19031,37 @@@ msgstr "
"\n"
"Voulez-vous vraiment continuer ?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Choisissez le dossier pour enregister les captures d'écran."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Choisir"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Dossier ou fichier pour les enregistrements."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Choisissez le dossier pour enregister les captures d'écran."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Choisir"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Dossier ou fichier pour les enregistrements."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18454,16 -18446,16 +19069,29 @@@ msgstr "
"Appuyez sur la nouvelle combinaison pour\n"
"« %@ »"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Combinaison invalide"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Désolé, mais cette combinaison de touches ne peut pas être utilisée."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Combinaison invalide"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Désolé, mais cette combinaison de touches ne peut pas être utilisée."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Cette combinaison est déjà utilisée par « %@ »."
@@@ -20553,20 -20545,20 +21181,36 @@@ msgstr "Supprimer le profil sélectionn
msgid "Create a new profile"
msgstr "Créer un nouveau profil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Créer"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Nom de profil absent"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Nom de profil absent"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Vous devez donner un nom pour le profil"
@@@ -24087,23 -24079,23 +24731,43 @@@ msgstr "Transcode le flux
msgid "Overlays/Subtitles"
msgstr "Overlay/Sous-titres"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Police proportionnelle"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Fichier de police à utiliser."
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Fichier de police à utiliser"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Taille de la police en pixels"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Police proportionnelle"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Fichier de police à utiliser."
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Fichier de police à utiliser"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Taille de la police en pixels"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24112,22 -24104,22 +24776,38 @@@ msgstr "
"Taille des polices à afficher. Si le réglage est différent de 0, cette "
"option outrepassera la taille de police relative. "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Opacité du texte"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Opacité du texte"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr "Opacité du texte affiché (0 = transparent, 255 = opaque). "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Couleur par défaut du texte"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24140,12 -24132,12 +24820,20 @@@ msgstr "
"rouge, puis le vert, puis le bleu. Par exemple, #000000 = noir, #FF0000 = "
"rouge, #00FF00 = vert, #FFFF00 = jaune (rouge+vert), #FFFFFF = blanc."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Taille relative"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24154,59 -24146,59 +24842,111 @@@ msgstr "
"Taille par défaut relative des polices à afficher. Si une taille absolue est "
"spécifiée, la taille relative sera surchargée."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Opacité de l'arrière-plan"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Couleur de l'arrière-plan"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Opacité du contour"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Opacité de l'ombre"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Couleur de l'ombre"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Angle de l'ombre"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Décalage de l'ombre"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Opacité de l'arrière-plan"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Couleur de l'arrière-plan"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Opacité du contour"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Opacité de l'ombre"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Couleur de l'ombre"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Angle de l'ombre"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Décalage de l'ombre"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Plus petit"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Petit"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Grand"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Plus grand"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Rendu YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Rendu YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24214,23 -24206,23 +24954,43 @@@ msgstr "
"Afficher la police en utilisant le YUV palettisé. Cette option n'est "
"nécessaire que pour encoder des sous-titres DVB."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Fin"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Épais"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Rendu du texte"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Moteur de rendu freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Fin"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Épais"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Rendu du texte"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Moteur de rendu freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -29117,6 -29109,9 +29877,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Liste du gestionnaire de médias"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Montre les détails"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -31031,10 -31026,6 +31797,13 @@@
#~ msgstr "Aucune donnée de guide des programmes"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Détails des codecs"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "This file countains an optional CRL to prevent remote clients from using "
#~ "revoked certificates in TLS sessions."
diff --combined po/fur.po
index 3deb45d,22a96a0..682a86d
--- a/po/fur.po
+++ b/po/fur.po
@@@ -7,7 -7,7 +7,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2006-10-22 20:42+0000\n"
"Last-Translator: A. Decorte <klenje at adriacom.it>\n"
"Language-Team: Friulian <fur at li.org>\n"
@@@ -138,7 -138,7 +142,11 @@@ msgstr "Impostazions variis su audio e
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -467,10 -467,10 +475,17 @@@ msgid "&About
msgstr "Informazions su"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -516,18 -516,18 +531,30 @@@ msgid "Save...
msgstr "Salve"
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Repeat All"
msgstr "Ripet dut"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Torne a riprodûsi une volte"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -614,7 -614,7 +641,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Disative"
@@@ -1330,20 -1330,20 +1361,36 @@@ msgstr "Frecuence fotograms
msgid "Decoded format"
msgstr "Codifiche CBR"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1745,7 -1745,7 +1792,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1832,7 -1832,7 +1883,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr ""
@@@ -1856,7 -1856,7 +1911,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Ative video"
@@@ -2049,7 -2049,7 +2108,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Simpri in prin plan"
@@@ -2105,7 -2105,7 +2168,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2114,7 -2114,7 +2181,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
#, fuzzy
msgid "Deinterlace mode"
@@@ -2174,7 -2174,7 +2245,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr "Disative il salve-visôr dilunc la riproduzion video."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Decorazions dai barcons"
@@@ -2351,7 -2351,7 +2426,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Salte fotograms"
@@@ -2485,12 -2485,12 +2564,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2498,7 -2498,7 +2586,11 @@@ msgid "Default
msgstr "Predeterminât"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2820,7 -2820,7 +2912,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3665,7 -3665,7 +3761,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Ignore"
msgstr "nissun"
@@@ -3693,8 -3693,8 +3793,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3779,10 -3779,10 +3884,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3795,10 -3795,10 +3907,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Precedent"
@@@ -3807,9 -3807,9 +3926,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4046,9 -4046,9 +4171,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Cuiet"
@@@ -4483,7 -4483,7 +4614,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Istantanie"
@@@ -4682,12 -4682,12 +4817,21 @@@ msgstr "Daûr a discjamâ
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Scancele"
@@@ -5459,7 -5459,7 +5603,11 @@@ msgstr "Taie
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "Esperanto"
@@@ -7962,7 -7962,7 +8110,11 @@@ msgstr "Visôr
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Visôr"
@@@ -8798,7 -8798,7 +8950,11 @@@ msgstr "
msgid "Volume Set"
msgstr "Volum"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10015,7 -10015,7 +10171,11 @@@ msgstr "Dolby Surround
msgid "ALSA audio output"
msgstr "URL de jessude audio"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "URL de jessude audio"
@@@ -10051,7 -10051,7 +10211,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "Jessude video su dit il visôr"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "URL de jessude audio"
@@@ -10061,33 -10061,33 +10225,57 @@@
msgid "Last audio device"
msgstr "Dispositîf CD audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
++=======
+ #: modules/audio_output/auhal.c:166
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "HAL AudioUnit output"
msgstr "URL de jessude audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
++=======
+ #: modules/audio_output/auhal.c:578
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio device is not configured"
msgstr "Non dispositîf audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Dispositîf CD audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -11361,27 -11361,27 +11549,43 @@@ msgstr "Casuâl no atîf
msgid "Outline"
msgstr "Nete"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Neri"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
#, fuzzy
msgid "Gray"
msgstr "Todesc"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
#, fuzzy
msgid "Silver"
msgstr "Servidôr"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
@@@ -11389,7 -11389,7 +11593,11 @@@
msgid "White"
msgstr "Titul"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
#, fuzzy
@@@ -11397,14 -11397,14 +11605,22 @@@ msgid "Maroon
msgstr "Breton"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11413,7 -11413,7 +11629,11 @@@ msgid "Fuchsia
msgstr "Fusion"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11421,7 -11421,7 +11641,11 @@@
msgid "Yellow"
msgstr "lent"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
#, fuzzy
@@@ -11429,21 -11429,21 +11653,33 @@@ msgid "Olive
msgstr "Vieris"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Vert"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
#, fuzzy
msgid "Teal"
msgstr "Tamil"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
@@@ -11451,14 -11451,14 +11687,22 @@@
msgid "Lime"
msgstr "MIME"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
#, fuzzy
msgid "Purple"
msgstr "Precedent"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
#, fuzzy
@@@ -11466,14 -11466,14 +11710,22 @@@ msgid "Navy
msgstr "Navajo"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Blu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11616,7 -11616,7 +11868,11 @@@ msgstr "Codifiche dai sot titui
msgid "Subtitle renderers using libass"
msgstr "Codifiche dai sot titui"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13510,10 -13510,10 +13766,17 @@@ msgid "Fast
msgstr "Tache"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normâl"
@@@ -13636,8 -13636,8 +13899,13 @@@ msgid "D-Bus control interface
msgstr "Cambie interface"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14005,9 -14005,9 +14273,15 @@@ msgstr "Talian
msgid "Opening"
msgstr "Vierç"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pause"
@@@ -16034,7 -16034,7 +16308,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Teletext"
msgstr "Sielç l'angul"
@@@ -16235,7 -16235,7 +16513,11 @@@ msgid "VLC media player Help
msgstr "Riprodutôr multimediâl VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Indis"
@@@ -16336,9 -16336,9 +16618,15 @@@ msgstr "Par plasê inserìs une direzio
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Salve"
@@@ -16483,7 -16483,7 +16771,11 @@@ msgstr "Nissun %@s cjatât
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Va a un moment"
@@@ -16504,7 -16504,7 +16796,11 @@@ msgstr "
msgid "Backward"
msgstr "tempoâl"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16515,7 -16515,7 +16811,11 @@@ msgstr "
msgid "Forward"
msgstr "tempoâl"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16537,91 -16537,91 +16837,162 @@@ msgstr "Mostre interface
msgid "Click to enable fullscreen video playback."
msgstr "Disative il salve-visôr dilunc la riproduzion video."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "Riproduzion locâl"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "Salve liste di riproduzion"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "Ripet dut"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "Sielç la scurte par gjavâ l'audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "Volum predeterminât dal audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
#, fuzzy
msgid "Effects"
msgstr "Efiet"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr "Element esistent de liste di riproduzion"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -16662,7 -16662,7 +17033,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16865,8 -16865,8 +17240,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
#, fuzzy
msgid "Custom"
@@@ -16967,39 -16967,39 +17347,71 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "Riprodutôr multimediâl VLC"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
++=======
+ #: modules/gui/macosx/intf.m:1877
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "No CrashLog found"
msgstr "Nissun %@s cjatât"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Va indevant"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Remove old preferences?"
msgstr "Azere lis preferencis"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -17160,7 -17160,7 +17572,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Lock Aspect Ratio"
msgstr "Aplicazion"
@@@ -17303,7 -17303,7 +17719,11 @@@ msgstr "Plate VLC
msgid "Hide Others"
msgstr "Altri"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Mostre dut"
@@@ -17396,17 -17396,17 +17816,29 @@@ msgstr "Sielç trace audio
msgid "A→B Loop"
msgstr "Logo"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Quit after Playback"
msgstr "Riproduzion locâl"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
++=======
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Step Forward"
msgstr "tempoâl"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Step Backward"
msgstr "tempoâl"
@@@ -17426,35 -17426,35 +17858,61 @@@ msgstr "Volum predeterminât dal audio
msgid "Audio Device"
msgstr "Dispositîf CD audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Half Size"
msgstr "Dimension"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
++=======
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Normal Size"
msgstr "Normâl"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
++=======
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Double Size"
msgstr "Normâl"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
++=======
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Fit to Screen"
msgstr "Adate al visôr"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Float on Top"
msgstr "Simpri in prin plan"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Fullscreen Video Device"
msgstr "Jessude video su dit il visôr"
@@@ -17464,7 -17464,7 +17922,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "File dai sot titui"
@@@ -17719,7 -17719,7 +18181,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Sielç"
@@@ -17913,7 -17913,7 +18379,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Codifiche dai sot titui"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Dimension caratars"
@@@ -18173,12 -18173,12 +18643,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Preferencis"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Azere dut"
@@@ -18380,145 -18380,140 +18858,253 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Riproduzion locâl"
+
+#: modules/gui/macosx/simple_prefs.m:377
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Default Encoding"
msgstr "Dispositîfs predeterminâts"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:378
++=======
+ #: modules/gui/macosx/simple_prefs.m:377
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Display Settings"
msgstr "Risoluzion dal visôr"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
#, fuzzy
msgid "Font color"
msgstr "Compilatôr: "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Caratar"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Lenghe sot titui"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Lenghe audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Enable OSD"
msgstr "Ative"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Opacitât"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Force bold"
msgstr "Sfuarce IPv6"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "Nete"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Black screens in Fullscreen mode"
msgstr "Implene dut il visôr"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
#, fuzzy
msgid "Display"
msgstr "Mostre"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Output module"
msgstr "Modui in jessude"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
++=======
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Video snapshots"
msgstr "Formât istantaniis videos"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
++=======
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Folder"
msgstr "Filtris"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
++=======
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Format"
msgstr "normâl"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
++=======
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Prefix"
msgstr "Precedent"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Azere lis preferencis"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18531,37 -18526,37 +19117,67 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Sielç"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Sielç"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the directory or filename where the records will be stored."
msgstr "La cartele dulà salvâ lis istantaniis dai videos."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Invalid combination"
msgstr "Selezion invalide"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -20721,20 -20716,20 +21337,36 @@@ msgstr "Tu scugnis sielzi doi segnelibr
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Cree"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "You must set a name for the profile."
msgstr "Rileve in automatic files dai sot titui"
@@@ -24420,37 -24415,37 +25052,65 @@@ msgstr "Sielç une jessude pal flus
msgid "Overlays/Subtitles"
msgstr "Vierç i sot titui"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font family for the font you want to use"
msgstr "Non dal file dal caratar che tu vuelis doprâ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:159
++=======
+ #: modules/text_renderer/freetype.c:158
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font file for the font you want to use"
msgstr "Non dal file dal caratar che tu vuelis doprâ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Dimension caratars in pixels"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Dimension caratars in pixels"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "Nete"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24458,12 -24453,12 +25118,20 @@@ msgstr "
"La opacitât (opost de trasparence) dal test che al sarà disegnât sul video. "
"0 = trasparent, 255 = opac. "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Colôr predeterminât dal test"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24472,101 -24467,101 +25140,181 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Dimension relative caratars"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "Sfont"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "Sfont"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "Nete"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
++=======
+ #: modules/text_renderer/freetype.c:187
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow opacity"
msgstr "Casuâl no atîf"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "Casuâl no atîf"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
++=======
+ #: modules/text_renderer/freetype.c:189
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow angle"
msgstr "Casuâl no atîf"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:191
++=======
+ #: modules/text_renderer/freetype.c:190
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow distance"
msgstr "Casuâl no atîf"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Plui piçule"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Piçule"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Grande"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Plui grande"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text renderer"
msgstr "Gjenar CD-Text"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/ga.po
index 436aa7d,2e94381..855e563
--- a/po/ga.po
+++ b/po/ga.po
@@@ -7,7 -7,7 +7,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc 1.1.1\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2012-06-03 03:03-0000\n"
"Last-Translator: Seanán Ó CoistÃn <seananoc at gmail.com>\n"
"Language-Team: Irish\n"
@@@ -136,7 -136,7 +140,11 @@@ msgstr "Socruithe fuaime agus modúil i
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -464,10 -464,10 +472,17 @@@ msgid "&About
msgstr "M&aidir le"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -506,17 -506,17 +521,29 @@@ msgid "Save...
msgstr "Taisc..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Athsheinn Uile"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Athsheinn Ceann Amháin"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -596,7 -596,7 +623,11 @@@ msgstr "Sroicheadh uaslÃon na scagairÃ
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "DÃchumasaigh"
@@@ -1307,22 -1307,22 +1338,38 @@@ msgstr "
msgid "Decoded format"
msgstr "DÃchódaithe"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Nà féidir d'ionchur a oscailt"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Nà féidir d'ionchur a oscailt"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"Nà féidir le VLC an MRL '%s' a oscailt. Féach an t-oireas chun na sonraà a "
"fheiceáil."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "Nà féidir le VLC cuma an ionchuir a aithint"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "Nà féidir le VLC cuma an ionchuir a aithint"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1725,7 -1725,7 +1772,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1813,7 -1813,7 +1864,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Dada"
@@@ -1839,7 -1839,7 +1894,11 @@@ msgstr "
"Seo é an modh aschurtha fÃseáin a bhaineann VLC feidhm as. Is é an t-iompar "
"réamhshocraithe ná chun an modh is fearr ar fáil a roghnú go huathoibrÃoch."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Cumasaigh an fÃseán"
@@@ -2031,7 -2031,7 +2090,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Ar barr i gcónaÃ"
@@@ -2088,7 -2088,7 +2151,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2097,7 -2097,7 +2164,11 @@@ msgstr "DÃchrosfhigh
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Mód dÃchrosfhite"
@@@ -2153,7 -2153,7 +2224,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Maisiúcháin na fuinneoige"
@@@ -2323,7 -2323,7 +2398,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2452,12 -2452,12 +2531,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2465,7 -2465,7 +2553,11 @@@ msgid "Default
msgstr "Réamhshocrú"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2770,7 -2770,7 +2862,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3597,7 -3597,7 +3693,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ná bac leis"
@@@ -3621,8 -3621,8 +3721,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3704,10 -3704,10 +3809,17 @@@ msgid "Slower (fine)
msgstr "NÃos moille (mÃn)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3720,10 -3720,10 +3832,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Roimhe"
@@@ -3732,9 -3732,9 +3851,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3969,9 -3969,9 +4094,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Balbhaigh"
@@@ -4393,7 -4393,7 +4524,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Roghbhlúire"
@@@ -4592,12 -4592,12 +4727,21 @@@ msgstr "Ag Ãosluchtú ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Cealaigh"
@@@ -5361,7 -5361,7 +5505,11 @@@ msgstr "Bearr
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Cóimheas treoÃochta"
@@@ -7736,7 -7736,7 +7884,11 @@@ msgstr "Ionchur scáileáin
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Scáileán"
@@@ -8504,7 -8504,7 +8656,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9645,7 -9645,7 +9801,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Theip ar an aschur fuaime"
@@@ -9681,7 -9681,7 +9841,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "Aschur fuaime Pulseaudio"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "Theip ar an aschur fuaime"
@@@ -9691,31 -9691,31 +9855,55 @@@
msgid "Last audio device"
msgstr "Gléas fuaime"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "NÃl an gléas fuaime cumraithe"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "NÃl an gléas fuaime cumraithe"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Roghnaigh do ghléas aschurtha fuaime"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10900,46 -10900,46 +11088,74 @@@ msgstr "Scáth
msgid "Outline"
msgstr "ImlÃne"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Dubh"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Liath"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Airgead"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Bán"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Marún"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Dearg"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10947,61 -10947,61 +11163,97 @@@ msgid "Fuchsia
msgstr "Fiúise"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "BuÃ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "GlasbhuÃ"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Uaine"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Téalghorm"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "LÃoma"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Corcra"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Dubhghorm"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Gorm"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11135,7 -11135,7 +11387,11 @@@ msgstr "Fotheidil (ardroghanna)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12961,10 -12961,10 +13217,17 @@@ msgid "Fast
msgstr "NÃos tapúla"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Gnáth"
@@@ -13077,8 -13077,8 +13340,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13420,9 -13420,9 +13688,15 @@@ msgstr "Réimniú
msgid "Opening"
msgstr "Ag oscailt"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Cuir ar sos"
@@@ -15361,7 -15361,7 +15635,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teilithéacs"
@@@ -15541,7 -15541,7 +15819,11 @@@ msgid "VLC media player Help
msgstr "Cabhair do sheinnteoir meán VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Treorán"
@@@ -15632,9 -15632,9 +15914,15 @@@ msgstr "ClóscrÃobh ainm don fillteá
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Cuir i dtaisce"
@@@ -15781,7 -15781,7 +16069,11 @@@ msgstr "
"Nà mór don sruth bheith ag seinm nó ar shos ionas go bhfeidhmeoidh na "
"ceanáin."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Léim Chuig Am"
@@@ -15801,7 -15801,7 +16093,11 @@@ msgstr "
msgid "Backward"
msgstr "Siar"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15811,7 -15811,7 +16107,11 @@@ msgstr "
msgid "Forward"
msgstr "Ar aghaidh"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15831,86 -15831,86 +16131,157 @@@ msgstr "Scoránaigh go lánscáileáin
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "Roghnaigh an cnaipe aicearra chun an athsheinm a stad."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "Cuardaigh i Seinnréim"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Athsheinn"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Seinn go fánach"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Seinn go fánach"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Airde Iomlán"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Airde Iomlán"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "MaisÃocht"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -15951,7 -15951,7 +16322,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16148,8 -16148,8 +16523,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Saincheaptha"
@@@ -16244,37 -16244,37 +16624,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "Seinnteoir meán VLC"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Lean ar aghaidh"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "NÃorbh fhéidir rian ar bith de thuairt a tharla cheana a aimsiú."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Bain sean sainroghanna?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "AimsÃodh sean leagan de chomhaid shainroghanna VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "NÃorbh fhéidir rian ar bith de thuairt a tharla cheana a aimsiú."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Bain sean sainroghanna?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "AimsÃodh sean leagan de chomhaid shainroghanna VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16439,7 -16439,7 +16851,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Glasaigh an Cóimheas TreoÃochta"
@@@ -16580,7 -16580,7 +16996,11 @@@ msgstr "Cuir VLC i bhfolach
msgid "Hide Others"
msgstr "Folaigh Eile"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Taispeáin Uile"
@@@ -16669,15 -16669,15 +17089,27 @@@ msgstr "
msgid "A→B Loop"
msgstr "Lúb A->B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Scoir tar éis Athsheinm"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Céim Ar Aghaidh"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Scoir tar éis Athsheinm"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Céim Ar Aghaidh"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Céim Siar"
@@@ -16693,30 -16693,30 +17125,56 @@@ msgstr "Laghdaigh an Airde
msgid "Audio Device"
msgstr "Gléas Fuaime"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Leathmhéid"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Gnáthmhéid"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Méid Faoi Dhó"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Oiriúnaigh don Scáileán"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Leathmhéid"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Gnáthmhéid"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Méid Faoi Dhó"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Oiriúnaigh don Scáileán"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Cuir ag snámh ar barr"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Gléas FÃseáin Lánscáileáin"
@@@ -16725,7 -16725,7 +17183,11 @@@
msgid "Post processing"
msgstr "Iar-chóireáil"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Comhad Fotheidil"
@@@ -16960,7 -16960,7 +17422,11 @@@ msgid "Play another media synchronously
msgstr "Seinn meán eile in éineacht leis"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Roghnaigh..."
@@@ -17146,7 -17146,7 +17612,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Moill sna fotheidil"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Méid na clófhoirne"
@@@ -17377,12 -17377,12 +17847,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr "Theip ar VLC na meitea-sonraà a chur i dtaisce."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Sainroghanna"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Athshocraigh Uile"
@@@ -17562,133 -17562,128 +18040,241 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Cuir an athsheinm ar sos"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Ionchódú Réamhshocraithe"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Socruithe Taispeána"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Ionchódú Réamhshocraithe"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Socruithe Taispeána"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Dath na clófhoirne"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Clófhoireann"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Teanga an fhotheidil"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Teanga na bhfotheideal is fearr leat"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Cumasaigh OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Cumasaigh OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Teimhneacht"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Force bold"
msgstr "Éignigh fuaim aonfhónach"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Dath na himlÃne"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Tiús na himlÃne"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Scáileáin dhubha i modh Lánscáileáin"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Scáileáin dhubha i modh Lánscáileáin"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Taispeáin"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Modúl aschurtha"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Roghbhlúirà fÃseáin"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Fillteán"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Cuma"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "RéimÃr"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Uimhriú sheicheamhach"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "An dhearbháil dheiridh ar an : %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Nà dhearnadh dearbháil fós."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Modúl aschurtha"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Roghbhlúirà fÃseáin"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Fillteán"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Cuma"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "RéimÃr"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Uimhriú sheicheamhach"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "An dhearbháil dheiridh ar an : %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Nà dhearnadh dearbháil fós."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Aga folaigh is Ãsle"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Aga folaigh Ãseal"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Aga folaigh ard"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Aga folaigh nÃos airde"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Athshocraigh Sainroghanna"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17701,21 -17696,21 +18287,38 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Roghnaigh an fillteán ina gcuirfear i dtaisce na roghbhlúirà fÃseáin."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Roghnaigh"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Roghnaigh an fillteán ina gcuirfear i dtaisce na roghbhlúirà fÃseáin."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Roghnaigh"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the directory or filename where the records will be stored."
msgstr "An chomhadlann ina gcuirfear roghbhlúirà fÃseáin i dtaisce."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -17723,16 -17718,16 +18326,29 @@@ msgstr "
"Brúigh cnaipà nua do\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Teaglaim neamhbhailÃ"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Faraor, nà féidir na cnaipà seo a roghnú mar chnaipà aicearra."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Teaglaim neamhbhailÃ"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Faraor, nà féidir na cnaipà seo a roghnú mar chnaipà aicearra."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Tá an teaglaim sin gafa cheana ag \"%@\"."
@@@ -19750,20 -19745,20 +20366,36 @@@ msgstr "Scrios an bheathaisnéisÃn rog
msgid "Create a new profile"
msgstr "Cruthaigh beathaisnéisÃn nua"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Cruthaigh"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Ainm na BeathaisnéisÃne In Easnamh"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Ainm na BeathaisnéisÃne In Easnamh"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Nà mór duit ainm a shocrú don bheathaisnéisÃn."
@@@ -23137,46 -23132,46 +23769,82 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font file for the font you want to use"
msgstr "Comhadainm don chlófhoireann ar mian leat feidhm a bhaint as"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Méid na clófhoirne i bpicteilÃnÃ"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Méid na clófhoirne i bpicteilÃnÃ"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Teimhneachta an téacs"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Teimhneachta an téacs"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Dath réamhshocraithe an téacs"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23185,94 -23180,94 +23853,174 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Teimhneacht an chúlra"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Dath an chúlra"
+
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Teimhneacht an chúlra"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Dath an chúlra"
+
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "ImlÃne"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Teimhneacht an scátha"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Dath an scátha"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Uilleann an scátha"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Teimhneacht an scátha"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Dath an scátha"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Uilleann an scátha"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "NÃos lú"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Beag"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Mór"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "NÃos mó"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "TanaÃ"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Tiubh"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "TanaÃ"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Tiubh"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/gd.po
index 014daa4,fbf7778..2fb3535
--- a/po/gd.po
+++ b/po/gd.po
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
+# Scottish Gaelic translation
++=======
+ # Gaelic Scottish translation
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# Copyright (C) 2013 VideoLAN
# This file is distributed under the same license as the VLC package.
#
@@@ -8,9 -8,9 +12,15 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-11 23:50+0000\n"
+"Last-Translator: Michael Bauer <fios at akerbeltz.org>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-05-04 07:53+0000\n"
+ "Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Gaelic, Scottish (http://www.transifex.com/projects/p/vlc-"
"trans/language/gd/)\n"
"Language: gd\n"
@@@ -141,7 -141,7 +151,11 @@@ msgstr "Measgachadh de roghainnean is m
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -232,7 -232,7 +246,11 @@@ msgstr "Video codecs
#: include/vlc_config_cat.h:112
msgid "Settings for the video, images or video+audio decoders and encoders."
msgstr ""
++<<<<<<< HEAD
+"Roghainnean airson dì-chòdaichearan is còdaichearan video, deilbh no video ⊠"
++=======
+ "Roghainnean airson dì-chòdaichearan is còdaichearan video, deilbh no video ┠"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"deilbh."
#: include/vlc_config_cat.h:114
@@@ -506,10 -506,10 +524,17 @@@ msgid "&About
msgstr "&Mu dheidhinn"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -548,17 -548,17 +573,29 @@@ msgid "Save...
msgstr "SÃ bhail..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Ath-chluich na h-uile"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Ath-chluich aonan"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -667,7 -667,7 +704,11 @@@ msgstr "Tha na tha ceadaichte de chriat
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Cuir à comas"
@@@ -995,7 -995,7 +1036,11 @@@ msgstr "F9
#: src/config/keys.c:83
msgid "Home"
++<<<<<<< HEAD
+msgstr "Dhachaigh"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:84
msgid "Insert"
@@@ -1337,22 -1337,22 +1382,38 @@@ msgstr "Reat nam frèam
msgid "Decoded format"
msgstr "Am fòrmat dì-chòdaichte"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Cha ghabh d' ion-chur fhosgladh"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Cha ghabh d' ion-chur fhosgladh"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"Chan urrainn dha VLC an MRL \"%s\" fhosgladh. Thoir sùil air an loga airson "
"mion-fhiosrachadh."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "Chan aithnich VLC fòrmat an ion-chuir"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "Chan aithnich VLC fòrmat an ion-chuir"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1684,7 -1684,7 +1745,11 @@@ msgstr "
#: src/libvlc-module.c:138
msgid "Audio gain"
++<<<<<<< HEAD
+msgstr "Tarbhachd fuaime"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:140
msgid "This linear gain will be applied to outputted audio."
@@@ -1758,7 -1758,7 +1823,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1840,7 -1840,7 +1909,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Chan eil gin"
@@@ -1866,7 -1866,7 +1939,11 @@@ msgstr "
"Seo an dòigh a chleachdas VLC a chum à s-chur video. Thèid an dòigh as fhearr "
"a thaghadh a ghnà th."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Cuir video an comas"
@@@ -2063,7 -2063,7 +2140,11 @@@ msgstr "
"chleachdadh a ghnà th."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Air uachdar an-còmhnaidh"
@@@ -2121,7 -2121,7 +2202,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2130,7 -2130,7 +2215,11 @@@ msgstr "Deinterlace
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Modh deinterlace"
@@@ -2186,7 -2186,7 +2275,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Sgeadachaidhean na h-uinneige"
@@@ -2207,7 -2207,7 +2300,11 @@@ msgstr "
#: src/libvlc-module.c:383
msgid "Video filter module"
++<<<<<<< HEAD
+msgstr "Mòideal criathradh a' video"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:385
msgid ""
@@@ -2245,7 -2245,7 +2342,11 @@@ msgstr "Seall ro-shealladh a' snapshot
#: src/libvlc-module.c:405
msgid "Use sequential numbers instead of timestamps"
++<<<<<<< HEAD
+msgstr "Cleachd à ireamhan sreath-leanmhainneach seach stampaichean-ama"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:407
msgid "Use sequential numbers instead of timestamps for snapshot numbering"
@@@ -2357,7 -2357,7 +2458,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Leum thairis air frèamaichean"
@@@ -2485,12 -2485,12 +2590,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2498,7 -2498,7 +2612,11 @@@ msgid "Default
msgstr "Bun-roghainn"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2566,7 -2566,7 +2684,11 @@@ msgstr "
#: src/libvlc-module.c:583 modules/gui/qt4/ui/open_disk.h:313
msgid "Subtitle track"
++<<<<<<< HEAD
+msgstr "Traca nam fo-thiotalan"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:585
msgid "Stream number of the subtitle track to use (from 0 to n)."
@@@ -2610,7 -2610,7 +2732,11 @@@ msgstr "ID an t-srutha aig traca na fua
#: src/libvlc-module.c:603
msgid "Subtitle track ID"
++<<<<<<< HEAD
+msgstr "ID traca nam fo-thiotalan"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:605
msgid "Stream ID of the subtitle track to use."
@@@ -2771,7 -2771,7 +2897,11 @@@ msgstr "
#: src/libvlc-module.c:680
msgid "Change title according to current media"
++<<<<<<< HEAD
+msgstr "Atharraich an tiotal a-rèir a' mheadhain là ithrich"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:681
msgid ""
@@@ -2808,7 -2808,7 +2938,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3457,8 -3457,6 +3591,11 @@@ msgstr "
#: src/libvlc-module.c:1085 modules/gui/qt4/ui/sprefs_interface.h:538
msgid "Use only one instance when started from file manager"
msgstr ""
++<<<<<<< HEAD
+"Na cleachd ach aon ionstans nuair a chaidh a thòiseachadh o mhanaidsear nam "
+"faidhlichean"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1087
msgid "Increase the priority of the process"
@@@ -3476,7 -3474,7 +3613,11 @@@ msgstr "
#: src/libvlc-module.c:1097 modules/gui/qt4/ui/sprefs_interface.h:534
msgid "Enqueue items into playlist in one instance mode"
++<<<<<<< HEAD
+msgstr "Cuir nithean air an liosta-chluich ma bhios e sa mhodh aon-ionstans"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1099
msgid ""
@@@ -3635,7 -3633,7 +3776,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Leig seachad"
@@@ -3659,8 -3657,8 +3804,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3741,10 -3739,10 +3891,17 @@@ msgid "Slower (fine)
msgstr "Nas slaodaiche (mean air mhean)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3758,10 -3756,10 +3915,17 @@@ msgstr "
"Tagh an hotkey airson leum a ghearradh dhan ath-rud air an liosta-chluich."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Air ais"
@@@ -3771,9 -3769,9 +3935,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"Tagh an hotkey airson leum a ghearradh dhan rud roimhe air an liosta-chluich."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4016,9 -4014,9 +4186,15 @@@ msgid "Select the key to decrease audi
msgstr "Tagh an iuchair gus à irde na fuaime a chur sìos."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Mùch"
@@@ -4370,7 -4368,7 +4546,11 @@@ msgstr "
#: src/libvlc-module.c:1395
msgid "Normal/Loop/Repeat"
++<<<<<<< HEAD
+msgstr "Àbhaisteach/Lùbadh/Ath-chluich"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1396
msgid "Toggle Normal/Loop/Repeat playlist modes"
@@@ -4434,7 -4432,7 +4614,11 @@@ msgstr "Cuairtich tro na h-uidheaman fu
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Snapshot"
@@@ -4633,12 -4631,12 +4817,21 @@@ msgstr "'Ga luchdadh a-nuas ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Sguir dheth"
@@@ -5400,7 -5398,7 +5593,11 @@@ msgstr "Bearr
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Co-mheas an deilbh"
@@@ -5496,37 -5494,34 +5693,63 @@@ msgstr "BD
#: modules/access/bd/bd.c:55
msgid "Blu-ray Disc Input"
++<<<<<<< HEAD
+msgstr "Ion-chur diosga Blu-ray"
+
+#: modules/access/bluray.c:60
+msgid "Blu-ray menus"
+msgstr "Clà ran-taice Blu-ray"
++=======
+ msgstr ""
+
+ #: modules/access/bluray.c:60
+ msgid "Blu-ray menus"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:61
msgid "Use Blu-ray menus. If disabled, the movie will start directly"
msgstr ""
++<<<<<<< HEAD
+"Cleachd clà ran-taice Blu-ray. Ma tha seo à comas, tòisichidh am film sa bhad."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:69 modules/services_discovery/udev.c:596
#: modules/gui/qt4/ui/open_disk.h:299
msgid "Blu-ray"
++<<<<<<< HEAD
+msgstr "Blu-ray"
+
+#: modules/access/bluray.c:70
+msgid "Blu-ray Disc support (libbluray)"
+msgstr "Taic le diosga Blu-ray (libbluray)"
++=======
+ msgstr ""
+
+ #: modules/access/bluray.c:70
+ msgid "Blu-ray Disc support (libbluray)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:263
msgid ""
"This Blu-ray Disc needs a library for AACS decoding, and your system does "
"not have it."
msgstr ""
++<<<<<<< HEAD
+"Feumaidh an diosga Blu-ray seo leabharlann airson dì-chòdachadh AACS ach "
+"chan eil sin aig an t-siostam agad."
+
+#: modules/access/bluray.c:272
+msgid "Blu-ray Disc is corrupted."
+msgstr "Tha an diosga Blu-ray coirbte."
++=======
+
+ #: modules/access/bluray.c:272
+ msgid "Blu-ray Disc is corrupted."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:275
msgid "Missing AACS configuration file!"
@@@ -5562,8 -5557,6 +5785,11 @@@ msgid "
"This Blu-ray Disc needs a library for BD+ decoding, and your system does not "
"have it."
msgstr ""
++<<<<<<< HEAD
+"Feumaidh an diosga Blu-ray seo leabharlann airson dì-chòdachadh BD+ ach chan "
+"eil sin aig an t-siostam agad."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:308
msgid "Your system BD+ decoding library does not work. Missing configuration?"
@@@ -5573,7 -5566,7 +5799,11 @@@ msgstr "
#: modules/access/bluray.c:370
msgid "Blu-ray error"
++<<<<<<< HEAD
+msgstr "Mearachd Blu-ray"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/cdda.c:62 modules/gui/macosx/open.m:162
#: modules/gui/qt4/ui/open_disk.h:300
@@@ -6892,11 -6885,11 +7122,19 @@@ msgstr "
#: modules/access/jack.c:67
msgid "JACK audio input"
++<<<<<<< HEAD
+msgstr "Ion-chur fuaime JACK"
+
+#: modules/access/jack.c:69
+msgid "JACK Input"
+msgstr "Ion-chur JACK"
++=======
+ msgstr ""
+
+ #: modules/access/jack.c:69
+ msgid "JACK Input"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/linsys/linsys_hdsdi.c:72
#: modules/access/linsys/linsys_sdi.c:67
@@@ -6962,11 -6955,11 +7200,19 @@@ msgstr "
#: modules/access/linsys/linsys_sdi.c:92
msgid "SDI Input"
++<<<<<<< HEAD
+msgstr "Ion-chur SDI"
+
+#: modules/access/linsys/linsys_sdi.c:113
+msgid "SDI Demux"
+msgstr "SDI Demux"
++=======
+ msgstr ""
+
+ #: modules/access/linsys/linsys_sdi.c:113
+ msgid "SDI Demux"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/live555.cpp:78
msgid "Kasenna RTSP dialect"
@@@ -7120,20 -7113,20 +7366,36 @@@ msgstr "
#: modules/access/mtp.c:57
msgid "MTP input"
++<<<<<<< HEAD
+msgstr "Ion-chur MTP"
+
+#: modules/access/mtp.c:58
+msgid "MTP"
+msgstr "MTP"
+
+#: modules/access/mtp.c:203 modules/access/vdr.c:368
+msgid "VLC could not read the file."
+msgstr "Cha b' urrainn dha VLC am faidhle a leughadh."
++=======
+ msgstr ""
+
+ #: modules/access/mtp.c:58
+ msgid "MTP"
+ msgstr ""
+
+ #: modules/access/mtp.c:203 modules/access/vdr.c:368
+ msgid "VLC could not read the file."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/mtp.c:292 modules/access/vdr.c:536
#, c-format
msgid "VLC could not open the file \"%s\". (%m)"
++<<<<<<< HEAD
+msgstr "Cha b' urrainn dha VLC am mòideal \"%s\" fhosgladh. (%m)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/oss.c:66
msgid "Capture the audio stream in stereo."
@@@ -7154,11 -7147,11 +7416,19 @@@ msgstr "
#: modules/access/oss.c:76
msgid "OSS"
++<<<<<<< HEAD
+msgstr "OSS"
+
+#: modules/access/oss.c:77
+msgid "OSS input"
+msgstr "Ion-chur OSS"
++=======
+ msgstr ""
+
+ #: modules/access/oss.c:77
+ msgid "OSS input"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/dummy.c:45 modules/stream_out/dummy.c:51
msgid "Dummy stream output"
@@@ -7166,7 -7159,7 +7436,11 @@@ msgstr "
#: modules/access_output/file.c:65
msgid "Overwrite existing file"
++<<<<<<< HEAD
+msgstr "Sgrìobh thairis air an fhaidhle là ithreach"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/file.c:67
msgid "If the file already exists, it will be overwritten."
@@@ -7174,15 -7167,15 +7448,27 @@@ msgstr "
#: modules/access_output/file.c:68
msgid "Append to file"
++<<<<<<< HEAD
+msgstr "Cuir ris an fhaidhle"
+
+#: modules/access_output/file.c:69
+msgid "Append to file if it exists instead of replacing it."
+msgstr "Cuir ris an fhaidhle, ma tha gin ann, seach a chur 'na à ite."
+
+#: modules/access_output/file.c:71
+msgid "Format time and date"
+msgstr "Fòrmataich an t-à m is an ceann-là "
++=======
+ msgstr ""
+
+ #: modules/access_output/file.c:69
+ msgid "Append to file if it exists instead of replacing it."
+ msgstr ""
+
+ #: modules/access_output/file.c:71
+ msgid "Format time and date"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/file.c:72
msgid "Perform ISO C time and date formatting on the file path"
@@@ -7208,16 -7201,16 +7494,28 @@@ msgstr "
#: modules/access_output/file.c:203
msgid "Keep existing file"
++<<<<<<< HEAD
+msgstr "Glèidh am faidhle là ithreach"
+
+#: modules/access_output/file.c:204
+msgid "Overwrite"
+msgstr "Sgrìobh thairis air"
++=======
+ msgstr ""
+
+ #: modules/access_output/file.c:204
+ msgid "Overwrite"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/http.c:51 modules/access/vnc.c:46
#: modules/misc/audioscrobbler.c:114 modules/stream_out/rtp.c:177
msgid "Username"
++<<<<<<< HEAD
+msgstr "Ainm-cleachdaiche"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/http.c:52 modules/stream_out/rtp.c:178
msgid "User name that will be requested to access the stream."
@@@ -7726,7 -7719,7 +8024,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Sgrìn"
@@@ -8458,7 -8451,7 +8760,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9569,7 -9562,7 +9875,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9600,7 -9593,7 +9910,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9608,30 -9601,30 +9922,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10305,7 -10298,7 +10643,11 @@@ msgstr "
#: modules/codec/cc.c:55
msgid "CC 608/708"
++<<<<<<< HEAD
+msgstr "CC 608/708"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/cc.c:56
msgid "Closed Captions decoder"
@@@ -10373,7 -10366,7 +10715,11 @@@ msgstr "
#: modules/codec/dirac.c:74 modules/codec/schroedinger.c:134
msgid "Prefilter"
++<<<<<<< HEAD
+msgstr "Ro-chriathraich"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/dirac.c:75 modules/codec/schroedinger.c:135
msgid "Enable adaptive prefiltering"
@@@ -10797,46 -10790,46 +11143,74 @@@ msgstr "
msgid "Outline"
msgstr "Oir-loidhne"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Dubh"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Liath"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Airgead"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Geal"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Ciar-dhonn"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Dearg"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10844,61 -10837,61 +11218,97 @@@ msgid "Fuchsia
msgstr "Fiùise"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Buidhe"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Donn-uaine"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Uaine"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Dath na crann-lach"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Liomaideag"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Purpaidh"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Gorm a' chabhlaich"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Gorm"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11022,13 -11015,13 +11432,21 @@@ msgstr "
#: modules/codec/libass.c:56
msgid "Subtitles (advanced)"
++<<<<<<< HEAD
+msgstr "Fo-thiotalan (adhartach)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/libass.c:57
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -11095,8 -11088,9 +11513,14 @@@ msgid "PNG video decoder
msgstr ""
#: modules/codec/qsv.c:56
++<<<<<<< HEAD
+msgid "Enable software mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Enable software mode"
+ msgstr "Cuir an comas modh a' phà ipeir-bhalla "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:57
msgid ""
@@@ -11105,8 -11099,9 +11529,14 @@@
msgstr ""
#: modules/codec/qsv.c:61
++<<<<<<< HEAD
+msgid "Codec Profile"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Codec Profile"
+ msgstr "Pròifil"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:63
msgid ""
@@@ -11116,8 -11111,9 +11546,14 @@@
msgstr ""
#: modules/codec/qsv.c:67
++<<<<<<< HEAD
+msgid "Codec Level"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Codec Level"
+ msgstr "Mion-fhiosrachadh mun chodec"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:69
msgid ""
@@@ -11158,8 -11154,9 +11594,14 @@@ msgid "
msgstr ""
#: modules/codec/qsv.c:90
++<<<<<<< HEAD
+msgid "IDR interval"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "IDR interval"
+ msgstr "Eadaramh geà ird"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:92
msgid ""
@@@ -11223,8 -11220,9 +11665,14 @@@ msgid "
msgstr ""
#: modules/codec/qsv.c:122
++<<<<<<< HEAD
+msgid "Maximum Bitrate"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Maximum Bitrate"
+ msgstr "An ìre as motha"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:123
msgid ""
@@@ -11256,8 -11254,9 +11704,14 @@@ msgid "
msgstr ""
#: modules/codec/qsv.c:139
++<<<<<<< HEAD
+msgid "Number of slices per frame"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Number of slices per frame"
+ msgstr "Àireamh de chlònaichean"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:140
msgid ""
@@@ -11271,8 -11270,9 +11725,14 @@@ msgid "Number of reference frames
msgstr ""
#: modules/codec/qsv.c:148
++<<<<<<< HEAD
+msgid "Number of parallel operations"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Number of parallel operations"
+ msgstr "Àireamh de chlònaichean"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:149
msgid ""
@@@ -11684,7 -11684,7 +12144,11 @@@ msgstr "
#: modules/codec/spudec/spudec.c:51
msgid "DVD subtitles"
++<<<<<<< HEAD
+msgstr "Fo-thiotalan DVD"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/spudec/spudec.c:60
msgid "DVD subtitles packetizer"
@@@ -12004,7 -12004,7 +12468,11 @@@ msgstr "
#: modules/codec/twolame.c:59
msgid "Stereo mode"
++<<<<<<< HEAD
+msgstr "Modh stereo"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/twolame.c:60
msgid "Handling mode for stereo streams"
@@@ -12812,20 -12812,20 +13280,34 @@@ msgstr "
#: modules/codec/x264.c:429
msgid "Fast"
++<<<<<<< HEAD
+msgstr "Luath"
+
+#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ msgstr ""
+
+ #: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Àbhaisteach"
#: modules/codec/x264.c:429
msgid "Slow"
++<<<<<<< HEAD
+msgstr "Slaodach"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:434
msgid "Spatial"
@@@ -12923,8 -12923,8 +13405,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13003,17 -13003,17 +13490,29 @@@ msgstr "
#: modules/control/hotkeys.c:188
msgid "One"
++<<<<<<< HEAD
+msgstr "Aon"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:195
#, c-format
msgid "Loop: %s"
++<<<<<<< HEAD
+msgstr "Lùb: %s"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:202
#, c-format
msgid "Random: %s"
++<<<<<<< HEAD
+msgstr "Air thuaiream: %s"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:331
#, c-format
@@@ -13034,7 -13034,7 +13533,11 @@@ msgstr "
#: modules/control/hotkeys.c:424 modules/control/hotkeys.c:493
msgid "No active subtitle"
++<<<<<<< HEAD
+msgstr "Chan eil fo-thiotal sam bith gnìomhach"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:430
msgid "Sub sync: bookmarked subtitle time"
@@@ -13129,7 -13129,7 +13632,11 @@@ msgstr "
#: modules/control/hotkeys.c:1168
#, c-format
msgid "Volume %ld%%"
++<<<<<<< HEAD
+msgstr "Àirde na fuaime %ld%%"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:1173
#, c-format
@@@ -13148,7 -13148,7 +13655,11 @@@ msgstr "
#: modules/control/lirc.c:58
msgid "Infrared"
++<<<<<<< HEAD
+msgstr "Fo-dhearg"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/lirc.c:61
msgid "Infrared remote control interface"
@@@ -13260,9 -13260,9 +13771,15 @@@ msgstr "A' tòiseachadh
msgid "Opening"
msgstr "'Ga fhosgladh"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Cuir 'na stad"
@@@ -15143,7 -15143,7 +15660,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -15285,7 -15285,7 +15806,11 @@@ msgstr "Mu chluicheadair mheadhanan VLC
#: modules/gui/macosx/about.m:95 modules/gui/qt4/dialogs/help.cpp:125
msgid "Credits"
++<<<<<<< HEAD
+msgstr "Creideasan"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/about.m:98 modules/gui/macosx/MainMenu.m:450
#: modules/gui/qt4/dialogs/help.cpp:119
@@@ -15322,7 -15322,7 +15847,11 @@@ msgid "VLC media player Help
msgstr "Taic le cluicheadair mheadhanan VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Clà r-amais"
@@@ -15410,9 -15410,9 +15939,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "SÃ bhail"
@@@ -15553,7 -15553,7 +16088,11 @@@ msgstr "
"Feumaidh an sruth a bhith a' dol no 'na stad mus obraich na comharran-"
"leabhair."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Gearr leum dhan à m"
@@@ -15573,7 -15573,7 +16112,11 @@@ msgstr "
msgid "Backward"
msgstr "Air ais"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15583,7 -15583,7 +16126,11 @@@ msgstr "
msgid "Forward"
msgstr "Air adhart"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15603,87 -15603,87 +16150,161 @@@ msgstr "Toglaich am modh là n-sgrìn
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Seall/Falaich an liosta-chluich"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Seall/Falaich an liosta-chluich"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Ath-chluich"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Air thuaiream"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Air thuaiream"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Briog air gus an fhuaim a mhùchadh no a tilleadh."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "An fhuaim cho à rd 's a ghabhas"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "An fhuaim cho à rd 's a ghabhas"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Èifeachdan"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ConvertAndSave.m:152
+msgid "Convert & Stream"
+msgstr "Iompaich ⊠sruthaich"
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:152
+ msgid "Convert & Stream"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:153
msgid "Go!"
@@@ -15716,7 -15716,7 +16337,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15899,8 -15899,8 +16524,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Gnà thaichte"
@@@ -16002,36 -16002,36 +16632,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Cha deach loga nan tuislidhean a lorg"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Cha deach loga nan tuislidhean a lorg"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Lean air adhart"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Cha do lorg sinn sgeul air tuisleadh sam bith."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "A bheil thu airson na seann roghainnean a thoirt air falbh?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Lorg sinn seann fhaidhlichean sa bheil roghainnean VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Gluais dhan sgudal iad is cuir gu dol VLC a-rithist"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Cha do lorg sinn sgeul air tuisleadh sam bith."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "A bheil thu airson na seann roghainnean a thoirt air falbh?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Lorg sinn seann fhaidhlichean sa bheil roghainnean VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Gluais dhan sgudal iad is cuir gu dol VLC a-rithist"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16185,13 -16185,13 +16847,21 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Glais co-mheas an deilbh"
#: modules/gui/macosx/macosx.m:112 modules/gui/macosx/MainMenu.m:338
msgid "Show Previous & Next Buttons"
++<<<<<<< HEAD
+msgstr "Seall na putanan \"Air ais\" ⊠\"Air adhart\""
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:113
msgid "Shows the previous and next buttons in the main window."
@@@ -16199,7 -16199,7 +16869,11 @@@ msgstr "
#: modules/gui/macosx/macosx.m:115 modules/gui/macosx/MainMenu.m:340
msgid "Show Shuffle & Repeat Buttons"
++<<<<<<< HEAD
+msgstr "Seall na putanan \"Air thuaiream\" ⊠\"Ath-chluich\""
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:116
msgid "Shows the shuffle and repeat buttons in the main window."
@@@ -16207,7 -16207,7 +16881,11 @@@ msgstr "
#: modules/gui/macosx/macosx.m:118 modules/gui/macosx/MainMenu.m:342
msgid "Show Audio Effects Button"
++<<<<<<< HEAD
+msgstr "Seall putan nam èifeachdan fuaime"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:119
msgid "Shows the audio effects button in the main window."
@@@ -16215,7 -16215,7 +16893,11 @@@ msgstr "
#: modules/gui/macosx/macosx.m:121 modules/gui/macosx/MainMenu.m:344
msgid "Show Sidebar"
++<<<<<<< HEAD
+msgstr "Seall am bà r-taoibh"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:122
msgid "Shows a sidebar in the main window listing media sources."
@@@ -16223,7 -16223,7 +16905,11 @@@ msgstr "
#: modules/gui/macosx/macosx.m:124
msgid "Pause iTunes during VLC playback"
++<<<<<<< HEAD
+msgstr "Cuir iTunes 'na stad nuair a tha VLC a' cluich rud"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:125
msgid ""
@@@ -16233,15 -16233,15 +16919,27 @@@ msgstr "
#: modules/gui/macosx/macosx.m:130
msgid "Do nothing"
++<<<<<<< HEAD
+msgstr "Na dèan dad"
+
+#: modules/gui/macosx/macosx.m:130
+msgid "Pause iTunes"
+msgstr "Cuir iTunes 'na stad"
+
+#: modules/gui/macosx/macosx.m:130
+msgid "Pause and resume iTunes"
+msgstr "Cuir 'na stad agus lean air iTunes"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:130
+ msgid "Pause iTunes"
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:130
+ msgid "Pause and resume iTunes"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:133 modules/gui/qt4/qt4.cpp:178
msgid "Maximum Volume displayed"
@@@ -16253,11 -16253,11 +16951,19 @@@ msgstr "Eadar-aghaidh Mac OS X
#: modules/gui/macosx/macosx.m:146
msgid "Appearance"
++<<<<<<< HEAD
+msgstr "Dreach"
+
+#: modules/gui/macosx/macosx.m:156
+msgid "Behavior"
+msgstr "Giùlan"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:156
+ msgid "Behavior"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:166
msgid "Apple Remote and media keys"
@@@ -16265,11 -16265,11 +16971,19 @@@ msgstr "
#: modules/gui/macosx/macosx.m:181
msgid "Video output"
++<<<<<<< HEAD
+msgstr "Às-chur a' video"
+
+#: modules/gui/macosx/MainMenu.m:68
+msgid "Track Number"
+msgstr "Àireamh an traca"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:68
+ msgid "Track Number"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:70 modules/gui/macosx/playlist.m:165
#: modules/gui/macosx/wizard.m:347 modules/gui/qt4/dialogs/plugins.cpp:557
@@@ -16314,7 -16314,7 +17028,11 @@@ msgstr "Falaich VLC
msgid "Hide Others"
msgstr "Cuir cà ch am falach"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Seall a h-uile"
@@@ -16356,7 -16356,7 +17074,11 @@@ msgstr "Draoidh sruthaidh/Ã s-phortaidh
#: modules/gui/macosx/MainMenu.m:328
msgid "Convert / Stream..."
++<<<<<<< HEAD
+msgstr "Iompaich / Struthaich..."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:331
msgid "Cut"
@@@ -16376,11 -16376,11 +17098,19 @@@ msgstr "Tagh a h-uile
#: modules/gui/macosx/MainMenu.m:337
msgid "View"
++<<<<<<< HEAD
+msgstr "Sealladh"
+
+#: modules/gui/macosx/MainMenu.m:346 modules/gui/macosx/MainMenu.m:347
+msgid "Playlist Table Columns"
+msgstr "Colbhan clà r na liosta-cluiche"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:346 modules/gui/macosx/MainMenu.m:347
+ msgid "Playlist Table Columns"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:349
msgid "Playback"
@@@ -16397,17 -16397,17 +17127,31 @@@ msgstr "Sioncronachadh an traca
#: modules/gui/macosx/MainMenu.m:365
msgid "A→B Loop"
++<<<<<<< HEAD
+msgstr "Lùb A→B"
+
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Fà g an-seo as dèidh cluich"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Ceum air adhart"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Fà g an-seo as dèidh cluich"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Ceum air adhart"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Ceum air ais"
@@@ -16423,30 -16423,30 +17167,56 @@@ msgstr "Ìslich à irde na fuaime
msgid "Audio Device"
msgstr "Inneal fuaime"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Leth-leud"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Meud à bhaisteach"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Meud dùbailte"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Gu meud na sgrìn"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Leth-leud"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Meud à bhaisteach"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Meud dùbailte"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Gu meud na sgrìn"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Air fleòd air uachdar"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Inneal video là n-sgrìn"
@@@ -16455,9 -16455,9 +17225,15 @@@
msgid "Post processing"
msgstr "Giullachd an dèidh là imh"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
+msgid "Add Subtitle File..."
+msgstr "Cuir faidhle le fo-thiotalan ris..."
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
+ msgid "Add Subtitle File..."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:415 modules/gui/macosx/MainMenu.m:416
msgid "Subtitles Track"
@@@ -16465,11 -16465,11 +17241,19 @@@ msgstr "Traca nam fo-thiotalan
#: modules/gui/macosx/MainMenu.m:417
msgid "Text Size"
++<<<<<<< HEAD
+msgstr "Meud an teacsa"
+
+#: modules/gui/macosx/MainMenu.m:418
+msgid "Text Color"
+msgstr "Dath an teacsa"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:418
+ msgid "Text Color"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:419
msgid "Outline Thickness"
@@@ -16477,11 -16477,11 +17261,19 @@@ msgstr "Tighead na h-oir-loidhne
#: modules/gui/macosx/MainMenu.m:421 modules/gui/macosx/MainMenu.m:422
msgid "Background Opacity"
++<<<<<<< HEAD
+msgstr "Trìd-dhoilleireachd a' chùlaibh"
+
+#: modules/gui/macosx/MainMenu.m:423
+msgid "Background Color"
+msgstr "Dath a' chùlaibh"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:423
+ msgid "Background Color"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:425
msgid "Transparent"
@@@ -16513,7 -16513,7 +17305,11 @@@ msgstr "Èifeachdan fuaime...
#: modules/gui/macosx/MainMenu.m:438
msgid "Video Effects..."
++<<<<<<< HEAD
+msgstr "Èifeachdan video..."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:439
msgid "Bookmarks..."
@@@ -16686,7 -16686,7 +17482,11 @@@ msgid "Play another media synchronously
msgstr "Cluich meadhan eile aig an aon à m"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Tagh..."
@@@ -16848,7 -16848,7 +17648,11 @@@ msgstr "
#: modules/gui/macosx/open.m:361
msgid "Add Subtitle File:"
++<<<<<<< HEAD
+msgstr "Cuir faidhle le fo-thiotalan ris:"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:366
msgid "Click to setup subtitle playback in full detail."
@@@ -16870,7 -16870,7 +17674,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Meud a' chruth-chlò"
@@@ -17099,12 -17099,12 +17907,20 @@@ msgstr "Thachair mearachd rè sà bhalad
msgid "VLC was unable to save the meta data."
msgstr "Cha b' urrainn dha VLC am metadata a shà bhaladh."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Roghainnean"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Ath-shuidhich na h-uile"
@@@ -17283,132 -17283,127 +18099,243 @@@ msgstr "
#: modules/gui/macosx/simple_prefs.m:372 modules/lua/vlc.c:96
#: modules/lua/vlc.c:103
msgid "Lua HTTP"
++<<<<<<< HEAD
+msgstr "Lua HTTP"
+
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Cuir iTunes 'na stad nuair a tha VLC a' cluich rud"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "An dì-chòdachadh bunaiteach"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Na roghainnean seallaidh"
+
+#: modules/gui/macosx/simple_prefs.m:380
- #: modules/gui/qt4/ui/sprefs_subtitles.h:297
- msgid "Font color"
- msgstr "Dath a' chruth-chlò"
++=======
+ msgstr ""
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "An dì-chòdachadh bunaiteach"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Na roghainnean seallaidh"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:297
+ msgid "Font color"
+ msgstr "Dath a' chruth-chlò"
+
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Cruth-clò"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "CÃ nain nam fo-thiotalan"
+
+#: modules/gui/macosx/simple_prefs.m:384
+#: modules/gui/qt4/ui/sprefs_subtitles.h:292
+msgid "Preferred subtitle language"
+msgstr "An cà nan as fhearr leat airson fo-thiotalan"
+
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Cuir an comas OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:292
+ msgid "Preferred subtitle language"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Cuir an comas OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Dubharachd"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Èignich clò trom"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Èignich clò trom"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Dath na h-oir-loidhne"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Tighead na h-oir-loidhne"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Sgrìnichean dubha sa mhodh là n-sgrìn"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Sgrìnichean dubha sa mhodh là n-sgrìn"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Taisbeanadh"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Mòideal an à s-chuir"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Video snapshots"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Pasgan"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Fòrmat"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Ro-leasachan"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Àireamhachadh sreath-leanmhainneach"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Sgrùdadh mu dheireadh: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Cha deach sgrùdadh a dhèanamh fhathast."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Mòideal an à s-chuir"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Video snapshots"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Pasgan"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Fòrmat"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Ro-leasachan"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Àireamhachadh sreath-leanmhainneach"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Sgrùdadh mu dheireadh: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Cha deach sgrùdadh a dhèanamh fhathast."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Foillidheachd as ìsle"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Foillidheachd ìseal"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Foillidheachd à rd"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Foillidheachd nas à irde"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Ath-shuidhich na roghainnean"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17421,20 -17416,20 +18348,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Tagh am pasgan a bu mhath leat na video snapshots agad a shà bhaladh."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Tagh"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Tagh an t-eòlaire no ainm an fhaidhle far an dèid na clà ir a stòradh."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Tagh am pasgan a bu mhath leat na video snapshots agad a shà bhaladh."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Tagh"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Tagh an t-eòlaire no ainm an fhaidhle far an dèid na clà ir a stòradh."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -17442,18 -17437,18 +18386,31 @@@ msgstr "
"Brùth iuchraichean ùra airson\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Measgachadh mì-dhligheach"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Measgachadh mì-dhligheach"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"Gu mì-fhortanach, chan urrainn dhut na h-iuchraichean seo a chleachdadh mar "
"ath-ghoiridean hotkeys."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Thathar a' cleachdadh a' mheasgachaidh seo mu thrà th airson \"%@\"."
@@@ -18442,7 -18437,7 +19399,11 @@@ msgstr " a, z Àirde
#: modules/gui/ncurses.c:892
msgid " m Mute"
++<<<<<<< HEAD
+msgstr "m Mùch"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#. xgettext: You can use ↑ and ↓ characters
#: modules/gui/ncurses.c:894
@@@ -18562,7 -18557,7 +19523,11 @@@ msgstr " Ionad : %s/%s
#: modules/gui/ncurses.c:1099
msgid " Volume : Mute"
++<<<<<<< HEAD
+msgstr "Àirde na fuaime: Mùch"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:1100
#, c-format
@@@ -19380,7 -19375,7 +20345,11 @@@ msgstr "Iuchair:
#: modules/gui/qt4/components/simple_preferences.cpp:228
#: modules/gui/qt4/components/simple_preferences.cpp:597
msgid "Input & Codecs Settings"
++<<<<<<< HEAD
+msgstr "Roghainnean ion-chuir ⊠codec"
++=======
+ msgstr "Roghainnean ion-chuir â” codec"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:230
#: modules/gui/qt4/components/simple_preferences.cpp:884
@@@ -19463,20 -19458,20 +20432,36 @@@ msgstr "Sguab às a' phròifil a thagh
msgid "Create a new profile"
msgstr "Cruthaich pròifil ùr"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Cruthaich"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Tha ainm na pròifil a dhìth"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Tha ainm na pròifil a dhìth"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Feumaidh tu ainm a chur air a' phròifil."
@@@ -20245,7 -20240,7 +21230,11 @@@ msgstr "&Fo-thiotal
#: modules/gui/qt4/menus.cpp:335 modules/gui/qt4/menus.cpp:1068
msgid "T&ools"
++<<<<<<< HEAD
+msgstr "I&nnealan"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:338 modules/gui/qt4/menus.cpp:1103
msgid "V&iew"
@@@ -20369,15 -20364,15 +21358,27 @@@ msgstr "Taghadair nam fear-clis
#: modules/gui/qt4/menus.cpp:583
msgid "&Increase Volume"
++<<<<<<< HEAD
+msgstr "Cu&ir an à irde an fhuaim"
+
+#: modules/gui/qt4/menus.cpp:586
+msgid "&Decrease Volume"
+msgstr "Ìslich à ir&de na fuaime"
+
+#: modules/gui/qt4/menus.cpp:589
+msgid "&Mute"
+msgstr "&Mùch"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/menus.cpp:586
+ msgid "&Decrease Volume"
+ msgstr ""
+
+ #: modules/gui/qt4/menus.cpp:589
+ msgid "&Mute"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:606
msgid "Audio &Track"
@@@ -20389,7 -20384,7 +21390,11 @@@ msgstr "&Inneal fuaime
#: modules/gui/qt4/menus.cpp:608
msgid "&Stereo Mode"
++<<<<<<< HEAD
+msgstr "Modh &stereo"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:611
msgid "&Visualizations"
@@@ -20397,11 -20392,11 +21402,19 @@@ msgstr "&Fir chlis
#: modules/gui/qt4/menus.cpp:637
msgid "Add &Subtitle File..."
++<<<<<<< HEAD
+msgstr "Cuir faidhle le fo-thiotalan ri&s..."
+
+#: modules/gui/qt4/menus.cpp:639
+msgid "Sub &Track"
+msgstr "&Traca nam fo-thiotalan"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/menus.cpp:639
+ msgid "Sub &Track"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:662
msgid "Video &Track"
@@@ -20729,15 -20724,15 +21742,27 @@@ msgstr "
#: modules/gui/qt4/qt4.cpp:184
msgid "Never"
++<<<<<<< HEAD
+msgstr "Chan ann idir"
+
+#: modules/gui/qt4/qt4.cpp:184
+msgid "When minimized"
+msgstr "nuair a bhios e fìor-lùghdaichte"
+
+#: modules/gui/qt4/qt4.cpp:184
+msgid "Always"
+msgstr "An-còmhnaidh"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/qt4.cpp:184
+ msgid "When minimized"
+ msgstr ""
+
+ #: modules/gui/qt4/qt4.cpp:184
+ msgid "Always"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:189
msgid "Qt interface"
@@@ -20925,11 -20920,11 +21950,19 @@@ msgstr "
#: modules/lua/vlc.c:85
msgid "Lua interpreter"
++<<<<<<< HEAD
+msgstr "Eadar-theangadair Lua"
+
+#: modules/lua/vlc.c:106
+msgid "Lua CLI"
+msgstr "Lua CLI"
++=======
+ msgstr ""
+
+ #: modules/lua/vlc.c:106
+ msgid "Lua CLI"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:110
msgid "Command-line interface"
@@@ -20937,11 -20932,11 +21970,19 @@@ msgstr "
#: modules/lua/vlc.c:119 modules/lua/vlc.c:130
msgid "Lua Telnet"
++<<<<<<< HEAD
+msgstr "Lua Telnet"
+
+#: modules/lua/vlc.c:134
+msgid "Lua Meta Fetcher"
+msgstr "Lua Meta Fetcher"
++=======
+ msgstr ""
+
+ #: modules/lua/vlc.c:134
+ msgid "Lua Meta Fetcher"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:135
msgid "Fetch meta data using lua scripts"
@@@ -20949,15 -20944,15 +21990,27 @@@ msgstr "
#: modules/lua/vlc.c:140
msgid "Lua Meta Reader"
++<<<<<<< HEAD
+msgstr "Lua Meta Reader"
+
+#: modules/lua/vlc.c:141
+msgid "Read meta data using lua scripts"
+msgstr "Leugh am meata-dà ta le sgriobtaichean Lua"
+
+#: modules/lua/vlc.c:147
+msgid "Lua Playlist"
+msgstr "Liosta-chluich Lua"
++=======
+ msgstr ""
+
+ #: modules/lua/vlc.c:141
+ msgid "Read meta data using lua scripts"
+ msgstr ""
+
+ #: modules/lua/vlc.c:147
+ msgid "Lua Playlist"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:148
msgid "Lua Playlist Parser Interface"
@@@ -20965,7 -20960,7 +22018,11 @@@ msgstr "
#: modules/lua/vlc.c:153
msgid "Lua Art"
++<<<<<<< HEAD
+msgstr "Obair-ealain Lua"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:154
msgid "Fetch artwork using lua scripts"
@@@ -20973,15 -20968,15 +22030,27 @@@ msgstr "
#: modules/lua/vlc.c:159 modules/lua/vlc.c:160
msgid "Lua Extension"
++<<<<<<< HEAD
+msgstr "Leudachan Lua"
+
+#: modules/lua/vlc.c:166
+msgid "Lua SD Module"
+msgstr "Mòideal SD Lua"
+
+#: modules/meta_engine/folder.c:64
+msgid "Folder meta data"
+msgstr "Meata-dà ta a' phasgain"
++=======
+ msgstr ""
+
+ #: modules/lua/vlc.c:166
+ msgid "Lua SD Module"
+ msgstr ""
+
+ #: modules/meta_engine/folder.c:64
+ msgid "Folder meta data"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/meta_engine/folder.c:66
msgid "Album art filename"
@@@ -21001,7 -20996,7 +22070,11 @@@ msgstr "
#: modules/misc/audioscrobbler.c:118
msgid "Scrobbler URL"
++<<<<<<< HEAD
+msgstr "Scrobbler URL"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/audioscrobbler.c:119
msgid "The URL set for an alternative scrobbler engine"
@@@ -22797,45 -22792,45 +23870,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Meudh a' chruth-chlò ann am piogsalan"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Meudh a' chruth-chlò ann am piogsalan"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Dubharachd an teacsa"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Dubharachd an teacsa"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Dath bunaiteach an teacsa"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22844,93 -22839,93 +23953,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Meudh dà imheach a' chruth-chlò"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Dubharachd a' chùlaibh"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Dath a' chùlaibh"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Dubharachd na h-oir-loidhne"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Dubharachd na sgà ile"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Dath na sgà ile"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Ceà rn na sgà ile"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Astar na sgà ile"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Dubharachd a' chùlaibh"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Dath a' chùlaibh"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Dubharachd na h-oir-loidhne"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Dubharachd na sgà ile"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Dath na sgà ile"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Ceà rn na sgà ile"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Astar na sgà ile"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Nas lugha"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Beag"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Mòr"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Nas motha"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Tana"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Tiugh"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Tana"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Tiugh"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -23087,7 -23082,7 +24276,11 @@@ msgstr "
#: modules/video_filter/anaglyph.c:39
msgid "Color scheme"
++<<<<<<< HEAD
+msgstr "Sgeama nan dathan"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/anaglyph.c:40
msgid "Define the glasses' color scheme"
@@@ -23099,11 -23094,11 +24292,19 @@@ msgstr "
#: modules/video_filter/antiflicker.c:50
msgid "Window size"
++<<<<<<< HEAD
+msgstr "Meud na h-uinneige"
+
+#: modules/video_filter/antiflicker.c:51
+msgid "Number of frames (0 to 100)"
+msgstr "Co mheud frèam (eadar 0 is 100)"
++=======
+ msgstr ""
+
+ #: modules/video_filter/antiflicker.c:51
+ msgid "Number of frames (0 to 100)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/antiflicker.c:53
msgid "Softening value"
@@@ -23139,7 -23134,7 +24340,11 @@@ msgstr "
#: modules/video_filter/atmo/atmo.cpp:134
msgid "Device type"
++<<<<<<< HEAD
+msgstr "Seòrsa an uidheim"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:135
msgid ""
@@@ -23149,27 -23144,27 +24354,51 @@@ msgstr "
#: modules/video_filter/atmo/atmo.cpp:152
msgid "AtmoWin Software"
++<<<<<<< HEAD
+msgstr "Bathar-bog AtmoWin"
+
+#: modules/video_filter/atmo/atmo.cpp:154
+msgid "Classic AtmoLight"
+msgstr "Classic AtmoLight"
+
+#: modules/video_filter/atmo/atmo.cpp:155
+msgid "Quattro AtmoLight"
+msgstr "Quattro AtmoLight"
+
+#: modules/video_filter/atmo/atmo.cpp:156
+msgid "DMX"
+msgstr "DMX"
+
+#: modules/video_filter/atmo/atmo.cpp:157
+msgid "MoMoLight"
+msgstr "MoMoLight"
+
+#: modules/video_filter/atmo/atmo.cpp:158
+msgid "fnordlicht"
+msgstr "fnordlicht"
++=======
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:154
+ msgid "Classic AtmoLight"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:155
+ msgid "Quattro AtmoLight"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:156
+ msgid "DMX"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:157
+ msgid "MoMoLight"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:158
+ msgid "fnordlicht"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:161
msgid "Count of AtmoLight channels"
@@@ -23911,23 -23906,23 +25140,43 @@@ msgstr "
#: modules/video_filter/bluescreen.c:78
msgid "Bluescreen"
++<<<<<<< HEAD
+msgstr "Sgrìn ghorm"
+
+#: modules/video_filter/canvas.c:83
+msgid "Output width"
+msgstr "Leud an à s-chuir"
+
+#: modules/video_filter/canvas.c:85
+msgid "Output (canvas) image width"
+msgstr "Leud an deilbh à s-chuir (canabhas)"
+
+#: modules/video_filter/canvas.c:86
+msgid "Output height"
+msgstr "Àirde an as-chuir"
+
+#: modules/video_filter/canvas.c:88
+msgid "Output (canvas) image height"
+msgstr "Àirde an deilbh à s-chuir (canabhas)"
++=======
+ msgstr ""
+
+ #: modules/video_filter/canvas.c:83
+ msgid "Output width"
+ msgstr ""
+
+ #: modules/video_filter/canvas.c:85
+ msgid "Output (canvas) image width"
+ msgstr ""
+
+ #: modules/video_filter/canvas.c:86
+ msgid "Output height"
+ msgstr ""
+
+ #: modules/video_filter/canvas.c:88
+ msgid "Output (canvas) image height"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/canvas.c:89
msgid "Output picture aspect ratio"
@@@ -23955,7 -23950,7 +25204,11 @@@ msgstr "
#: modules/video_filter/canvas.c:105
msgid "Canvas"
++<<<<<<< HEAD
+msgstr "Canabhas"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/canvas.c:106
msgid "Canvas video filter"
@@@ -23971,7 -23966,7 +25224,11 @@@ msgstr "
#: modules/video_filter/clone.c:43
msgid "Video output modules"
++<<<<<<< HEAD
+msgstr "Mòidealan à s-chur a' video"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/clone.c:44
msgid ""
@@@ -23985,7 -23980,7 +25242,11 @@@ msgstr "
#: modules/video_filter/clone.c:55
msgid "Clone video filter"
++<<<<<<< HEAD
+msgstr "Clònaich criathrag a' video"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/colorthres.c:55
msgid ""
@@@ -24670,7 -24665,7 +25931,11 @@@ msgstr "
#: modules/video_filter/mosaic.c:124 modules/video_filter/panoramix.c:64
#: modules/video_filter/wall.c:50
msgid "Number of rows"
++<<<<<<< HEAD
+msgstr "Àireamh de rà ghan"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/mosaic.c:126
msgid ""
@@@ -24681,7 -24676,7 +25946,11 @@@ msgstr "
#: modules/video_filter/mosaic.c:129 modules/video_filter/panoramix.c:60
#: modules/video_filter/wall.c:46
msgid "Number of columns"
++<<<<<<< HEAD
+msgstr "Àireamh de cholbhan"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/mosaic.c:131
msgid ""
@@@ -24691,7 -24686,7 +25960,11 @@@ msgstr "
#: modules/video_filter/mosaic.c:134
msgid "Keep aspect ratio"
++<<<<<<< HEAD
+msgstr "Glèidh co-mheas an deilbh"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/mosaic.c:136
msgid "Keep the original aspect ratio when resizing mosaic elements."
@@@ -24699,7 -24694,7 +25972,11 @@@ msgstr "
#: modules/video_filter/mosaic.c:138
msgid "Keep original size"
++<<<<<<< HEAD
+msgstr "Glèidh am meud tùsail"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/mosaic.c:140
msgid "Keep the original size of mosaic elements."
@@@ -24707,7 -24702,7 +25984,11 @@@ msgstr "
#: modules/video_filter/mosaic.c:142
msgid "Elements order"
++<<<<<<< HEAD
+msgstr "Ã’rdugh nan eileamaidean"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/mosaic.c:144
msgid ""
@@@ -24718,7 -24713,7 +25999,11 @@@ msgstr "
#: modules/video_filter/mosaic.c:148
msgid "Offsets in order"
++<<<<<<< HEAD
+msgstr "Offsets ann an òrdugh"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/mosaic.c:150
msgid ""
@@@ -24736,15 -24731,15 +26021,27 @@@ msgstr "
#: modules/video_filter/mosaic.c:166
msgid "auto"
++<<<<<<< HEAD
+msgstr "fèin-obrachail"
+
+#: modules/video_filter/mosaic.c:166
+msgid "fixed"
+msgstr "socraichte"
+
+#: modules/video_filter/mosaic.c:166
+msgid "offsets"
+msgstr "offsets"
++=======
+ msgstr ""
+
+ #: modules/video_filter/mosaic.c:166
+ msgid "fixed"
+ msgstr ""
+
+ #: modules/video_filter/mosaic.c:166
+ msgid "offsets"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/mosaic.c:176
msgid "Mosaic video sub source"
@@@ -25177,7 -25172,7 +26474,11 @@@ msgstr "
#: modules/video_filter/puzzle.c:65
msgid "Auto shuffle"
++<<<<<<< HEAD
+msgstr "Air thuaiream gu fèin-obrachail"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:66
msgid "Auto shuffle delay during game"
@@@ -25185,7 -25180,7 +26486,11 @@@ msgstr "
#: modules/video_filter/puzzle.c:67
msgid "Auto solve"
++<<<<<<< HEAD
+msgstr "Fèin-fhuasgladh"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:68
msgid "Auto solve delay during game"
@@@ -25420,7 -25415,7 +26725,11 @@@ msgstr "
#: modules/video_filter/rss.c:184
msgid "Always visible"
++<<<<<<< HEAD
+msgstr "Ri fhaicinn an-còmhnaidh"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/rss.c:184
msgid "Scroll with feed"
@@@ -25485,7 -25480,7 +26794,11 @@@ msgstr "
#: modules/video_filter/scene.c:86
msgid "Always write to the same file"
++<<<<<<< HEAD
+msgstr "Sgrìobh san aon fhaidhle an-còmhnaidh"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/scene.c:87
msgid ""
@@@ -25746,7 -25741,7 +27059,11 @@@ msgstr "Tonn
#: modules/video_filter/yuvp.c:47
msgid "YUVP converter"
++<<<<<<< HEAD
+msgstr "Iompachair YUVP"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/aa.c:56
msgid "ASCII Art"
@@@ -26178,7 -26173,7 +27495,11 @@@ msgstr "
#: modules/video_output/vmem.c:51
msgid "Chroma"
++<<<<<<< HEAD
+msgstr "Chroma"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/vmem.c:52
msgid ""
@@@ -26191,7 -26186,7 +27512,11 @@@ msgstr "
#: modules/video_output/vmem.c:60
msgid "Video memory"
++<<<<<<< HEAD
+msgstr "Cuimhne a' video"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/xcb/glx.c:52
msgid "OpenGL GLX video output (XCB)"
@@@ -26199,7 -26194,7 +27524,11 @@@ msgstr "
#: modules/video_output/xcb/window.c:43
msgid "X11 display"
++<<<<<<< HEAD
+msgstr "Taisbeanadh X11"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/xcb/window.c:45
msgid ""
@@@ -26209,11 -26204,11 +27538,19 @@@ msgstr "
#: modules/video_output/xcb/window.c:48
msgid "X11 window ID"
++<<<<<<< HEAD
+msgstr "ID uinneige X11"
+
+#: modules/video_output/xcb/window.c:62
+msgid "X window"
+msgstr "Uinneag X"
++=======
+ msgstr ""
+
+ #: modules/video_output/xcb/window.c:62
+ msgid "X window"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/xcb/window.c:63
msgid "X11 video window (XCB)"
@@@ -26227,22 -26222,22 +27564,38 @@@ msgstr "
#: modules/video_output/xcb/window.c:282
msgctxt "ASCII"
msgid "VLC media player"
++<<<<<<< HEAD
+msgstr "Cluicheadair mheadhanan VLC"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#. xgettext: This is a plain ASCII spelling of "VLC"
#. for the ICCCM window name. This must be pure ASCII.
#: modules/video_output/xcb/window.c:287
msgctxt "ASCII"
msgid "VLC"
++<<<<<<< HEAD
+msgstr "VLC"
+
+#: modules/video_output/xcb/window.c:316
+msgid "VLC"
+msgstr "VLC"
+
+#: modules/video_output/xcb/x11.c:48
+msgid "X11"
+msgstr "X11"
++=======
+ msgstr ""
+
+ #: modules/video_output/xcb/window.c:316
+ msgid "VLC"
+ msgstr ""
+
+ #: modules/video_output/xcb/x11.c:48
+ msgid "X11"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/xcb/x11.c:49
msgid "X11 video output (XCB)"
@@@ -26270,7 -26265,7 +27623,11 @@@ msgstr "
#: modules/video_output/xcb/xvideo.c:62
msgid "XVideo"
++<<<<<<< HEAD
+msgstr "XVideo"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/xcb/xvideo.c:63
msgid "XVideo output (XCB)"
@@@ -26345,88 -26340,87 +27702,171 @@@ msgstr "
#: modules/visualization/goom.c:57
msgid "Goom"
++<<<<<<< HEAD
+msgstr "Goom"
+
+#: modules/visualization/goom.c:58
+msgid "Goom effect"
+msgstr "Èifeachd Goom"
+
+#: modules/visualization/projectm.cpp:49
+msgid "projectM configuration file"
+msgstr "Faidhle rèiteachadh projectM"
++=======
+ msgstr ""
+
+ #: modules/visualization/goom.c:58
+ msgid "Goom effect"
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:49
+ msgid "projectM configuration file"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/visualization/projectm.cpp:50
msgid "File that will be used to configure the projectM module."
msgstr ""
++<<<<<<< HEAD
+"An t-slighe a thèid a chleachdadh gus a' mhòideal projectM a rèiteachadh."
+
+#: modules/visualization/projectm.cpp:53
+msgid "projectM preset path"
+msgstr "Slighe ro-shocrachadh projectM"
+
+#: modules/visualization/projectm.cpp:54
+msgid "Path to the projectM preset directory"
+msgstr "An t-slighe gu pasgan ro-shocrachadh projectM"
+
+#: modules/visualization/projectm.cpp:56
+msgid "Title font"
+msgstr "Cruth-clò an tiotail"
+
+#: modules/visualization/projectm.cpp:57
+msgid "Font used for the titles"
+msgstr "An cruth-clò a thèid a chleachdadh airson tiotalan"
+
+#: modules/visualization/projectm.cpp:59
+msgid "Font menu"
+msgstr "Clà r-taice nan cruthan-clò"
+
+#: modules/visualization/projectm.cpp:60
+msgid "Font used for the menus"
+msgstr "An cruth-clò a thèid a chleachdadh sna clà ran-taice"
+
+#: modules/visualization/projectm.cpp:63 modules/visualization/vsxu.cpp:56
+msgid "The width of the video window, in pixels."
+msgstr "Leud uinneag a' video, ann am piogsailean."
+
+#: modules/visualization/projectm.cpp:66 modules/visualization/vsxu.cpp:59
+msgid "The height of the video window, in pixels."
+msgstr "Àirde uinneag a' video, ann am piogsailean."
+
+#: modules/visualization/projectm.cpp:68
+msgid "Mesh width"
+msgstr "Leud a' mhogail"
+
+#: modules/visualization/projectm.cpp:69
+msgid "The width of the mesh, in pixels."
+msgstr "Leud a' mhogail, ann am piogsailean."
+
+#: modules/visualization/projectm.cpp:71
+msgid "Mesh height"
+msgstr "Àirde a' mhogail"
+
+#: modules/visualization/projectm.cpp:72
+msgid "The height of the mesh, in pixels."
+msgstr "Àirde a' mhogail, ann am piogsailean."
+
+#: modules/visualization/projectm.cpp:74
+msgid "Texture size"
+msgstr "Meud an innich"
+
+#: modules/visualization/projectm.cpp:75
+msgid "The size of the texture, in pixels."
+msgstr "Meud an innich, ann am piogsailean."
+
+#: modules/visualization/projectm.cpp:98
+msgid "projectM"
+msgstr "projectM"
+
+#: modules/visualization/projectm.cpp:99
+msgid "libprojectM effect"
+msgstr "Èifeachd libprojectM"
+
+#: modules/visualization/visual/visual.c:45
+msgid "Effects list"
+msgstr "Liosta nan èifeachdan"
++=======
+
+ #: modules/visualization/projectm.cpp:53
+ msgid "projectM preset path"
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:54
+ msgid "Path to the projectM preset directory"
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:56
+ msgid "Title font"
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:57
+ msgid "Font used for the titles"
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:59
+ msgid "Font menu"
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:60
+ msgid "Font used for the menus"
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:63 modules/visualization/vsxu.cpp:56
+ msgid "The width of the video window, in pixels."
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:66 modules/visualization/vsxu.cpp:59
+ msgid "The height of the video window, in pixels."
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:68
+ msgid "Mesh width"
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:69
+ msgid "The width of the mesh, in pixels."
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:71
+ msgid "Mesh height"
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:72
+ msgid "The height of the mesh, in pixels."
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:74
+ msgid "Texture size"
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:75
+ msgid "The size of the texture, in pixels."
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:98
+ msgid "projectM"
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:99
+ msgid "libprojectM effect"
+ msgstr ""
+
+ #: modules/visualization/visual/visual.c:45
+ msgid "Effects list"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/visualization/visual/visual.c:47
msgid ""
@@@ -26743,7 -26737,7 +28183,11 @@@ msgstr "Còmhradh
#: modules/gui/qt4/ui/about.h:288 modules/gui/qt4/ui/about.h:289
msgid "Update"
++<<<<<<< HEAD
+msgstr "Ùraich"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/equalizer.h:132 modules/gui/qt4/ui/open_disk.h:296
#: modules/gui/qt4/ui/open_net.h:96 modules/gui/qt4/ui/sprefs_audio.h:411
@@@ -27148,7 -27142,7 +28592,11 @@@ msgstr "Taghadh ro-sheata is gleusadh x
#: modules/gui/qt4/ui/sprefs_input.h:344
msgid "Hardware-accelerated decoding"
++<<<<<<< HEAD
+msgstr "Dì-chòdachadh \"hardware accelerated\""
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_input.h:345
msgid "Skip H.264 in-loop deblocking filter"
@@@ -27228,7 -27222,7 +28676,11 @@@ msgstr "Cuir a' chluich 'na stad nuair
#: modules/gui/qt4/ui/sprefs_interface.h:524
msgid "Show media change popup:"
++<<<<<<< HEAD
+msgstr "Seall priob-uinneag atharrachadh a' mheadhain:"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:525
msgid "Start in minimal view mode"
@@@ -27252,7 -27246,7 +28704,11 @@@ msgstr "Faidhle goireas a' chraicinn:
#: modules/gui/qt4/ui/sprefs_interface.h:531
msgid "Playlist and Instances"
++<<<<<<< HEAD
+msgstr "An liosta-chluich agus ionstansan"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:532
msgid "Album art download policy:"
@@@ -27288,7 -27282,7 +28744,11 @@@ msgstr "Cuir an gnìomh caismeachdan m
#: modules/gui/qt4/ui/sprefs_interface.h:548
msgid "Operating System Integration"
++<<<<<<< HEAD
+msgstr "Filleadh a-steach san t-siostam-obrachaidh"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:549
msgid "File extensions association"
@@@ -27308,11 -27302,11 +28768,19 @@@ msgstr "Seall tiotal a' mheadhain nuai
#: modules/gui/qt4/ui/sprefs_subtitles.h:290
msgid "Enable subtitles"
++<<<<<<< HEAD
+msgstr "Cuir na fo-thiotalan an comas"
+
+#: modules/gui/qt4/ui/sprefs_subtitles.h:291
+msgid "Subtitle Language"
+msgstr "CÃ nan nam fo-thiotalan"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:291
+ msgid "Subtitle Language"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:293
msgid "Default encoding"
@@@ -27320,7 -27314,7 +28788,11 @@@ msgstr "An còdachadh bunaiteach
#: modules/gui/qt4/ui/sprefs_subtitles.h:294
msgid "Subtitle effects"
++<<<<<<< HEAD
+msgstr "Èifeachdan nam fo-thiotalan"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:300
msgid "Add a shadow"
@@@ -27572,6 -27566,23 +29044,26 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Liosta Media Manager"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Seall am mion-fhiosrachadh"
+
+ #~ msgid "Subtitles/OSD"
+ #~ msgstr "Fo-thiotalan/OSD"
+
+ #~ msgid "Subtitles codecs"
+ #~ msgstr "Codecs nam fo-thiotalan"
+
+ #~ msgid "Settings for subtitles, teletext and CC decoders and encoders."
+ #~ msgstr ""
+ #~ "Roghainnean airson dì-chòdaichearan is còdaichearan fho-thiotalan, "
+ #~ "teletext is CC."
+
+ #~ msgid "General Input"
+ #~ msgstr "Ion-chur coitcheann"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -27579,6 -27590,9 +29071,12 @@@
#~ "Tha SAP 'na dhòigh gus sruthan (a tha 'gan cur le ioma-chraoladh UDP no "
#~ "RTO) a nochdadh gu poblach."
++<<<<<<< HEAD
++=======
+ #~ msgid "CPU features"
+ #~ msgstr "Feartan CPU"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "You can choose to disable some CPU accelerations here. Use with extreme "
#~ "care!"
@@@ -27586,14 -27600,76 +29084,85 @@@
#~ "'S urrainn dhut chuid dhe na gleusan luathachadh a' CPU a chur à comas an-"
#~ "seo. Bidh air d' fhaiceall!"
++<<<<<<< HEAD
++=======
+ #~ msgid "Chroma modules settings"
+ #~ msgstr "Roghainnean nam mòidealan Chroma"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "These settings affect chroma transformation modules."
#~ msgstr ""
#~ "Tha buaidh aig na roghainnean seo air na mòidealan cruth-atharrachadh "
#~ "Chroma."
++<<<<<<< HEAD
++#~ msgid "There is no help available for these modules."
++#~ msgstr "Chan eil cobhair ri fhaighinn airson nam mòidealan seo."
++
++=======
+ #~ msgid "Packetizer modules settings"
+ #~ msgstr "Roghainnean mòidealan a' phacaidiche"
+
+ #~ msgid "Encoders settings"
+ #~ msgstr "Roghainnean nan còdaichearan"
+
+ #~ msgid ""
+ #~ "These are general settings for video/audio/subtitles encoding modules."
+ #~ msgstr ""
+ #~ "Seo na roghainnean coitcheann airson mòidealan còdachadh video/fuaime/fho-"
+ #~ "thiotalan."
+
+ #~ msgid "Dialog providers settings"
+ #~ msgstr "Roghainnean solaraichean nan còmhradh"
+
+ #~ msgid "Subtitle demuxer settings"
+ #~ msgstr "Roghainnean demuxer nam fo-thiotalan"
+
+ #~ msgid ""
+ #~ "In this section you can force the behavior of the subtitle demuxer, for "
+ #~ "example by setting the subtitles type or file name."
+ #~ msgstr ""
+ #~ "'S urrainn dhut giùlan demuxer nam fo-thiotalan èigneachadh an-seo, mar "
+ #~ "eisimpleir le bhith a' suidheachadh seòrsa nam fo-thiotalan no ainm an "
+ #~ "fhaidhle an-seo."
+
+ #~ msgid "No help available"
+ #~ msgstr "Chan eil cobhair ri fhaighinn"
+
#~ msgid "There is no help available for these modules."
#~ msgstr "Chan eil cobhair ri fhaighinn airson nam mòidealan seo."
+ #~ msgid "Quick &Open File..."
+ #~ msgstr "F&osgail faidhle gu luath..."
+
+ #~ msgid "&Bookmarks"
+ #~ msgstr "&Comharran-leabhair"
+
+ #~ msgid "Fetch Information"
+ #~ msgstr "Faigh am fiosrachadh"
+
+ #~ msgid "Sort"
+ #~ msgstr "Seòrsaich"
+
+ #~ msgid "No Repeat"
+ #~ msgstr "Na ath-dhèan"
+
+ #~ msgid "Add to Media Library"
+ #~ msgstr "Cuir ri leabharlann nam meadhanan"
+
+ #~ msgid "Advanced Open..."
+ #~ msgstr "Fosgladh adhartach..."
+
+ #~ msgid "Open Play&list..."
+ #~ msgstr "Fosgail &liosta-chluich..."
+
+ #~ msgid "Search Filter"
+ #~ msgstr "Criathrag luirg"
+
+ #~ msgid "&Services Discovery"
+ #~ msgstr "&Mothachadh do sheirbheisean"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Some options are available but hidden. Check \"Advanced options\" to see "
#~ "them."
@@@ -27601,6 -27677,15 +29170,18 @@@
#~ "Tha roghainnean ri fhaighinn ach tha iad falaichte. Thoir sùil air na "
#~ "roghainnean adhartach air an son."
++<<<<<<< HEAD
++=======
+ #~ msgid "Image clone"
+ #~ msgstr "Clòn dhen dealbh"
+
+ #~ msgid "Clone the image"
+ #~ msgstr "Dèan clòn dhen dealbh"
+
+ #~ msgid "Magnification"
+ #~ msgstr "Meudachadh"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Magnify a part of the video. You can select which part of the image "
#~ "should be magnified."
@@@ -27649,9 -27734,15 +29230,21 @@@
#~ "Tha %d mòideal(an) ann nach deach an sealltainn seach nach eil aca ach "
#~ "roghainnean adhartach.\n"
++<<<<<<< HEAD
+#~ msgid "This will force a mono audio output."
+#~ msgstr "Èignichidh seo à s-chur fuaime mono."
+
++=======
+ #~ msgid "Force mono audio"
+ #~ msgstr "Èignich fuaim mono"
+
+ #~ msgid "This will force a mono audio output."
+ #~ msgstr "Èignichidh seo à s-chur fuaime mono."
+
+ #~ msgid "Default audio volume"
+ #~ msgstr "Àirde fuaime bhunaiteach"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "You can set the default audio output volume here, in a range from 0 to "
#~ "1024."
@@@ -27666,6 -27757,9 +29259,12 @@@
#~ "'S urrainn dhut na ceuman air an dèid an fhuaim a chur air gleus "
#~ "atharrachadh an-seo mar rainse eadar 0 is 1024."
++<<<<<<< HEAD
++=======
+ #~ msgid "Audio output frequency (Hz)"
+ #~ msgstr "Tricead à s-chur na fuaime (hZ)"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "You can force the audio output frequency here. Common values are 0 "
#~ "(undefined), 48000, 44100, 32000, 22050, 16000, 11025, 8000."
@@@ -27677,12 -27771,48 +29276,57 @@@
#~ msgid "High quality audio resampling"
#~ msgstr "Ath-shamplachadh fuaime de chà ileachd à rd"
++<<<<<<< HEAD
++#~ msgid "Raise the interface above all other windows."
++#~ msgstr "Àrdaich an eadar-aghaidh os cionn gach uinneig eile."
++
++#~ msgid "Lower the interface below all other windows."
++#~ msgstr "ÃŒslich an eadar-aghaidh fo gach uinneag eile."
++
++=======
+ #~ msgid "Audio visualizations "
+ #~ msgstr "Fir chlis fuaime "
+
+ #~ msgid "Subtitles track"
+ #~ msgstr "Traca nam fo-thiotalan"
+
+ #~ msgid "Subtitles track ID"
+ #~ msgstr "ID traca nam fo-thiotalan"
+
+ #~ msgid "Low definition (320 lines)"
+ #~ msgstr "Deifinisean ìseal (320 loidhne)"
+
+ #~ msgid "Leave fullscreen"
+ #~ msgstr "Fà g an là n-sgrìn"
+
+ #~ msgid "Select the hotkey to use to leave fullscreen state."
+ #~ msgstr "Tagh an hotkey airson an là n-sgrìn no fhà gail."
+
+ #~ msgid "Increase scale factor."
+ #~ msgstr "Cuir factar an sgèilidh an à irde."
+
+ #~ msgid "Decrease scale factor."
+ #~ msgstr "Cuir factar an sgèilidh an lughad."
+
+ #~ msgid "Cycle through deinterlace modes."
+ #~ msgstr "Cuairtich tro na modhan deinterlace."
+
+ #~ msgid "Show interface"
+ #~ msgstr "Seall an eadar-aghaidh"
+
#~ msgid "Raise the interface above all other windows."
#~ msgstr "Àrdaich an eadar-aghaidh os cionn gach uinneig eile."
+ #~ msgid "Hide interface"
+ #~ msgstr "Falaich an eadar-aghaidh"
+
#~ msgid "Lower the interface below all other windows."
#~ msgstr "ÃŒslich an eadar-aghaidh fo gach uinneag eile."
+ #~ msgid "Normal/Repeat/Loop"
+ #~ msgstr "Àbhaisteach/Ath-chluich/Lùbadh"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Display OSD menu on top of video output"
#~ msgstr "Seall an clà r-taice OSD air uachdar à s-chur a' video"
@@@ -27716,6 -27846,9 +29360,12 @@@
#~ msgid "Move OSD menu highlight to the widget below"
#~ msgstr "Gluais soillseachadh clà r-taice OSD dhan widget foidhe"
++<<<<<<< HEAD
++=======
+ #~ msgid "Select current widget"
+ #~ msgstr "Tagh am widget là ithreach"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Selecting current widget performs the associated action."
#~ msgstr ""
#~ "Ma thaghar am widget là ithreach, thèid an gnìomh co-cheangailte a "
@@@ -27724,21 -27857,36 +29374,48 @@@
#~ msgid "CPU"
#~ msgstr "CPU"
++<<<<<<< HEAD
++#~ msgid "Kalaallisut (Greenlandic)"
++#~ msgstr "Kalaallisut (Graolannais)"
++
++=======
+ #~ msgid "Greek, Modern ()"
+ #~ msgstr "Nua-Ghreugais"
+
#~ msgid "Kalaallisut (Greenlandic)"
#~ msgstr "Kalaallisut (Graolannais)"
+ #~ msgid "Occitan (post 1500); Provencal"
+ #~ msgstr "Ogsatanais (an dèidh 1500); Provençal"
+
+ #~ msgid "Aspect-ratio"
+ #~ msgstr "Co-mheas an deilbh"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "3D Now! memcpy"
#~ msgstr "3D Now! memcpy"
#~ msgid "Capture format (default s16l)"
#~ msgstr "Fòrmat a' ghlacaidh ('s e s16l a' bhun-roghainn)"
++<<<<<<< HEAD
++=======
+ #~ msgid "Capture format of audio stream."
+ #~ msgstr "Am fòrmat glacaidh airson sruth na fuaime."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "PCM U8"
#~ msgstr "PCM U8"
#~ msgid "PCM S8"
#~ msgstr "PCM S8"
++<<<<<<< HEAD
++=======
+ #~ msgid "GSM Audio"
+ #~ msgstr "Fuaim GSM"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "PCM U16 LE"
#~ msgstr "PCM U16 LE"
@@@ -27787,30 -27935,109 +29464,121 @@@
#~ msgid "PCM F64 BE"
#~ msgstr "PCM F64 BE"
++<<<<<<< HEAD
+#~ msgid "BluRay"
+#~ msgstr "Blu-ray"
+
- #~ msgid ""
- #~ "Because this AVI file index is broken or missing, seeking will not work "
- #~ "correctly.\n"
- #~ "VLC won't repair your file but can temporary fix this problem by building "
- #~ "an index in memory.\n"
- #~ "This step might take a long time on a large file.\n"
- #~ "What do you want to do ?"
- #~ msgstr ""
- #~ "Chan obraich an sireadh mar bu chòir a chionn 's gu bheil am faidhle "
- #~ "inneacs AVI briste no a dhìth.\n"
- #~ "Cha chà raich VLC am faidhle dhut ach 's urrainn dha inneacs sealach a "
- #~ "thogail dhut sa chuimhne.\n"
- #~ "Dh'fhaoidte gun doir seo ùine fhada mas e faidhle mòr a tha ann.\n"
- #~ "Dè bu mhath leat dèanamh?"
++=======
+ #~ msgid "ALSA audio capture input"
+ #~ msgstr "Ion-chur glacadh fuaime ALSA"
- #~ msgid "Christian rap"
- #~ msgstr "Rap Crìostail"
+ #~ msgid "Blu-Ray Disc Input"
+ #~ msgstr "Ion-chur diosga Blu-ray"
- #~ msgid "Pop/funk"
- #~ msgstr "Pop/Funk"
+ #~ msgid "Bluray menus"
+ #~ msgstr "Clà ir-thaice Blu-ray"
+
+ #~ msgid "Use bluray menus. If disabled, the movie will start directly"
+ #~ msgstr ""
+ #~ "Cleachd clà ir-thaice Blu-ray. Ma tha seo à comas, tòisichidh am film sa "
+ #~ "bhad."
+
+ #~ msgid "BluRay"
+ #~ msgstr "Blu-ray"
+
+ #~ msgid "Blu-Ray Disc support (libbluray)"
+ #~ msgstr "Taic le diosga Blu-ray (libbluray)"
+
+ #~ msgid ""
+ #~ "This Blu-Ray Disc needs a library for AACS decoding, and your system does "
+ #~ "not have it."
+ #~ msgstr ""
+ #~ "Feumaidh an diosga Blu-ray seo leabharlann airson dì-chòdachadh AACS ach "
+ #~ "chan eil sin aig an t-siostam agad."
+
+ #~ msgid "BluRay Disc is corrupted."
+ #~ msgstr "Tha an diosga Blu-ray coirbte."
+
+ #~ msgid ""
+ #~ "This Blu-Ray Disc needs a library for BD+ decoding, and your system does "
+ #~ "not have it."
+ #~ msgstr ""
+ #~ "Feumaidh an diosga Blu-ray seo leabharlann airson dì-chòdachadh BD+ ach "
+ #~ "chan eil sin aig an t-siostam agad."
+
+ #~ msgid "Blu-Ray error"
+ #~ msgstr "Mearachd Blu-ray"
+
+ #~ msgid "dc1394 input"
+ #~ msgstr "Ion-chur dc1394"
+
+ #~ msgid "Refresh list"
+ #~ msgstr "Ath-nuadhaich an liosta"
+
+ #~ msgid "Norm"
+ #~ msgstr "Nòrm"
+
+ #~ msgid "Subtitles text encoding"
+ #~ msgstr "Còdachadh teacsa nam fo-thiotalan"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+ #~ msgid ""
+ #~ "Because this AVI file index is broken or missing, seeking will not work "
+ #~ "correctly.\n"
+ #~ "VLC won't repair your file but can temporary fix this problem by building "
+ #~ "an index in memory.\n"
+ #~ "This step might take a long time on a large file.\n"
+ #~ "What do you want to do ?"
+ #~ msgstr ""
+ #~ "Chan obraich an sireadh mar bu chòir a chionn 's gu bheil am faidhle "
+ #~ "inneacs AVI briste no a dhìth.\n"
+ #~ "Cha chà raich VLC am faidhle dhut ach 's urrainn dha inneacs sealach a "
+ #~ "thogail dhut sa chuimhne.\n"
+ #~ "Dh'fhaoidte gun doir seo ùine fhada mas e faidhle mòr a tha ann.\n"
+ #~ "Dè bu mhath leat dèanamh?"
+
++<<<<<<< HEAD
++=======
+ #~ msgid "Classic rock"
+ #~ msgstr "Roc clasaigeach"
+
+ #~ msgid "Death metal"
+ #~ msgstr "Death Metal"
+
+ #~ msgid "Sound clip"
+ #~ msgstr "Cliop fuaime"
+
+ #~ msgid "Alternative rock"
+ #~ msgstr "Alternative Rock"
+
+ #~ msgid "Instrumental pop"
+ #~ msgstr "Pop ionnsramaideach"
+
+ #~ msgid "Instrumental rock"
+ #~ msgstr "Roc ionnsramaideach"
+
+ #~ msgid "Southern rock"
+ #~ msgstr "Southern Rock"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+ #~ msgid "Christian rap"
+ #~ msgstr "Rap Crìostail"
+
+ #~ msgid "Pop/funk"
+ #~ msgstr "Pop/Funk"
+
++<<<<<<< HEAD
++=======
+ #~ msgid "New wave"
+ #~ msgstr "New Wave"
+ #~ msgid "Acid punk"
+ #~ msgstr "Acid Punk"
+
+ #~ msgid "Acid jazz"
+ #~ msgstr "Acid Jazz"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Rock & roll"
#~ msgstr "Rock & Roll"
@@@ -27820,11 -28047,20 +29588,26 @@@
#~ msgid "Make"
#~ msgstr "Make"
++<<<<<<< HEAD
++=======
+ #~ msgid "Video aspect ratio"
+ #~ msgstr "Co-mheas deilbh video"
+
+ #~ msgid "Image file"
+ #~ msgstr "Faidhle deilbh"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Filename of image file to use on the overlay framebuffer."
#~ msgstr ""
#~ "Ainm faidhle dhen fhaidhle deilbh a chleachdar air tar-chòmhdachadh a' "
#~ "bhufair fhrèamaichean."
++<<<<<<< HEAD
++=======
+ #~ msgid "Transparency of the image"
+ #~ msgstr "Trìd-shoilleireachd an deilbh"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Text to display on the overlay framebuffer."
#~ msgstr "An teacsa a sheallar air tar-chòmhdachadh a' bhufair fhrèamaichean."
@@@ -27845,27 -28081,72 +29628,90 @@@
#~ "Dèan reandaradh air an teacsa no an dealbh san tar-chòmhdachadh bhufair "
#~ "là ithreach."
++<<<<<<< HEAD
+#~ msgid "GNU/Linux osd/overlay framebuffer interface"
+#~ msgstr "Eadar-aghaidh tar-chòmhdachadh/osd bufair fhrèamaichean GNU/Linux"
+
+#~ msgid "VLC Debug Log (%s).rtfd"
+#~ msgstr "Loga dì-bhugachaidh VLC (%s).rtfd"
+
+#~ msgid "Subscreen left:"
+#~ msgstr "Fo-sgrìn air an taobh chlì:"
+
++=======
+ #~ msgid "Display on overlay framebuffer"
+ #~ msgstr "Seall air tar-chòmhdachadh a' bhufair fhrèamaichean"
+
+ #~ msgid "Commands"
+ #~ msgstr "Àitheantan"
+
+ #~ msgid "GNU/Linux osd/overlay framebuffer interface"
+ #~ msgstr "Eadar-aghaidh tar-chòmhdachadh/osd bufair fhrèamaichean GNU/Linux"
+
+ #~ msgid "Maemo hildon interface"
+ #~ msgstr "Eadar-aghaidh Maemo hildon"
+
+ #~ msgid "Compiled by %@ with %@"
+ #~ msgstr "Air a thional le %@ le %@"
+
+ #~ msgid "VLC Debug Log (%s).rtfd"
+ #~ msgstr "Loga dì-bhugachaidh VLC (%s).rtfd"
+
+ #~ msgid "Automatically save the volume on exit"
+ #~ msgstr "Sà bhail à irde na fuaime nuair a dhùinear am prògram"
+
+ #~ msgid "Capture Device"
+ #~ msgstr "An t-inneal glacaidh"
+
+ #~ msgid "Frames per Second:"
+ #~ msgstr "Frèamaichean gach diog:"
+
+ #~ msgid "Subscreen left:"
+ #~ msgstr "Fo-sgrìn air an taobh chlì:"
+
+ #~ msgid "Subscreen top:"
+ #~ msgstr "Fo-sgrìn aig a' bharr:"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Subscreen width:"
#~ msgstr "Leud na fo-sgrìn:"
#~ msgid "Subscreen height:"
#~ msgstr "Àirde na fo-sgrìn:"
++<<<<<<< HEAD
++=======
+ #~ msgid "Image width:"
+ #~ msgstr "Leud an deilbh:"
+
+ #~ msgid "Image height:"
+ #~ msgstr "Àirde an deilbh:"
+
+ #~ msgid "Load subtitles file:"
+ #~ msgstr "Luchdaich faidhle nam fo-thiotalan:"
+
+ #~ msgid "Subtitles encoding"
+ #~ msgstr "Còdachadh nam fo-thiotalan"
+
+ #~ msgid "Subtitles alignment"
+ #~ msgstr "Co-thaobhadh nam fo-thiotalan"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "SAP announce"
#~ msgstr "Èigheach SAP"
#~ msgid "RTSP announce"
#~ msgstr "Èigheach RTSP"
++<<<<<<< HEAD
++=======
+ #~ msgid "HTTP announce"
+ #~ msgstr "Èigheach HTTP"
+
+ #~ msgid "HTML Playlist"
+ #~ msgstr "Liosta-chluich HTML"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Beware this will reset the VLC media player preferences.\n"
#~ "Are you sure you want to continue?"
@@@ -27874,9 -28155,63 +29720,69 @@@
#~ "mheadhanan VLC.\n"
#~ "A bheil thu cinnteach gu bheil thu airson leantainn air adhart?"
++<<<<<<< HEAD
+#~ msgid "Password for HTTP Proxy"
+#~ msgstr "Am facal-faire airson progsaidh HTTP"
+
++=======
+ #~ msgid "General Audio Settings"
+ #~ msgstr "Roghainnean coitcheann na fuaime"
+
+ #~ msgid "General Video Settings"
+ #~ msgstr "Roghainnean coitcheann a' video"
+
+ #~ msgid "Subtitles & OSD"
+ #~ msgstr "Fo-thiotalan â” OSD"
+
+ #~ msgid "Subtitles & On Screen Display Settings"
+ #~ msgstr "Roghainnean nam fo-thiotalan ┠sealladh air sgrìn"
+
+ #~ msgid "Input & Codecs"
+ #~ msgstr "Ion-chur â” codecs"
+
+ #~ msgid "Input & Codec settings"
+ #~ msgstr "Roghainnean ion-chuir â” codec"
+
+ #~ msgid "Enable Audio"
+ #~ msgstr "Cuir an fhuaim an comas"
+
+ #~ msgid "HTTP Proxy"
+ #~ msgstr "Progsaidh HTTP"
+
+ #~ msgid "Password for HTTP Proxy"
+ #~ msgstr "Am facal-faire airson progsaidh HTTP"
+
+ #~ msgid "Font Color"
+ #~ msgstr "Dath a' chruth-chlò"
+
+ #~ msgid "Font Size"
+ #~ msgstr "Meud a' chruth-chlò"
+
+ #~ msgid "Subtitle Languages"
+ #~ msgstr "CÃ nain nam fo-thiotalan"
+
+ #~ msgid "Preferred Subtitle Language"
+ #~ msgstr "An cà nan as fhearr leat airson fo-thiotalan"
+
+ #~ msgid "Force Bold"
+ #~ msgstr "Èignich clò trom"
+
+ #~ msgid "Outline Color"
+ #~ msgstr "Dath na h-oir-loidhne"
+
+ #~ msgid "Enable Video"
+ #~ msgstr "Cuir video an comas"
+
+ #~ msgid "Subtitle track syncronization:"
+ #~ msgstr "Sioncronachadh traca nam fo-thiotal:"
+
+ #~ msgid "Subtitles speed:"
+ #~ msgstr "Astar nam fo-thiotal:"
+
+ #~ msgid "Subtitles duration factor:"
+ #~ msgstr "Factor faid nam fo-thiotal:"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Extend subtitles duration by this value.\n"
#~ "Set 0 to disable."
@@@ -27900,6 -28235,9 +29806,12 @@@
#~ "an cuid susbaint is an luach seo.\n"
#~ "Tagh 0 gus a chur à comas."
++<<<<<<< HEAD
++=======
+ #~ msgid "SAP Announce"
+ #~ msgstr "Èigheach SAP"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Minimal Mac OS X OpenGL video output (opens a borderless window)"
#~ msgstr ""
#~ "Às-chur video OpenGL as lugha airson Mac OS X (fosglaidh seo uinneag gun "
@@@ -27920,6 -28258,9 +29832,12 @@@
#~ msgid " demux bitrate : %6.0f kb/s"
#~ msgstr " bitrate demux : %6.0f kb/s"
++<<<<<<< HEAD
++=======
+ #~ msgid " [Video Decoding]"
+ #~ msgstr " [Video 'ga dhì-chòdachadh]"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid " video decoded : %<PRId64>"
#~ msgstr " video air a dhì-chòdachadh : %<PRId64>"
@@@ -27929,6 -28270,9 +29847,12 @@@
#~ msgid " frames lost : %<PRId64>"
#~ msgstr " frèamaichean air an call : %<PRId64>"
++<<<<<<< HEAD
++=======
+ #~ msgid " [Audio Decoding]"
+ #~ msgstr " [Fuaim 'ga dì-chòdachadh]"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid " audio decoded : %<PRId64>"
#~ msgstr " fuaim air a dhì-chòdachadh : %<PRId64>"
@@@ -27938,6 -28282,9 +29862,12 @@@
#~ msgid " buffers lost : %<PRId64>"
#~ msgstr " bufaran air an call : %<PRId64>"
++<<<<<<< HEAD
++=======
+ #~ msgid " [Streaming]"
+ #~ msgstr " ['Ga shruthadh]"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid " packets sent : %5i"
#~ msgstr " pacaidean air an cur : %5i"
@@@ -27947,835 -28294,313 +29877,1145 @@@
#~ msgid " sending bitrate : %6.0f kb/s"
#~ msgstr " bitrate a' chuir : %6.0f kb/s"
++<<<<<<< HEAD
+#~ msgid "TV (digital)"
+#~ msgstr "TBh (digiteach)"
+
+#~ msgid "PictureFlow View "
+#~ msgstr "Sealladh PictureFlow"
+
+#~ msgid "Warning: the key is already assigned to \""
+#~ msgstr ""
+#~ "Rabhadh: chaidh an iuchair sin a cheangal ris na leanas mu thrà th: \""
+
+#~ msgid ""
+#~ "<p><i>VLC media player</i> does <b>not</b> send or collect any "
+#~ "information, even anonymously, about your usage.</p>\n"
+#~ "<p>However, it can connect to the Internet in order to display <b>medias "
+#~ "information</b> or to check for available <b>updates</b>.</p>\n"
+#~ "<p><i>VideoLAN</i> (the authors) requires you to express your consent "
+#~ "before allowing this software to access the Internet.</p>\n"
+#~ "<p>According to your choices, please check or uncheck the following "
+#~ "options:</p>\n"
+#~ msgstr ""
+#~ "<p><b>Cha</b> chruinnich 's <b>cha</b> chuir <i>cluicheadair mheadhanan "
+#~ "VLC</i> fiosrachadh mu do chleachdadh dheth, fiù feadhainn gun urra.</p>\n"
+#~ "<p>Ge-tà , dh'fhaoidte gun dèan e ceangal ris an eadar-lìon ach an urrainn "
+#~ "dha <b>fiosrachadh mu mheadhanan</b> a shealltainn no <b>ùrrachadh</b> a "
+#~ "lorg.</p>\n"
+#~ "<p>Feumaidh <i>VideoLAN</i> (na h-ùghdaran) cead follaiseach uat mus dèan "
+#~ "am bathar-bog seo ceangal ris an eadar-lìon.</p>\n"
+#~ "<p>Cuir cromag ris na roghainnean a leanas a-rèir do thoil fhèin:</p>\n"
+
+#~ msgid ""
+#~ "VLC media player is a free media player, encoder and streamer that can "
+#~ "read from files, CDs, DVDs, network streams, capture cards and even "
+#~ "more!\n"
+#~ "VLC uses its internal codecs and works on essentially every popular "
+#~ "platform.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Tha cluicheadair mheadhanan VLC 'na chluicheadair, còdaichear is "
+#~ "sruthaiche saor an-asgaidh a tha comasach air faidhlichean, CDs, DVDs, "
+#~ "sruthain-lìn, cairtean-glacaidh is mòran a bharrachd a leughadh!\n"
+#~ "Tha VLC a' cleachdadh a chuid codecs fhèin agus obraichidh e cha mhòr air "
+#~ "gach ùrlar air a bheil fèill mhòr.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "This version of VLC was compiled by:\n"
+#~ " "
+#~ msgstr "Chaidh an tionndadh seo de VLC a thrusadh le:"
+
+#~ msgid ""
+#~ "You are using the Qt4 Interface.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Tha thu a' cleachdadh eadar-aghaidh Qt4.\n"
+#~ "\n"
+
+#~ msgid " by the VideoLAN Team.\n"
+#~ msgstr " le sgioba VideoLAN.\n"
+
+#~ msgid "Please enter the URL or path to the media you want to play"
+#~ msgstr ""
+#~ "Cuir a-steach an URL no an t-slighe dhan mheadhan a tha thu airson cluich"
+
+#~ msgid "Are you sure you wish to create the stream ?"
+#~ msgstr "A bheil thu cinnteach gu bheil thu airson an sruth a chruthachadh?"
+
+#~ msgid ""
+#~ "We would like to thank the whole VLC community, the testers, our users "
+#~ "and the following people (and the missing ones...) for their "
+#~ "collaboration to create the best free software."
+#~ msgstr ""
+#~ "Bu toigh leinn taing a thoirt dhan a' choimhearsnachd VLC gu lèir, "
+#~ "muinntir nan deuchainnean, an luchd-cleachdaidh againn agus na daoine a "
+#~ "leanas (agus cà ch nach eil air ainmeachadh...) airson na chum iad rinn de "
+#~ "thaic a' cruthachadh grà inne-mullaich nam prògraman."
+
+#~ msgid ""
+#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#~ "REC-html40/strict.dtd\">\n"
+#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#~ "css\">\n"
+#~ "p, li { white-space: pre-wrap; }\n"
+#~ "p { margin: 0; -qt-block-indent: 0; text-indent: 0;}\n"
+#~ "body { font-family: 'sans'; font-size: 8pt; font-weight: 400; }\n"
+#~ "p > span { color: #838383; }\n"
+#~ "</style></head><body>\n"
+#~ "<p><span>http://www.example.com/stream.avi</span></p>\n"
+#~ "<p><span>rtp://@:1234</span></p>\n"
+#~ "<p><span>mms://mms.examples.com/stream.asx</span></p>\n"
+#~ "<p><span>rtsp://server.example.org:8080/test.sdp</span></p>\n"
+#~ "<p><span>http://www.yourtube.com/watch?v=gg64x</span></p></body></html>"
+#~ msgstr ""
+#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#~ "REC-html40/strict.dtd\">\n"
+#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#~ "css\">\n"
+#~ "p, li { white-space: pre-wrap; }\n"
+#~ "p { margin: 0; -qt-block-indent: 0; text-indent: 0;}\n"
+#~ "body { font-family: 'sans'; font-size: 8pt; font-weight: 400; }\n"
+#~ "p > span { color: #838383; }\n"
+#~ "</style></head><body>\n"
+#~ "<p><span>http://www.example.com/stream.avi</span></p>\n"
+#~ "<p><span>rtp://@:1234</span></p>\n"
+#~ "<p><span>mms://mms.examples.com/stream.asx</span></p>\n"
+#~ "<p><span>rtsp://server.example.org:8080/test.sdp</span></p>\n"
+#~ "<p><span>http://www.yourtube.com/watch?v=gg64x</span></p></body></html>"
+
+#~ msgid "00000; "
+#~ msgstr "00000; "
+
+#~ msgid "Do you want to download it ?"
+#~ msgstr "A bheil thu airson a luchdadh a-nuas?"
+
+#~ msgid "Error when sending the Crash Report"
+#~ msgstr "Thachair mearachd nuair a chuir sinn aithisg an tuislidh"
+
+#~ msgid "Advance of audio over video:"
+#~ msgstr "Adhartas dhen fhuaim thairis air a' video:"
+
+#, fuzzy
+#~ msgid "Show Details"
+#~ msgstr "Mion-fhiosrachadh mun chodec"
+
+#, fuzzy
+#~ msgid "Subtitles/OSD"
+#~ msgstr "Fo-thiotalan / OSD"
+
+#, fuzzy
+#~ msgid "Subtitles codecs"
+#~ msgstr "Codecs nam fo-thiotalan"
+
+#, fuzzy
+#~ msgid "Settings for subtitles, teletext and CC decoders and encoders."
+#~ msgstr ""
+#~ "Roghainnean airson dì-chòdaichearan is còdaichearan fho-thiotalan, "
+#~ "teletext is CC."
+
+#, fuzzy
+#~ msgid "General Input"
+#~ msgstr "Coitcheann"
+
+#, fuzzy
+#~ msgid "CPU features"
+#~ msgstr "Glac"
+
+#, fuzzy
+#~ msgid "Chroma modules settings"
+#~ msgstr "Roghainnean coitcheann a' video"
+
+#, fuzzy
+#~ msgid "Packetizer modules settings"
+#~ msgstr "Roghainnean coitcheann a' video"
+
+#, fuzzy
+#~ msgid "Encoders settings"
+#~ msgstr "Roghainnean deasachaidh"
+
+#, fuzzy
+#~ msgid ""
+#~ "These are general settings for video/audio/subtitles encoding modules."
+#~ msgstr ""
+#~ "Seo na roghainnean coitcheann airson mòidealan còdachadh video/fuaime/fho-"
+#~ "thiotalan."
+
+#, fuzzy
+#~ msgid "Dialog providers settings"
+#~ msgstr "Roghainnean coitcheann a' video"
+
+#, fuzzy
+#~ msgid "Subtitle demuxer settings"
+#~ msgstr "Èifeachdan nam fo-thiotalan"
+
+#, fuzzy
+#~ msgid ""
+#~ "In this section you can force the behavior of the subtitle demuxer, for "
+#~ "example by setting the subtitles type or file name."
+#~ msgstr ""
+#~ "'S urrainn dhut giùlan demuxer nam fo-thiotalan èigneachadh an-seo, mar "
+#~ "eisimpleir le bhith a' suidheachadh seòrsa nam fo-thiotalan no ainm an "
+#~ "fhaidhle an-seo."
+
+#, fuzzy
+#~ msgid "No help available"
+#~ msgstr "An tè as fhearr a tha ri là imh"
+
+#, fuzzy
+#~ msgid "Quick &Open File..."
+#~ msgstr "Fosg&ail faidhle..."
+
+#, fuzzy
+#~ msgid "&Bookmarks"
+#~ msgstr "Comharran-leabhair"
+
+#, fuzzy
+#~ msgid "Fetch Information"
+#~ msgstr "Fiosrachadh mun &chodec"
+
+#, fuzzy
+#~ msgid "Sort"
+#~ msgstr "Seòrsaich a-rèir"
+
+#, fuzzy
+#~ msgid "No Repeat"
+#~ msgstr "Ath-chluich"
+
+#, fuzzy
+#~ msgid "Add to Media Library"
+#~ msgstr "Luchdaich leabhar-lann nam meadhanan"
+
+#, fuzzy
+#~ msgid "Advanced Open..."
+#~ msgstr "&Fosgladh faidhle adhartach..."
+
+#, fuzzy
+#~ msgid "Open Play&list..."
+#~ msgstr "Fosgail liosta-chluich..."
+
+#, fuzzy
+#~ msgid "Search Filter"
+#~ msgstr "Criathragan srutha"
+
+#, fuzzy
+#~ msgid "&Services Discovery"
+#~ msgstr "Mothachadh do sheirbheisean"
+
+#, fuzzy
+#~ msgid "Image clone"
+#~ msgstr "Dealbh"
+
+#, fuzzy
+#~ msgid "Clone the image"
+#~ msgstr "Clònaich criathrag a' video"
+
+#, fuzzy
+#~ msgid "Magnification"
+#~ msgstr "Meudachadh/Sùm"
+
+#, fuzzy
+#~ msgid "Force mono audio"
+#~ msgstr "Èignich clò trom"
+
+#, fuzzy
+#~ msgid "Default audio volume"
+#~ msgstr "Cuimhnich à irde na fuaime"
+
+#, fuzzy
+#~ msgid "Audio output frequency (Hz)"
+#~ msgstr "Mòideal à s-chur na fuaime"
+
+#, fuzzy
+#~ msgid "Audio visualizations "
+#~ msgstr "Fir chlis fuaime"
+
+#, fuzzy
+#~ msgid "Subtitles track"
+#~ msgstr "Traca nam fo-thiotalan"
+
+#, fuzzy
+#~ msgid "Subtitles track ID"
+#~ msgstr "ID traca nam fo-thiotalan"
+
+#, fuzzy
+#~ msgid "Low definition (320 lines)"
+#~ msgstr "Deifinisean ìseal (360 loidhne)"
+
+#, fuzzy
+#~ msgid "Leave fullscreen"
+#~ msgstr "Fà g an là n-sgrìn"
+
+#, fuzzy
+#~ msgid "Select the hotkey to use to leave fullscreen state."
+#~ msgstr "Tagh an hotkey airson a dhol dhan là n-sgrìn no fhà gail."
+
+#, fuzzy
+#~ msgid "Increase scale factor."
+#~ msgstr "Cuir factar an sgèilidh an à irde"
+
+#, fuzzy
+#~ msgid "Decrease scale factor."
+#~ msgstr "Cuir factar an sgèilidh an lughad"
+
+#, fuzzy
+#~ msgid "Cycle through deinterlace modes."
+#~ msgstr "Cuairtich tro na modhan deinterlace"
+
+#, fuzzy
+#~ msgid "Show interface"
+#~ msgstr "Eadar-aghaidh Qt"
+
+#, fuzzy
+#~ msgid "Hide interface"
+#~ msgstr "Eadar-aghaidh Qt"
+
+#, fuzzy
+#~ msgid "Normal/Repeat/Loop"
+#~ msgstr "Àbhaisteach/Lùbadh/Ath-chluich"
+
+#, fuzzy
+#~ msgid "Select current widget"
+#~ msgstr "Ath-chluich an nì là ithreach"
+
+#, fuzzy
+#~ msgid "Greek, Modern ()"
+#~ msgstr "Nua-Ghreugais"
+
+#, fuzzy
+#~ msgid "Occitan (post 1500); Provencal"
+#~ msgstr "Ogsatanais; Provençal"
+
+#, fuzzy
+#~ msgid "Aspect-ratio"
+#~ msgstr "Co-mheas an deilbh"
+
+#, fuzzy
+#~ msgid "Capture format of audio stream."
+#~ msgstr "Glac sruth na fuaime ann an stereo."
+
+#, fuzzy
+#~ msgid "GSM Audio"
+#~ msgstr "Fuaim"
+
+#, fuzzy
+#~ msgid "ALSA audio capture input"
+#~ msgstr "Glacadh fuaime ALSA"
+
+#, fuzzy
+#~ msgid "Blu-Ray Disc Input"
+#~ msgstr "Ion-chur diosga Blu-ray"
+
+#, fuzzy
+#~ msgid "Bluray menus"
+#~ msgstr "Clà ran-taice Blu-ray"
+
+#, fuzzy
+#~ msgid "Use bluray menus. If disabled, the movie will start directly"
+#~ msgstr ""
+#~ "Cleachd clà ran-taice Blu-ray. Ma tha seo à comas, tòisichidh am film sa "
+#~ "bhad."
+
+#, fuzzy
+#~ msgid "Blu-Ray Disc support (libbluray)"
+#~ msgstr "Taic le diosga Blu-ray (libbluray)"
+
+#, fuzzy
+#~ msgid ""
+#~ "This Blu-Ray Disc needs a library for AACS decoding, and your system does "
+#~ "not have it."
+#~ msgstr ""
+#~ "Feumaidh an diosga Blu-ray seo leabharlann airson dì-chòdachadh AACS ach "
+#~ "chan eil sin aig an t-siostam agad."
+
+#, fuzzy
+#~ msgid "BluRay Disc is corrupted."
+#~ msgstr "Tha an diosga Blu-ray coirbte."
+
+#, fuzzy
+#~ msgid ""
+#~ "This Blu-Ray Disc needs a library for BD+ decoding, and your system does "
+#~ "not have it."
+#~ msgstr ""
+#~ "Feumaidh an diosga Blu-ray seo leabharlann airson dì-chòdachadh BD+ ach "
+#~ "chan eil sin aig an t-siostam agad."
+
+#, fuzzy
+#~ msgid "Blu-Ray error"
+#~ msgstr "Mearachd Blu-ray"
+
+#, fuzzy
+#~ msgid "dc1394 input"
+#~ msgstr "Gun ion-chur"
+
+#, fuzzy
+#~ msgid "Refresh list"
+#~ msgstr "Liosta nan èifeachdan"
+
+#, fuzzy
+#~ msgid "Norm"
+#~ msgstr "Àbhaisteach"
+
+#, fuzzy
+#~ msgid "Subtitles text encoding"
+#~ msgstr "Codecs nam fo-thiotalan"
+
+#, fuzzy
+#~ msgid "Classic rock"
+#~ msgstr "Clasaigeach"
+
+#, fuzzy
+#~ msgid "Death metal"
+#~ msgstr "Metadata a' chinn-là "
+
+#, fuzzy
+#~ msgid "Sound clip"
+#~ msgstr "Soundtrack"
+
+#, fuzzy
+#~ msgid "Alternative rock"
+#~ msgstr "Alternative"
+
+#, fuzzy
+#~ msgid "Instrumental pop"
+#~ msgstr "Ionnsramaideach"
+
+#, fuzzy
+#~ msgid "Instrumental rock"
+#~ msgstr "Ionnsramaideach"
+
+#, fuzzy
+#~ msgid "Southern rock"
+#~ msgstr "Roc sèimh"
+
+#, fuzzy
+#~ msgid "New wave"
+#~ msgstr "New Age"
+
+#, fuzzy
+#~ msgid "Acid punk"
+#~ msgstr "Acid"
+
+#, fuzzy
+#~ msgid "Acid jazz"
+#~ msgstr "Acid"
+
+#, fuzzy
+#~ msgid "Video aspect ratio"
+#~ msgstr "Glèidh co-mheas an deilbh"
+
+#, fuzzy
+#~ msgid "Image file"
+#~ msgstr "Dealbh"
+
+#, fuzzy
+#~ msgid "Transparency of the image"
+#~ msgstr "Trìd-shoilleireachd"
+
+#, fuzzy
+#~ msgid "Display on overlay framebuffer"
+#~ msgstr "Frèamaichean 'gan sealltainn"
+
+#, fuzzy
+#~ msgid "Commands"
+#~ msgstr "Command+"
+
+#, fuzzy
+#~ msgid "Maemo hildon interface"
+#~ msgstr "Prìomh eadar-aghaidhean"
+
+#, fuzzy
+#~ msgid "Compiled by %@ with %@"
+#~ msgstr "Air a thrusadh le %s %s (%s)\n"
+
+#, fuzzy
+#~ msgid "Automatically save the volume on exit"
+#~ msgstr "Luchdaich mòideal nan leudachan gu fèin-obrachail aig an toiseach"
+
+#, fuzzy
+#~ msgid "Capture Device"
+#~ msgstr "&An t-inneal glacaidh"
+
+#, fuzzy
+#~ msgid "Frames per Second:"
+#~ msgstr "Frèamaichean gach diog"
+
+#, fuzzy
+#~ msgid "Subscreen top:"
+#~ msgstr "Fo-sgrìobh gu pod-chraoladh"
+
+#, fuzzy
+#~ msgid "Image width:"
+#~ msgstr "Gleusadh an deilbh"
+
+#, fuzzy
+#~ msgid "Image height:"
+#~ msgstr "Àirde a' mhogail"
+
+#, fuzzy
+#~ msgid "Load subtitles file:"
+#~ msgstr "Cuir faidhle le fo-thiotalan ris:"
+
+#, fuzzy
+#~ msgid "Subtitles encoding"
+#~ msgstr "Codecs nam fo-thiotalan"
+
+#, fuzzy
+#~ msgid "Subtitles alignment"
+#~ msgstr "Co-thaobhadh a' video"
+
+#, fuzzy
+#~ msgid "HTTP announce"
+#~ msgstr "Ion-chur HTTP"
+
+#, fuzzy
+#~ msgid "HTML Playlist"
+#~ msgstr "Liosta-chluich HTML"
+
+#, fuzzy
+#~ msgid "General Audio Settings"
+#~ msgstr "Roghainnean coitcheann na fuaime"
+
+#, fuzzy
+#~ msgid "General Video Settings"
+#~ msgstr "Roghainnean coitcheann a' video"
+
+#, fuzzy
+#~ msgid "Subtitles & OSD"
+#~ msgstr "Fo-thiotalan / OSD"
+
+#, fuzzy
+#~ msgid "Subtitles & On Screen Display Settings"
+#~ msgstr "Cuir an comas On Screen Display (OSD)"
+
+#, fuzzy
+#~ msgid "Input & Codecs"
+#~ msgstr "Ion-chur/Codecs"
+
+#, fuzzy
+#~ msgid "Input & Codec settings"
+#~ msgstr "Roghainnean ion-chuir ⊠codec"
+
+#, fuzzy
+#~ msgid "Enable Audio"
+#~ msgstr "Cuir an fhuaim an comas"
+
+#, fuzzy
+#~ msgid "HTTP Proxy"
+#~ msgstr "Progsaidh HTTP"
+
+#, fuzzy
+#~ msgid "Font Color"
+#~ msgstr "Dath a' chruth-chlò"
+
+#, fuzzy
+#~ msgid "Font Size"
+#~ msgstr "Meud a' chruth-chlò"
+
+#, fuzzy
+#~ msgid "Subtitle Languages"
+#~ msgstr "CÃ nan nam fo-thiotalan"
+
+#, fuzzy
+#~ msgid "Preferred Subtitle Language"
+#~ msgstr "An cà nan as fhearr leat airson fo-thiotalan"
+
+#, fuzzy
+#~ msgid "Force Bold"
+#~ msgstr "Èignich clò trom"
+
+#, fuzzy
+#~ msgid "Outline Color"
+#~ msgstr "Dath na h-oir-loidhne"
+
+#, fuzzy
+#~ msgid "Enable Video"
+#~ msgstr "Cuir video an comas"
+
+#, fuzzy
+#~ msgid "Subtitle track syncronization:"
+#~ msgstr "Sioncronachadh traca na fuaime:"
+
+#, fuzzy
+#~ msgid "Subtitles speed:"
+#~ msgstr "Fo-thiotalan"
+
+#, fuzzy
+#~ msgid "Subtitles duration factor:"
+#~ msgstr "Traca nam fo-thiotalan"
+
+#, fuzzy
+#~ msgid "SAP Announce"
+#~ msgstr "Èigheach srutha"
+
+#, fuzzy
+#~ msgid " [Video Decoding]"
+#~ msgstr "Bearradh video"
+
+#, fuzzy
+#~ msgid " [Audio Decoding]"
+#~ msgstr "Roghainnean na fuaime"
+
+#, fuzzy
+#~ msgid " [Streaming]"
+#~ msgstr "'Ga shruthadh"
+
+#, fuzzy
+#~ msgid " m Show/Hide metadata box"
+#~ msgstr " L Seall/Falaich bogsa nan teachdaireachd"
+
+#, fuzzy
+#~ msgid " Volume : %u%%"
+#~ msgstr "Àirde na fuaime: Mùch"
+
+#, fuzzy
+#~ msgid "Previous media in the playlist, skip backward when keep-pressed"
+#~ msgstr "Am meadhan roimhe air an liosta-chluich"
+
+#, fuzzy
+#~ msgid "Next media in the playlist, skip forward when keep-pressed"
+#~ msgstr "An ath-mheadhan air an liosta-chluich"
+
+#, fuzzy
+#~ msgid "Show playlist"
+#~ msgstr "Seall/Falaich an liosta-chluich"
+
+#, fuzzy
+#~ msgid "Open subtitles file"
+#~ msgstr "Fosgail na fo-thiotalan"
+
+#, fuzzy
+#~ msgid "Preamp\n"
+#~ msgstr "Preamp"
+
+#, fuzzy
+#~ msgid " dB"
+#~ msgstr "dB"
+
+#, fuzzy
+#~ msgid "Enable spatializer"
+#~ msgstr "Cuir an comas an spatializer"
+
+#, fuzzy
+#~ msgid "Radio device name"
+#~ msgstr "Ainm an inneil fhuaime"
+
+#, fuzzy
+#~ msgid "Add to playlist"
+#~ msgstr "Cuir ris an liosta-chluich"
+
+#, fuzzy
+#~ msgid "Clear playlist"
+#~ msgstr "Falamhaich an liosta-chluich"
+
+#, fuzzy
+#~ msgid "Icon View"
+#~ msgstr "Sealladh"
+
+#, fuzzy
+#~ msgid "Detailed View"
+#~ msgstr "Meadhan ─ Seall"
+
+#, fuzzy
+#~ msgid "List View"
+#~ msgstr "Meadhan ─ Seall"
+
+#, fuzzy
+#~ msgid "Select an action to change the associated hotkey"
+#~ msgstr "Tagh gnìomh gus an hotkey ud atharrachadh:"
+
+#, fuzzy
+#~ msgid "Hotkey for "
+#~ msgstr "Hotkey"
+
+#, fuzzy
+#~ msgid "Press the new keys for "
+#~ msgstr ""
+#~ "Brùth iuchraichean ùra airson\n"
+#~ "\"%@\""
+
+#, fuzzy
+#~ msgid "Subtitles && OSD"
+#~ msgstr "Fo-thiotalan / OSD"
+
+#, fuzzy
+#~ msgid "Input && Codecs"
+#~ msgstr "Ion-chur/Codecs"
+
+#, fuzzy
+#~ msgid "Allow downloading media information"
+#~ msgstr "Dèan briogadh dùbailte airson fiosrachadh mun mheadhan"
+
+#, fuzzy
+#~ msgid "Allow checking for VLC updates"
+#~ msgstr "Thoir sùil airson ùrachaidhean VLC"
+
+#, fuzzy
+#~ msgid "Save and Continue"
+#~ msgstr "Lean air adhart"
+
+#, fuzzy
+#~ msgid "Compiler: "
+#~ msgstr "Trusaiche: %s\n"
+
+#, fuzzy
+#~ msgid "Copyright (C) "
+#~ msgstr "Còir-lethbhreac"
+
+#, fuzzy
+#~ msgid "&Codec"
+#~ msgstr "Codec"
+
+#, fuzzy
+#~ msgid "&Convert"
+#~ msgstr "Iompaich"
+
+#, fuzzy
+#~ msgid "&Convert / Save"
+#~ msgstr "&Iompaich / SÃ bhail..."
+
+#, fuzzy
+#~ msgid "Subtitles Files"
+#~ msgstr "Faidhle nam fo-thiotalan"
+
+#, fuzzy
+#~ msgid "&Tools"
+#~ msgstr "I&nnealan"
+
+#, fuzzy
+#~ msgid "&Open (advanced)..."
+#~ msgstr "Fosg&ail faidhle..."
+
+#, fuzzy
+#~ msgid "Audio &Channels"
+#~ msgstr "Seanailean fuaime"
+
+#, fuzzy
+#~ msgid "&Subtitles Track"
+#~ msgstr "Traca nam fo-thiotalan"
+
+#, fuzzy
+#~ msgid "&Navigation"
+#~ msgstr "Seòladaireachd"
+
+#, fuzzy
+#~ msgid "Tools"
+#~ msgstr "I&nnealan"
+
+#, fuzzy
+#~ msgid "Hide VLC media player in taskbar"
+#~ msgstr "Ùraich cluicheadair mheadhanan VLC"
+
+#, fuzzy
+#~ msgid "Show VLC media player"
+#~ msgstr "Cluicheadair mheadhanan VLC"
+
+#, fuzzy
+#~ msgid "Advanced options"
+#~ msgstr "Roghainnean adhartach"
+
+#, fuzzy
+#~ msgid "Show all the advanced options in the dialogs."
+#~ msgstr "Seall na roghainnean adhartach"
+
+#, fuzzy
+#~ msgid "Blu-Ray"
+#~ msgstr "Blu-ray"
+
+#, fuzzy
+#~ msgid "File Name"
+#~ msgstr "Ainm an fhaidhle"
+
+#, fuzzy
+#~ msgid "Rows:"
+#~ msgstr "RÃ ghan"
+
+#, fuzzy
+#~ msgid "width"
+#~ msgstr "Leud"
+
+#, fuzzy
+#~ msgid "Columns:"
+#~ msgstr "Colbhan"
+
+#, fuzzy
+#~ msgid "height"
+#~ msgstr "Àirde"
+
+#, fuzzy
+#~ msgid "Preamp: "
+#~ msgstr "Preamp:"
+
+#, fuzzy
+#~ msgid "Licence"
+#~ msgstr "Ceadachas"
+
+#, fuzzy
+#~ msgid "Verbosity:"
+#~ msgstr "Briathrachas (0,1,2)"
+
+#, fuzzy
+#~ msgid "Add a subtitles file"
+#~ msgstr "Cuir faidhle le fo-thiotalan ris:"
+
+#, fuzzy
+#~ msgid "Use a sub&titles file"
+#~ msgstr "Faidhle nam fo-thiotalan"
+
+#, fuzzy
+#~ msgid "Select the subtitles file"
+#~ msgstr "Tagh am faidhle"
+
+#, fuzzy
+#~ msgid "Destinations"
+#~ msgstr "Ceann-uidhe"
+
+#, fuzzy
+#~ msgid "Group name"
+#~ msgstr "Buidheann"
+
+#, fuzzy
+#~ msgid "Use GPU accelerated decoding"
+#~ msgstr "Dì-chòdachadh \"hardware accelerated\""
+
+#, fuzzy
+#~ msgid "Instances"
+#~ msgstr "Stà laich"
+
+#, fuzzy
+#~ msgid "Enqueue files when in one instance mode"
+#~ msgstr "Cuir nithean air an liosta-chluich ma bhios e sa mhodh aon-ionstans"
+
+#, fuzzy
+#~ msgid "Systray popup when minimized"
+#~ msgstr "Cuir a' chluich 'na stad nuair a bhios e lùghdaichte"
+
+#, fuzzy
+#~ msgid "Subtitles Language"
+#~ msgstr "CÃ nan nam fo-thiotalan"
+
+#, fuzzy
+#~ msgid "Preferred subtitles language"
+#~ msgstr "An cà nan as fhearr leat airson fo-thiotalan"
+
+#, fuzzy
+#~ msgid "Subtitles effects"
+#~ msgstr "Èifeachdan nam fo-thiotalan"
+
+#, fuzzy
+#~ msgid "Black slot"
+#~ msgstr "Slot dubh"
+
++=======
+ #~ msgid " m Show/Hide metadata box"
+ #~ msgstr " m Seall/Falaich bogsa a' mhetadata"
+
+ #~ msgid " Volume : %u%%"
+ #~ msgstr " Àirde na fuaime : %u%%"
+
+ #~ msgid "Previous media in the playlist, skip backward when keep-pressed"
+ #~ msgstr ""
+ #~ "Am meadhan roimhe air an liosta-chluich, gearr leuman air ais ma chumar "
+ #~ "shìos e"
+
+ #~ msgid "Next media in the playlist, skip forward when keep-pressed"
+ #~ msgstr ""
+ #~ "An ath-mheadhan air an liosta-chluich, gearr leuman air adhart ma chumar "
+ #~ "shìos e"
+
+ #~ msgid "Show playlist"
+ #~ msgstr "Seall no falaich an liosta-chluich"
+
+ #~ msgid "Open subtitles file"
+ #~ msgstr "Fosgail faidhle nam fo-thiotalan"
+
+ #~ msgid "Preamp\n"
+ #~ msgstr "Preamp\n"
+
+ #~ msgid " dB"
+ #~ msgstr " dB"
+
+ #~ msgid "Enable spatializer"
+ #~ msgstr "Cuir an comas an spatializer"
+
+ #~ msgid "Radio device name"
+ #~ msgstr "Ainm an inneil rèidio"
+
+ #~ msgid "TV (digital)"
+ #~ msgstr "TBh (digiteach)"
+
+ #~ msgid "Add to playlist"
+ #~ msgstr "Cuir ris an liosta-chluich"
+
+ #~ msgid "Clear playlist"
+ #~ msgstr "Falamhaich an liosta-chluich"
+
+ #~ msgid "Icon View"
+ #~ msgstr "Sealladh nan ìomhaigheagan"
+
+ #~ msgid "Detailed View"
+ #~ msgstr "An sealladh mionaideach"
+
+ #~ msgid "List View"
+ #~ msgstr "Sealladh nan liosta"
+
+ #~ msgid "PictureFlow View "
+ #~ msgstr "Sealladh PictureFlow"
+
+ #~ msgid "Select an action to change the associated hotkey"
+ #~ msgstr "Tagh gnìomh gus an hotkey ud atharrachadh"
+
+ #~ msgid "Hotkey for "
+ #~ msgstr "An hotkey airson"
+
+ #~ msgid "Press the new keys for "
+ #~ msgstr "Brùth na h-iuchraichean ùra airson"
+
+ #~ msgid "Warning: the key is already assigned to \""
+ #~ msgstr ""
+ #~ "Rabhadh: chaidh an iuchair sin a cheangal ris na leanas mu thrà th: \""
+
+ #~ msgid "Subtitles && OSD"
+ #~ msgstr "Fo-thiotalan â” OSD"
+
+ #~ msgid "Input && Codecs"
+ #~ msgstr "Ion-chur â” codecs"
+
+ #~ msgid ""
+ #~ "<p><i>VLC media player</i> does <b>not</b> send or collect any "
+ #~ "information, even anonymously, about your usage.</p>\n"
+ #~ "<p>However, it can connect to the Internet in order to display <b>medias "
+ #~ "information</b> or to check for available <b>updates</b>.</p>\n"
+ #~ "<p><i>VideoLAN</i> (the authors) requires you to express your consent "
+ #~ "before allowing this software to access the Internet.</p>\n"
+ #~ "<p>According to your choices, please check or uncheck the following "
+ #~ "options:</p>\n"
+ #~ msgstr ""
+ #~ "<p><b>Cha</b> chruinnich 's <b>cha</b> chuir <i>cluicheadair mheadhanan "
+ #~ "VLC</i> fiosrachadh mu do chleachdadh dheth, fiù feadhainn gun urra.</p>\n"
+ #~ "<p>Ge-tà , dh'fhaoidte gun dèan e ceangal ris an eadar-lìon ach an urrainn "
+ #~ "dha <b>fiosrachadh mu mheadhanan</b> a shealltainn no <b>ùrrachadh</b> a "
+ #~ "lorg.</p>\n"
+ #~ "<p>Feumaidh <i>VideoLAN</i> (na h-ùghdaran) cead follaiseach uat mus dèan "
+ #~ "am bathar-bog seo ceangal ris an eadar-lìon.</p>\n"
+ #~ "<p>Cuir cromag ris na roghainnean a leanas a-rèir do thoil fhèin:</p>\n"
+
+ #~ msgid "Allow downloading media information"
+ #~ msgstr ""
+ #~ "Tha mi a' toirt cead dha fiosrachadh mu mheadhanan a luchdadh a-nuas"
+
+ #~ msgid "Allow checking for VLC updates"
+ #~ msgstr "Tha mi a' toirt cead dha ùrachaidhean airson VLC a lorg"
+
+ #~ msgid "Save and Continue"
+ #~ msgstr "SÃ bhail is lean air adhart"
+
+ #~ msgid ""
+ #~ "VLC media player is a free media player, encoder and streamer that can "
+ #~ "read from files, CDs, DVDs, network streams, capture cards and even "
+ #~ "more!\n"
+ #~ "VLC uses its internal codecs and works on essentially every popular "
+ #~ "platform.\n"
+ #~ "\n"
+ #~ msgstr ""
+ #~ "Tha cluicheadair mheadhanan VLC 'na chluicheadair, còdaichear is "
+ #~ "sruthaiche saor an-asgaidh a tha comasach air faidhlichean, CDs, DVDs, "
+ #~ "sruthain-lìn, cairtean-glacaidh is mòran a bharrachd a leughadh!\n"
+ #~ "Tha VLC a' cleachdadh a chuid codecs fhèin agus obraichidh e cha mhòr air "
+ #~ "gach ùrlar air a bheil fèill mhòr.\n"
+ #~ "\n"
+
+ #~ msgid ""
+ #~ "This version of VLC was compiled by:\n"
+ #~ " "
+ #~ msgstr "Chaidh an tionndadh seo de VLC a thrusadh le:"
+
+ #~ msgid "Compiler: "
+ #~ msgstr "Trusaiche: "
+
+ #~ msgid ""
+ #~ "You are using the Qt4 Interface.\n"
+ #~ "\n"
+ #~ msgstr ""
+ #~ "Tha thu a' cleachdadh eadar-aghaidh Qt4.\n"
+ #~ "\n"
+
+ #~ msgid "Copyright (C) "
+ #~ msgstr "Còir-lethbhric (C)"
+
+ #~ msgid " by the VideoLAN Team.\n"
+ #~ msgstr " le sgioba VideoLAN.\n"
+
+ #~ msgid "&Codec"
+ #~ msgstr "&Codec"
+
+ #~ msgid "&Convert"
+ #~ msgstr "&Iompaich"
+
+ #~ msgid "&Convert / Save"
+ #~ msgstr "&Iompaich / SÃ bhail"
+
+ #~ msgid "Please enter the URL or path to the media you want to play"
+ #~ msgstr ""
+ #~ "Cuir a-steach an URL no an t-slighe dhan mheadhan a tha thu airson cluich"
+
+ #~ msgid "Subtitles Files"
+ #~ msgstr "Faidhlichean fho-thiotalan"
+
+ #~ msgid "&Tools"
+ #~ msgstr "&Innealan"
+
+ #~ msgid "&Open (advanced)..."
+ #~ msgstr "&Fosgail (air dòigh adhartach)..."
+
+ #~ msgid "Audio &Channels"
+ #~ msgstr "&Seanailean fuaime"
+
+ #~ msgid "&Subtitles Track"
+ #~ msgstr "Traca &nam fo-thiotalan"
+
+ #~ msgid "&Navigation"
+ #~ msgstr "&Seòladaireachd"
+
+ #~ msgid "Tools"
+ #~ msgstr "Innealan"
+
+ #~ msgid "Hide VLC media player in taskbar"
+ #~ msgstr "Falaich cluicheadair mheadhanan VLC o bhà r nan saothair"
+
+ #~ msgid "Show VLC media player"
+ #~ msgstr "Seall cluicheadair mheadhanan VLC"
+
+ #~ msgid "Advanced options"
+ #~ msgstr "Roghainnean adhartach"
+
+ #~ msgid "Show all the advanced options in the dialogs."
+ #~ msgstr "Seall gach roghainn adhartach sna còmhraidhean."
+
+ #~ msgid "Blu-Ray"
+ #~ msgstr "Blu-Ray"
+
+ #~ msgid "File Name"
+ #~ msgstr "Ainm an fhaidhle"
+
+ #~ msgid "Rows:"
+ #~ msgstr "RÃ ghan:"
+
+ #~ msgid "width"
+ #~ msgstr "leud"
+
+ #~ msgid "Columns:"
+ #~ msgstr "Colbhan:"
+
+ #~ msgid "height"
+ #~ msgstr "Ã irde"
+
+ #~ msgid "Are you sure you wish to create the stream ?"
+ #~ msgstr "A bheil thu cinnteach gu bheil thu airson an sruth a chruthachadh?"
+
+ #~ msgid "Preamp: "
+ #~ msgstr "Preamp: "
+
+ #~ msgid ""
+ #~ "We would like to thank the whole VLC community, the testers, our users "
+ #~ "and the following people (and the missing ones...) for their "
+ #~ "collaboration to create the best free software."
+ #~ msgstr ""
+ #~ "Bu toigh leinn taing a thoirt dhan a' choimhearsnachd VLC gu lèir, "
+ #~ "muinntir nan deuchainnean, an luchd-cleachdaidh againn agus na daoine a "
+ #~ "leanas (agus cà ch nach eil air ainmeachadh...) airson na chum iad rinn de "
+ #~ "thaic a' cruthachadh grà inne-mullaich nam prògraman."
+
+ #~ msgid "Licence"
+ #~ msgstr "Ceadachas"
+
+ #~ msgid "Verbosity:"
+ #~ msgstr "Briathrachas:"
+
+ #~ msgid "Add a subtitles file"
+ #~ msgstr "Cuir faidhle fho-thiotalan ris"
+
+ #~ msgid "Use a sub&titles file"
+ #~ msgstr "Cleach &faidhle fho-thiotalan"
+
+ #~ msgid "Select the subtitles file"
+ #~ msgstr "Tagh faidhle nam fo-thiotalan"
+
+ #~ msgid ""
+ #~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+ #~ "REC-html40/strict.dtd\">\n"
+ #~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+ #~ "css\">\n"
+ #~ "p, li { white-space: pre-wrap; }\n"
+ #~ "p { margin: 0; -qt-block-indent: 0; text-indent: 0;}\n"
+ #~ "body { font-family: 'sans'; font-size: 8pt; font-weight: 400; }\n"
+ #~ "p > span { color: #838383; }\n"
+ #~ "</style></head><body>\n"
+ #~ "<p><span>http://www.example.com/stream.avi</span></p>\n"
+ #~ "<p><span>rtp://@:1234</span></p>\n"
+ #~ "<p><span>mms://mms.examples.com/stream.asx</span></p>\n"
+ #~ "<p><span>rtsp://server.example.org:8080/test.sdp</span></p>\n"
+ #~ "<p><span>http://www.yourtube.com/watch?v=gg64x</span></p></body></html>"
+ #~ msgstr ""
+ #~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+ #~ "REC-html40/strict.dtd\">\n"
+ #~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+ #~ "css\">\n"
+ #~ "p, li { white-space: pre-wrap; }\n"
+ #~ "p { margin: 0; -qt-block-indent: 0; text-indent: 0;}\n"
+ #~ "body { font-family: 'sans'; font-size: 8pt; font-weight: 400; }\n"
+ #~ "p > span { color: #838383; }\n"
+ #~ "</style></head><body>\n"
+ #~ "<p><span>http://www.example.com/stream.avi</span></p>\n"
+ #~ "<p><span>rtp://@:1234</span></p>\n"
+ #~ "<p><span>mms://mms.examples.com/stream.asx</span></p>\n"
+ #~ "<p><span>rtsp://server.example.org:8080/test.sdp</span></p>\n"
+ #~ "<p><span>http://www.yourtube.com/watch?v=gg64x</span></p></body></html>"
+
+ #~ msgid "00000; "
+ #~ msgstr "00000; "
+
+ #~ msgid "Destinations"
+ #~ msgstr "Cinn-uidhe"
+
+ #~ msgid "Group name"
+ #~ msgstr "Ainm a' bhuidhinn"
+
+ #~ msgid "Use GPU accelerated decoding"
+ #~ msgstr "Cleachd dì-chòdachadh le luathachadh GPU"
+
+ #~ msgid "Instances"
+ #~ msgstr "Ionstansan"
+
+ #~ msgid "Enqueue files when in one instance mode"
+ #~ msgstr "Cuir faidhlichean sa chiutha ma bhios e sa mhodh aon-instans"
+
+ #~ msgid "Systray popup when minimized"
+ #~ msgstr "Priob-uinneag ann an treighe an t-siostaim ma bhios e lùghdaichte"
+
+ #~ msgid "Subtitles Language"
+ #~ msgstr "CÃ nain nam fo-thiotalan"
+
+ #~ msgid "Preferred subtitles language"
+ #~ msgstr "An cà nan as fhearr leat airson fo-thiotalan"
+
+ #~ msgid "Subtitles effects"
+ #~ msgstr "Èifeachdan nam fo-thiotalan"
+
+ #~ msgid "Do you want to download it ?"
+ #~ msgstr "A bheil thu airson a luchdadh a-nuas?"
+
+ #~ msgid "Black slot"
+ #~ msgstr "Slot dubh"
+
+ #~ msgid "Error when sending the Crash Report"
+ #~ msgstr "Thachair mearachd nuair a chuir sinn aithisg an tuislidh"
+
+ #~ msgid "Advance of audio over video:"
+ #~ msgstr "Adhartas dhen fhuaim thairis air a' video:"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Video Filters..."
#~ msgstr "Faidhlichean video"
@@@ -28786,4 -28611,4 +31026,8 @@@
#, fuzzy
#~ msgid "Speed of the subtitles:"
++<<<<<<< HEAD
+#~ msgstr "Fosgail na fo-thiotalan"
++=======
+ #~ msgstr "Tagh faidhle nam fo-thiotalan"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined po/gl.po
index 39c66a3,4768a42..b818345
--- a/po/gl.po
+++ b/po/gl.po
@@@ -10,7 -10,7 +10,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-22 09:47+0000\n"
"Last-Translator: Gonçalo Cordeiro <gzcordeiro at gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -139,7 -139,7 +143,11 @@@ msgstr "Outros módulos e configuració
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -497,10 -497,10 +505,17 @@@ msgid "&About
msgstr "&Sobre"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -539,17 -539,17 +554,29 @@@ msgid "Save...
msgstr "Gardar…"
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Repetir todos"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Repetir un"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -656,7 -656,7 +683,11 @@@ msgstr "Alcanzouse o número máximo d
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Desactivar"
@@@ -1358,22 -1358,22 +1389,38 @@@ msgstr "Taxa de fotogramas
msgid "Decoded format"
msgstr "Formato descodificado"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Non é posÃbel abrir a súa entrada"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Non é posÃbel abrir a súa entrada"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"O VLC non é quen de abrir o MRL '%s'. Verifique o ficheiro de rexistro para "
"máis detalles."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "O VLC non recoñece o formato de entrada"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "O VLC non recoñece o formato de entrada"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1808,7 -1808,7 +1855,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1897,7 -1897,7 +1948,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Ningún"
@@@ -1929,7 -1929,7 +1984,11 @@@ msgstr "
"predeterminado consiste en seleccionar automaticamente o mellor método "
"dispoñÃbel."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Activar o vÃdeo"
@@@ -2140,7 -2140,7 +2199,11 @@@ msgstr "
"de modo predeterminado."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Sempre por encima"
@@@ -2200,7 -2200,7 +2263,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2209,7 -2209,7 +2276,11 @@@ msgstr "Desentrelazar
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Modo de desentrelazado"
@@@ -2268,7 -2268,7 +2339,11 @@@ msgstr "
"Inhibe o daemon de xestión de enerxÃa durante calquera reprodución para "
"evitar que o computador se suspenda debido á inactividade."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Decoracións da xanela"
@@@ -2474,7 -2474,7 +2549,11 @@@ msgstr "
"pÃxeles cadrados (1:1). Se ten unha pantalla de 16:9, quizais queira cambiar "
"isto a 4:3 para manter as proporcións."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Saltar fotogramas"
@@@ -2621,12 -2621,12 +2700,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2634,7 -2634,7 +2722,11 @@@ msgid "Default
msgstr "Opcións predeterminadas"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2986,7 -2986,7 +3078,11 @@@ msgid "You can completely disable the s
msgstr "Pode desactivar totalmente o procesamento de subimaxes."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3959,7 -3959,7 +4055,11 @@@ msgstr "
"Estas configuracións son as combinacións de teclas globais do VLC, coñecidas "
"como «teclas rápidas»."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignorar"
@@@ -3985,8 -3985,8 +4085,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4073,10 -4073,10 +4178,17 @@@ msgid "Slower (fine)
msgstr "Máis lento (preciso)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4089,10 -4089,10 +4201,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Seleccione a tecla rápida para pasar ao seguinte elemento da lista."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Anterior"
@@@ -4101,9 -4101,9 +4220,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "Seleccione a tecla rápida para ir ao elemento anterior da lista."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4344,9 -4344,9 +4469,15 @@@ msgid "Select the key to decrease audi
msgstr "Seleccione a tecla rápida para baixar o volume."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Sen son"
@@@ -4777,7 -4777,7 +4908,11 @@@ msgstr "Percorrer en ciclo os dispositi
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Instantánea"
@@@ -4984,12 -4984,12 +5119,21 @@@ msgstr "Descargando…
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Cancelar"
@@@ -5754,7 -5754,7 +5898,11 @@@ msgstr "Recortar
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Proporción de aspecto"
@@@ -8274,7 -8274,7 +8422,11 @@@ msgstr "Entrada da pantalla
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Pantalla"
@@@ -9031,7 -9031,7 +9183,11 @@@ msgstr "Volume máx. #
msgid "Volume Set"
msgstr "Definición de volume"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10225,7 -10225,7 +10381,11 @@@ msgstr "Son envolvente 7.1
msgid "ALSA audio output"
msgstr "SaÃda de audio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Fallou a saÃda de audio"
@@@ -10258,7 -10258,7 +10418,11 @@@ msgstr "SaÃda de audio AudioQueue (iO
msgid "Android AudioTrack audio output"
msgstr "SaÃda de audio AudioTrack de Android"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "SaÃda AudioUnit para iOS"
@@@ -10266,22 -10266,22 +10430,38 @@@
msgid "Last audio device"
msgstr "Útimo dispositivo de audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "SaÃda HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "SaÃda HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"O dispositivo de saÃda de audio seleccionado está sendo usado exclusivamente "
"por outro programa."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "O dispositivo de audio non está configurado"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "O dispositivo de audio non está configurado"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10290,11 -10290,11 +10470,19 @@@ msgstr "
"Configuración de audio MIDI en /Aplicativos/Utilidades. O VLC só emitirá son "
"estéreo."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Dispositivo de saÃda de son do sistema"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Dispositivo de saÃda de son do sistema"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (SaÃda codificada)"
@@@ -11606,46 -11606,46 +11794,74 @@@ msgstr "Sombra
msgid "Outline"
msgstr "Contorno"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Negro"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Gris"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Prateado"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Branco"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Granate"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Vermello"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11653,61 -11653,61 +11869,97 @@@ msgid "Fuchsia
msgstr "Fucsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Amarelo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Verde oliva"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Verde"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Verde azulado"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Verde lima"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Púrpura"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Azul mariño"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Azul"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11864,7 -11864,7 +12116,11 @@@ msgstr "SubtÃtulos (avanzado)
msgid "Subtitle renderers using libass"
msgstr "Renderizadores de subtÃtulos que usan libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "ConstruÃndo a caché de tipos de letra"
@@@ -13922,10 -13922,10 +14178,17 @@@ msgid "Fast
msgstr "Rápido"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -14036,8 -14036,8 +14299,13 @@@ msgid "D-Bus control interface
msgstr "Interface de control D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14394,9 -14394,9 +14662,15 @@@ msgstr "Inicializando
msgid "Opening"
msgstr "Abrindo"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "En pausa"
@@@ -16357,7 -16357,7 +16631,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Demultiplexor de fluxo de transporte MPEG (TS)"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletexto"
@@@ -16546,7 -16546,7 +16824,11 @@@ msgid "VLC media player Help
msgstr "Axuda do VLC media player"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Ãndice"
@@@ -16634,9 -16634,9 +16916,15 @@@ msgstr "Escriba o nome do perfil novo:
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Gardar"
@@@ -16782,7 -16782,7 +17070,11 @@@ msgstr "
"Para que os marcadores funcionen o fluxo ten que estar reproducÃndose ou en "
"pausa."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Saltar ao tempo"
@@@ -16802,7 -16802,7 +17094,11 @@@ msgstr "Prema para reproducir ou pór e
msgid "Backward"
msgstr "Atrás"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16814,7 -16814,7 +17110,11 @@@ msgstr "
msgid "Forward"
msgstr "Adiante"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16838,23 -16838,15 +17138,35 @@@ msgstr "Alternar o modo de pantalla com
msgid "Click to enable fullscreen video playback."
msgstr "Prema para activar a reprodución de vÃdeo en pantalla completa."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "Prema e manteña premido para saltar cara a atrás no medio actual."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "Prema e manteña premido para saltar cara a adiante no medio actual."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Prema para deter a reprodución."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Mostrar ou ocultar a lista de reprodución"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Prema para deter a reprodución."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Mostrar ou ocultar a lista de reprodución"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -16863,12 -16855,12 +17175,20 @@@ msgstr "
"se mostra o vÃdeo na xanela principal, isto permÃtelle ocultar a lista de "
"reprodución."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Repetir"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -16876,15 -16868,15 +17196,27 @@@ msgstr "
"Prema para cambiar o modo de repetición. Hai tres estados: repetir un/unha, "
"repetir todo e desactivado."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Barallar"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "Prema para activar ou desactivar a reprodución aleatoria."
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Barallar"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "Prema para activar ou desactivar a reprodución aleatoria."
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -16892,24 -16884,24 +17224,44 @@@ msgstr "
"Prema e mova o rato ao mesmo tempo que mantén o botón premido para poder "
"usar este deslizador e cambiar o volume."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Prema para silenciar ou activar o audio."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Todo o volume"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Prema para reproducir o audio ao volume máximo."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Prema para silenciar ou activar o audio."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Todo o volume"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Prema para reproducir o audio ao volume máximo."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efectos"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -16917,14 -16909,22 +17269,33 @@@ msgstr "
"Prema para mostrar un panel de Efectos de audio cun ecualizador e filtros "
"adicionais."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Prema para ir ao elemento anterior da lista de reprodución."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Prema para ir ao seguinte elemento da lista de reprodución."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Prema para ir ao elemento anterior da lista de reprodución."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Prema para ir ao seguinte elemento da lista de reprodución."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "Prema e manteña premido para saltar cara a atrás no medio actual."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "Prema e manteña premido para saltar cara a adiante no medio actual."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Converter e fluxo"
@@@ -16960,7 -16960,7 +17331,11 @@@ msgstr "Seleccione unha localización p
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17148,8 -17148,8 +17523,13 @@@ msgid "A SDP export is requested, but n
msgstr "Requiriuse unha exportación SDP, mais non se proporcionou un URL."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Personalizado"
@@@ -17251,37 -17251,37 +17631,69 @@@ msgstr "
msgid "Don't ask again"
msgstr "Non preguntar de novo."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "Reprodución de medios co VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Non se encontrou ningún rexistro de erros"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "Reprodución de medios co VLC"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Non se encontrou ningún rexistro de erros"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Continuar"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Non se encontrou ningún indicio de erros anteriores."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Quere eliminar as preferencias de antes?"
+
+#: modules/gui/macosx/intf.m:1937
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Non se encontrou ningún indicio de erros anteriores."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Quere eliminar as preferencias de antes?"
+
+ #: modules/gui/macosx/intf.m:1922
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "We just found an older version of VLC's preferences files."
msgstr ""
"Só se encontrou unha versión anterior dos ficheiros de preferencias do VLC."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Enviar ao lixo e reiniciar o VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Enviar ao lixo e reiniciar o VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "Rexistro de depuración do VLC (%s).rtf"
@@@ -17464,7 -17464,7 +17876,11 @@@ msgid "
msgstr ""
"Esta opción permite que a interface cambie a súa icona en varios momentos."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Bloquear a proporción de aspecto"
@@@ -17597,7 -17597,7 +18013,11 @@@ msgstr "Ocultar o VLC
msgid "Hide Others"
msgstr "Ocultar outros"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Mostrar todo"
@@@ -17682,15 -17682,15 +18102,27 @@@ msgstr "Sincronización da pista
msgid "A→B Loop"
msgstr "Bucle A→B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "SaÃr despois de reproducir"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Paso cara a adiante"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "SaÃr despois de reproducir"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Paso cara a adiante"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Paso cara a atrás"
@@@ -17706,30 -17706,30 +18138,56 @@@ msgstr "Baixar o volume
msgid "Audio Device"
msgstr "Dispositivo de audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Metade do tamaño"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Tamaño normal"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dobre do tamaño"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Axustar á pantalla"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Metade do tamaño"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Tamaño normal"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dobre do tamaño"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Axustar á pantalla"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Flotante na parte superior"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Dispositivo de vÃdeo de pantalla completa"
@@@ -17738,7 -17738,7 +18196,11 @@@
msgid "Post processing"
msgstr "Procesamento posterior"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Engadir un ficheiro de subtÃtulos…"
@@@ -17978,7 -17978,7 +18440,11 @@@ msgid "Play another media synchronously
msgstr "Reproducir outro medio de forma sÃncrona"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Escoller…"
@@@ -18166,7 -18166,7 +18632,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Codificación dos subtÃtulos"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Tamaño do tipo de letra"
@@@ -18395,12 -18395,12 +18865,20 @@@ msgstr "Erro ao gardar os meta datos
msgid "VLC was unable to save the meta data."
msgstr "O VLC non foi capaz de gardar os metadatos."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Preferencias"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Restaurar todo"
@@@ -18582,130 -18582,125 +19060,238 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP Lua"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Pór en pausa o iTunes durante a reprodución co VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Codificación predeterminada"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Mostrar as configuracións"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Codificación predeterminada"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Mostrar as configuracións"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Cor do tipo de letra"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Tipo de letra"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Idiomas dos subtÃtulos"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Idiomas dos subtÃtulos"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Idioma preferido de subtÃtulo"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Activar OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Activar OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Opacidade"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Forzar as negritas"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Forzar as negritas"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Cor do contorno"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Grosor do contorno"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Pantallas negras no modo pantalla completa"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Pantallas negras no modo pantalla completa"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Mostrar"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Módulo de saÃda"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Instantáneas de vÃdeo"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Cartafol"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Formato"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefixo"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Numeración secuencial"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "A última comprobación foi feita o: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "AÃnda non se efectuou unha comprobación."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Módulo de saÃda"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Instantáneas de vÃdeo"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Cartafol"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Formato"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefixo"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Numeración secuencial"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "A última comprobación foi feita o: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "AÃnda non se efectuou unha comprobación."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Latencia máis baixa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Latencia baixa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Latencia alta"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Latencia máis alta"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Restaurar as preferencias"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18728,20 -18723,20 +19314,37 @@@ msgstr "
"\n"
"Está seguro/a de que quere continuar?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Escolla o cartafol no que vai gardar as instantáneas de vÃdeo."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Escoller"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "O directorio ou o nome de ficheiro onde se almacenarán as gravacións."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Escolla o cartafol no que vai gardar as instantáneas de vÃdeo."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Escoller"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "O directorio ou o nome de ficheiro onde se almacenarán as gravacións."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18749,18 -18744,18 +19352,31 @@@ msgstr "
"Prema nas novas teclas para\n"
"«%@»"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "A combinación non é válida"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "A combinación non é válida"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"Por desgraza, estas teclas non se poden empregar como atallos de teclas "
"rápidas."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Esta combinación xa está en uso en «%@»."
@@@ -20853,21 -20848,21 +21469,37 @@@ msgstr "Eliminar o perfil seleccionado
msgid "Create a new profile"
msgstr "Crear un perfil novo"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Crear"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This muxer is not provided directly by VLC: It could be missing."
msgstr ""
"Este multiplexor non é fornecido directamente polo VLC: pode que falte."
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Falta o nome do perfil"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Falta o nome do perfil"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Debe definir un nome para o perfil."
@@@ -24444,23 -24439,23 +25076,43 @@@ msgstr "SaÃda do fluxo de transcodific
msgid "Overlays/Subtitles"
msgstr "Superposicións/subtÃtulos"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Tipo de letra monoespazado"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Familia de tipo de letra para o tipo de letra que quere usar"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Ficheiro de tipo de letra para o tipo de letra que quere usar"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Tamaño do tipo de letra en pÃxeles"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Tipo de letra monoespazado"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Familia de tipo de letra para o tipo de letra que quere usar"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Ficheiro de tipo de letra para o tipo de letra que quere usar"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Tamaño do tipo de letra en pÃxeles"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24470,11 -24465,11 +25122,19 @@@ msgstr "
"vÃdeo. Se está definido como diferente de 0 esta opción ignorará o tamaño do "
"tipo de letra relativo."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Opacidade do texto"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Opacidade do texto"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24482,12 -24477,12 +25142,20 @@@ msgstr "
"A opacidade (inverso de transparencia) do texto que se renderizará no vÃdeo. "
"0 = transparente, 255 = totalmente opaco. "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Cor predeterminada do texto"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24500,12 -24495,12 +25168,20 @@@ msgstr "
"despois verde e despois azul. #000000 = negro, #FF0000 = vermello, #00FF00 = "
"verde, #FFFF00 = amarelo (vermello + verde), #FFFFFF = branco"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Tamaño do tipo de letra relativo"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24515,59 -24510,59 +25191,111 @@@ msgstr "
"renderizarán no vÃdeo. Se se estabelece un tamaño de tipo de letra absoluto, "
"o tamaño relativo ignorarase."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Opacidade do fondo"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Cor de fondo"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Opacidade do contorno"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Opacidade da sombra"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Cor da sombra"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Ãngulo da sombra"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Distancia da sombra"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Opacidade do fondo"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Cor de fondo"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Opacidade do contorno"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Opacidade da sombra"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Cor da sombra"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Ãngulo da sombra"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Distancia da sombra"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Máis pequeno"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Pequeno"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Grande"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Máis grande"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Usar un renderizador YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Usar un renderizador YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24575,23 -24570,23 +25303,43 @@@ msgstr "
"Isto renderiza a fonte usando «paletized YUV». Só precisa esta opción se "
"quere codificar subtÃtulos de DVB"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Delgado"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Groso"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Renderizador de texto"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Tipo de letra Freetype2 para o renderizador"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Delgado"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Groso"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Renderizador de texto"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Tipo de letra Freetype2 para o renderizador"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/gu.po
index 9ab4fcb,90520d4..15289d8
--- a/po/gu.po
+++ b/po/gu.po
@@@ -10,7 -10,7 +10,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-10-23 10:59+0000\n"
"Last-Translator: kartikm <kartik.mistry at gmail.com>\n"
"Language-Team: Gujarati (India) (http://www.transifex.com/projects/p/vlc-"
@@@ -139,7 -139,7 +143,11 @@@ msgstr "વધારાની સેટ
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -446,10 -446,10 +454,17 @@@ msgid "&About
msgstr ""
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -488,17 -488,17 +503,29 @@@ msgid "Save...
msgstr ""
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "બધા રીપીટ કરો"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "રીપીટ ૧ વાર"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -578,7 -578,7 +605,11 @@@ msgstr "ફિલà«àªŸàª°à«àª¸ મહ
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "અકà«àª·àª® કરો"
@@@ -1238,20 -1238,20 +1269,36 @@@ msgstr "ફà«àª°à«‡àª® દર
msgid "Decoded format"
msgstr "ડિકોડેડ ફોરમેટ"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "તમારà«àª‚ ઇનપà«àªŸ ખોલી શકાતà«àª‚ નથી"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "તમારà«àª‚ ઇનપà«àªŸ ખોલી શકાતà«àª‚ નથી"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC MRL '%s' ખોલવા માટે અસમરà«àª¥ છે. વિગતો માટે લોગ જà«àª“."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC ઇનપà«àªŸ ફોરà«àª®à«‡àªŸàª¨à«‡ ઓળખી શકતà«àª‚ નથી"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC ઇનપà«àªŸ ફોરà«àª®à«‡àªŸàª¨à«‡ ઓળખી શકતà«àª‚ નથી"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1660,7 -1660,7 +1707,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1742,7 -1742,7 +1793,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "કઈ નઈ"
@@@ -1766,7 -1766,7 +1821,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "વિડીયો ચાલૠકરો"
@@@ -1956,7 -1956,7 +2015,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "હમેશા ટોપ ઉપર"
@@@ -2007,7 -2007,7 +2070,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2016,7 -2016,7 +2083,11 @@@ msgstr "ડી ઇનટરલેનà«
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "ડી ઇનટરલેનà«àª¸ મોડ"
@@@ -2072,7 -2072,7 +2143,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "વીનà«àª¡à«‹ ડેકોરેસન"
@@@ -2241,7 -2241,7 +2316,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "ફà«àª°à«‡àª® જવા do"
@@@ -2369,12 -2369,12 +2448,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2382,7 -2382,7 +2470,11 @@@ msgid "Default
msgstr "ડીફાલટ"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2685,7 -2685,7 +2777,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3497,7 -3497,7 +3593,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr " જતà«àª‚ કરો"
@@@ -3521,8 -3521,8 +3621,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3602,10 -3602,10 +3707,17 @@@ msgid "Slower (fine)
msgstr "સà«àª²à«‹àªµàª° (fine)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3618,10 -3618,10 +3730,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "ગયà«àª‚"
@@@ -3630,9 -3630,9 +3749,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3867,9 -3867,9 +3992,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "અવાજ બંધ "
@@@ -4283,7 -4283,7 +4414,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "ફોટો પાડો"
@@@ -4480,12 -4480,12 +4615,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "કેનà«àª¸àª²"
@@@ -5241,7 -5241,7 +5385,11 @@@ msgstr "કાપો
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7537,7 -7537,7 +7685,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "સà«àª•à«àª°à«€àª¨"
@@@ -8269,7 -8269,7 +8421,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9380,7 -9380,7 +9536,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9411,7 -9411,7 +9571,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9419,30 -9419,30 +9583,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10608,46 -10608,46 +10796,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "પાછડ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "ગà«àª°à«‡"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "ચાંદી"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "વાઈટ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "મરà«àª¨"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "લાલ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10655,61 -10655,61 +10871,97 @@@ msgid "Fuchsia
msgstr "ફૂસિયા"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "પીળો"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "ઓલીવ"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "લીલો'"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "તિલ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "લીંબà«"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "પરà«àªªàª²"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "બીલà«àª‚"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "બà«àª²à«"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10839,7 -10839,7 +11091,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12626,10 -12626,10 +12882,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "બરાબર"
@@@ -12734,8 -12734,8 +12997,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13071,9 -13071,9 +13339,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "થંàªà«‹"
@@@ -14952,7 -14952,7 +15226,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -15131,7 -15131,7 +15409,11 @@@ msgid "VLC media player Help
msgstr "VLC મીડિયા પà«àª²à«‡àª¯àª° ની મદદ"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "àªàª¨à«àª¡à«‡àª•à«àª·à«"
@@@ -15219,9 -15219,9 +15501,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr ""
@@@ -15362,7 -15362,7 +15650,11 @@@ msgstr "કોઈ ઇનપà«àªŸ નàª
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ".સà«àªŸà«àª°à«€àª® ને વગડો અથવા સà«àª¥àª—િત કરો બà«àª•àª®àª¾àª°à«àª• માટે"
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "ગીત ના કોઈ પણ સમય પર પહોચો"
@@@ -15382,7 -15382,7 +15674,11 @@@ msgstr "
msgid "Backward"
msgstr "પાછા જાઓ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15392,7 -15392,7 +15688,11 @@@ msgstr "
msgid "Forward"
msgstr "આગળ જાઓ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15412,84 -15412,84 +15712,155 @@@ msgstr "સંપૂરà«àª£àª¸à«àª•à
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "જà«àª“/છà«àªªàª¾àªµà«‹ ગીતો ના લીસà«àªŸ ને"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "જà«àª“/છà«àªªàª¾àªµà«‹ ગીતો ના લીસà«àªŸ ને"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "ફરીથી"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "આડà«àª‚ અવળà«àª‚"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "આડà«àª‚ અવળà«àª‚"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "ફૂલ અવાજ"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "ફૂલ અવાજ"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "અસર"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15525,7 -15525,7 +15896,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15708,8 -15708,8 +16083,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -15802,36 -15802,36 +16182,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15983,7 -15983,7 +16395,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "સાપેકà«àª· ગà«àª£à«‹àª¤à«àª¤àª° તાળà«àª‚"
@@@ -16112,7 -16112,7 +16528,11 @@@ msgstr "વી àªàª² સી છà«àªªà
msgid "Hide Others"
msgstr "છà«àª‚પવà«àªµàª¾ બીજો "
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "બધà«àª‚ બતાઓ"
@@@ -16197,15 -16197,15 +16617,27 @@@ msgstr "સà«àª®à«‡àª³ ટà«àª°à«‡àª•
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "પà«àª²à«‡àª¬à«‡àª• પછી બંધ કરો"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "àªàª• સà«àªŸà«‡àªª આગળ"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "પà«àª²à«‡àª¬à«‡àª• પછી બંધ કરો"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "àªàª• સà«àªŸà«‡àªª આગળ"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "àªàª• સà«àªŸà«‡àªª પાછળ"
@@@ -16221,30 -16221,30 +16653,56 @@@ msgstr "અવાજ ઘટાડો
msgid "Audio Device"
msgstr "ધà«àªµàª¨à«€ ઉપકરણ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "અડધી સાઇàª"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "નોરà«àª®àª² સાઇàª"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "બમણી સાઇàª"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "સà«àª•à«àª°à«€àª¨ ને અનà«àª°à«‚પ"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "અડધી સાઇàª"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "નોરà«àª®àª² સાઇàª"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "બમણી સાઇàª"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "સà«àª•à«àª°à«€àª¨ ને અનà«àª°à«‚પ"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "ટોચ પર તરે છે"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "આખા સà«àª•à«àª°à«€àª¨ માટે વીડીઓ ઉપકરણ"
@@@ -16253,7 -16253,7 +16711,11 @@@
msgid "Post processing"
msgstr "પાછળ ની પà«àª°à«‹àª¶à«‡àª¸à«€àª‚ગ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16481,7 -16481,7 +16943,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -16652,7 -16652,7 +17118,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -16881,12 -16881,12 +17351,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17063,129 -17063,125 +17541,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "ફોનà«àªŸ "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "નીર પારદરà«àª¶à«€àª•àª¤àª¾ "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17198,35 -17194,35 +17784,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19187,20 -19183,20 +19803,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22503,45 -22499,45 +23135,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22550,93 -22546,93 +23218,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/he.po
index 604e7e2,e8566a5..81045ae
--- a/po/he.po
+++ b/po/he.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-09 08:20+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -137,7 -137,7 +141,11 @@@ msgstr "הגדרות ומודולי ש×
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -472,10 -472,10 +480,17 @@@ msgid "&About
msgstr "על &×ודות"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -514,17 -514,17 +529,29 @@@ msgid "Save...
msgstr "שמירה..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "חזרה על הכול"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "חזור על ×חד"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -626,7 -626,7 +653,11 @@@ msgstr "הושג מספר ×”×ž×¡× × ×™×
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "× ×˜×¨×•×œ"
@@@ -1325,20 -1325,20 +1356,36 @@@ msgstr "קצב שקופיות
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "×œ× × ×™×ª×Ÿ לפתוח ×ת הקלט שלך"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "×œ× × ×™×ª×Ÿ לפתוח ×ת הקלט שלך"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "הכתובת הב××” ×œ× × ×¤×ª×—×” על ידי VLC '%s'. יש לעיין ביומן לקבלת פרטי×."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "×œ× ×”×™×™×ª×” ב×פשרות VLC לזהות ×ת ×ž×‘× ×” הקלט"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "×œ× ×”×™×™×ª×” ב×פשרות VLC לזהות ×ת ×ž×‘× ×” הקלט"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1751,7 -1751,7 +1798,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1833,7 -1833,7 +1884,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "×©×•× ×“×‘×¨"
@@@ -1859,7 -1859,7 +1914,11 @@@ msgstr "
"זוהי שיטת פלט הוויד×ו שמשמשת ×ת VLC. ×”×ª× ×”×’×•×ª בררת המחדל ×”×™× ×œ×‘×—×•×¨ ×וטומטית "
"×ת השיטה ×”×–×ž×™× ×” הטובה ביותר."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "הפעלת ויד×ו"
@@@ -2058,7 -2058,7 +2117,11 @@@ msgstr "
"VLC ×™× ×¡×” להשתמש בו כבררת מחדל."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "תמיד עליון"
@@@ -2110,7 -2110,7 +2173,11 @@@ msgstr "הסתרת סמן העכבר ו
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2119,7 -2119,7 +2186,11 @@@ msgstr "יישור פסי×
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "מצב יישור פסי×"
@@@ -2177,7 -2177,7 +2248,11 @@@ msgstr "
"×פשרות זו ×ž×•× ×¢×ª ×ת פעולת סוכן × ×™×”×•×œ צריכת החשמל במהלך × ×’×™× ×”, כדי ×œ×”×™×ž× ×¢ ממצב "
"של השהיית המחשב עקב חוסר שימוש."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "קישוטי חלון"
@@@ -2356,7 -2356,7 +2431,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "דילוג על שקופיות"
@@@ -2496,12 -2496,12 +2575,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2509,7 -2509,7 +2597,11 @@@ msgid "Default
msgstr "בררת מחדל"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2817,7 -2817,7 +2909,11 @@@ msgid "You can completely disable the s
msgstr "× ×™×ª×Ÿ ×œ× ×˜×¨×œ לחלוטין ×ת עיבוד ×ª×ªÖ¾×”×ª×ž×•× ×•×ª."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3665,7 -3665,7 +3761,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "התעלמות"
@@@ -3691,8 -3691,8 +3791,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3772,10 -3772,10 +3877,17 @@@ msgid "Slower (fine)
msgstr "×טי יותר (מעודן)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3788,10 -3788,10 +3900,17 @@@ msgid "Select the hotkey to use to ski
msgstr "בחרו ×ת קיצור המקלדת למעבר לפריט ×”×‘× ×‘×¨×©×™×ž×ª ההשמעה."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "הקוד×"
@@@ -3800,9 -3800,9 +3919,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "× × ×œ×‘×—×•×¨ ×ת קיצור המקלדת למעבר לפריט ×”×§×•×“× ×‘×¨×©×™×ž×”."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4037,9 -4037,9 +4162,15 @@@ msgid "Select the key to decrease audi
msgstr "× × ×œ×‘×—×•×¨ ×ת קיצור המקלדת ×œ×”× ×ž×›×ª עצמת הקול."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "השתקה"
@@@ -4453,7 -4453,7 +4584,11 @@@ msgstr "מעבר בין ×”×ª×§× ×™ הש
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "צילו×"
@@@ -4657,12 -4657,12 +4792,21 @@@ msgstr "בהורדה ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "ביטול"
@@@ -5420,7 -5420,7 +5564,11 @@@ msgstr "חיתוך
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "יחס תצוגה"
@@@ -7729,7 -7729,7 +7877,11 @@@ msgstr "קלט מסך
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "מסך"
@@@ -8465,7 -8465,7 +8617,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9576,7 -9576,7 +9732,11 @@@ msgstr "סר××•× ×“ 7.1
msgid "ALSA audio output"
msgstr "פלט שמע ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "פלט השמע × ×›×©×œ"
@@@ -9609,7 -9609,7 +9769,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9617,30 -9617,30 +9781,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10806,46 -10806,46 +10994,74 @@@ msgstr "הצללה
msgid "Outline"
msgstr "מסגרת"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "שחור"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "×פור"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "כסוף"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "לבן"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "×דו×"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10853,61 -10853,61 +11069,97 @@@ msgid "Fuchsia
msgstr "ורוד"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "צהוב"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "זית"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "ירוק"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "ירוק בהיר (ליי×)"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "סגול"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "כחול × ×™×™×‘×™"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "כחול"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11037,7 -11037,7 +11289,11 @@@ msgstr "כתוביות (מתקד×)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12824,10 -12824,10 +13080,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "רגיל"
@@@ -12932,8 -12932,8 +13195,13 @@@ msgid "D-Bus control interface
msgstr "×ž× ×©×§ שליטת D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13271,9 -13271,9 +13539,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "השהה"
@@@ -15152,7 -15152,7 +15426,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15331,7 -15331,7 +15609,11 @@@ msgid "VLC media player Help
msgstr "עזרה ×œ× ×’×Ÿ המדיה VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "××™× ×“×§×¡"
@@@ -15419,9 -15419,9 +15701,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "שמירה"
@@@ -15562,7 -15562,7 +15850,11 @@@ msgstr "×œ× × ×ž×¦× ×§×œ×˜
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15582,7 -15582,7 +15874,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15592,7 -15592,7 +15888,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15612,84 -15612,84 +15912,155 @@@ msgstr "החלפה בין מסך מל×
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "הצגה/הסתרה של רשימת ההשמעה"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "הצגה/הסתרה של רשימת ההשמעה"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "יש ללחוץ על השתקה כדי להשמיע ×ו להשתיק ×ת השמע."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "עצמת השמע המל××”"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "יש ללחוץ על השתקה כדי להשמיע ×ו להשתיק ×ת השמע."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "עצמת השמע המל××”"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "×פקטי×"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15725,7 -15725,7 +16096,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15908,8 -15908,8 +16283,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "הת×מה ×ישית"
@@@ -16002,36 -16002,36 +16382,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "×œ× × ×ž×¦× ×“×•×— קריסות"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "×œ× × ×ž×¦× ×“×•×— קריסות"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "המשך"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "×”×× ×œ×”×¡×™×¨ ×ת ההעדפות ×”×™×©× ×•×ª?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "×”×× ×œ×”×¡×™×¨ ×ת ההעדפות ×”×™×©× ×•×ª?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16187,7 -16187,7 +16599,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16316,7 -16316,7 +16732,11 @@@ msgstr "הסתרת VLC
msgid "Hide Others"
msgstr "הסתרת ×חרי×"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "הצגת הכול"
@@@ -16401,15 -16401,15 +16821,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "יצי××” ל×חר ×”× ×’×™× ×”"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "קפיצה קדימה"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "יצי××” ל×חר ×”× ×’×™× ×”"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "קפיצה קדימה"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "קפיצה ×חורה"
@@@ -16425,30 -16425,30 +16857,56 @@@ msgstr "×”× ×ž×›×ª עצמת השמע
msgid "Audio Device"
msgstr "התקן שמע"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "חצי גודל"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "גודל רגיל"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "גודל כפול"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "הת×× ×œ×ž×¡×š"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "חצי גודל"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "גודל רגיל"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "גודל כפול"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "הת×× ×œ×ž×¡×š"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "התקן ויד×ו מסך מל×"
@@@ -16457,7 -16457,7 +16915,11 @@@
msgid "Post processing"
msgstr "עיבוד מ×וחר"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16685,7 -16685,7 +17147,11 @@@ msgid "Play another media synchronously
msgstr "× ×’×™× ×ª מדיה ×חרת בו ×–×ž× ×™×ª"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "בחירה..."
@@@ -16856,7 -16856,7 +17322,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "גודל גופן"
@@@ -17085,12 -17085,12 +17555,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "העדפות"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "×יפוס הכול"
@@@ -17267,129 -17267,125 +17745,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "קידוד בררת מחדל"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "הגדרות תצוגה"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "קידוד בררת מחדל"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "הגדרות תצוגה"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "צבע הגופן"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "גופן"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "הפעלת חיווי על גבי המסך"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "הפעלת חיווי על גבי המסך"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "×טימות"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "צבע קו המת×ר"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "עובי קו המת×ר"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "×ž×¡×›×™× ×©×—×•×¨×™× ×‘×ž×¦×‘ מסך מל×"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "×ž×¡×›×™× ×©×—×•×¨×™× ×‘×ž×¦×‘ מסך מל×"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "תצוגה"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "מודול פלט"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "צילומי ויד×ו"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "תיקייה"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "×ž×‘× ×”"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "קידומת"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "מספור רציף"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "הבדיקה ×”××—×¨×•× ×”: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "×œ× ×”×ª×‘×¦×¢×” בדיקה עדיין"
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "מודול פלט"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "צילומי ויד×ו"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "תיקייה"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "×ž×‘× ×”"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "קידומת"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "מספור רציף"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "הבדיקה ×”××—×¨×•× ×”: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "×œ× ×”×ª×‘×¦×¢×” בדיקה עדיין"
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "×יפוס ההעדפות"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17402,35 -17398,35 +17988,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "× × ×œ×‘×—×•×¨ ×ת התיקייה ש×ליה יישמרו צילומי הוויד×ו שלך."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "בחרו"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "× × ×œ×‘×—×•×¨ ×ת התיקייה ש×ליה יישמרו צילומי הוויד×ו שלך."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "בחרו"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "צירוף בלתי חוקי"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "צירוף בלתי חוקי"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19381,20 -19377,20 +19997,36 @@@ msgstr "מחיקת הפרופיל ×”× ×
msgid "Create a new profile"
msgstr "יצירת פרופיל זה"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "יצירה"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " ×©× ×”×¤×¨×•×¤×™×œ חסר"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " ×©× ×”×¤×¨×•×¤×™×œ חסר"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "עליך להגדיר ×©× ×¢×‘×•×¨ הפרופיל"
@@@ -22716,45 -22712,45 +23348,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "גודל הגופן בפיקסלי×"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "גודל הגופן בפיקסלי×"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "צבע בררת המחדל של הטקסט"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22763,93 -22759,93 +23431,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "קטן יותר"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "קטן"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "גדול"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "גדול יותר"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "שימוש ×‘×ž×¤×¢× ×— YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "שימוש ×‘×ž×¤×¢× ×— YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/hi.po
index 564ac61,4ce5342..6b89487
--- a/po/hi.po
+++ b/po/hi.po
@@@ -17,7 -17,7 +17,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-10-09 07:25+0000\n"
"Last-Translator: Shantanu Sarkar <shantanusarkar.me at gmail.com>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/vlc-trans/language/"
@@@ -146,7 -146,7 +150,11 @@@ msgstr "पà¥à¤°à¤•à¥€à¤°à¥à¤£ ऑड
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -484,10 -484,10 +492,17 @@@ msgid "&About
msgstr "& के बारे में"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -526,17 -526,17 +541,29 @@@ msgid "Save...
msgstr "सहेजें..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "सà¤à¥€ को दोहराà¤à¤"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "à¤à¤• दोहराà¤à¤"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -616,7 -616,7 +643,11 @@@ msgstr "फिलà¥à¤Ÿà¤° की अà¤
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "अकà¥à¤·à¤® करें"
@@@ -1280,20 -1280,20 +1311,36 @@@ msgstr "फ़à¥à¤°à¥‡à¤® दर
msgid "Decoded format"
msgstr "डीकोड पà¥à¤°à¤¾à¤°à¥‚प"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "आपका निवेश नही खà¥à¤² सकता है!"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "आपका निवेश नही खà¥à¤² सकता है!"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC MRL खोलने में असमरà¥à¤¥ है '%s'. जानकारी के लिठलॉग की जाà¤à¤š करें."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC आपके निवेश संरूप को नही पहचान सकता है!"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC आपके निवेश संरूप को नही पहचान सकता है!"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1716,7 -1716,7 +1763,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1801,7 -1801,7 +1852,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "कोई नहीं"
@@@ -1831,7 -1831,7 +1886,11 @@@ msgstr "
"वीà¤à¤²à¤¸à¥€ दà¥à¤µà¤¾à¤°à¤¾ इसà¥à¤¤à¥‡à¤®à¤¾à¤² किया वीडियो आउटपà¥à¤Ÿ विधि है. डिफ़ॉलà¥à¤Ÿ वà¥à¤¯à¤µà¤¹à¤¾à¤° को सà¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ रूप से "
"उपलबà¥à¤§ सरà¥à¤µà¥‹à¤¤à¥à¤¤à¤® विधि का चयन करने के लिठहै."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -2027,7 -2027,7 +2086,11 @@@ msgstr "
"वीà¤à¤²à¤¸à¥€ डिफ़ॉलà¥à¤Ÿ रूप से इसका इसà¥à¤¤à¥‡à¤®à¤¾à¤² करने की कोशिश करेंगे."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "सदैव शीरà¥à¤· पर"
@@@ -2079,7 -2079,7 +2142,11 @@@ msgstr "माउस करà¥à¤¸à¤° à¤
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2088,7 -2088,7 +2155,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2146,7 -2146,7 +2217,11 @@@ msgstr "
"कà¥à¤¯à¥‹à¤‚कि निषà¥à¤•à¥à¤°à¤¿à¤¯à¤¤à¤¾ से निलंबित किया जा रहा है कंपà¥à¤¯à¥‚टर से बचने के लिà¤, किसी à¤à¥€ पà¥à¤²à¥‡à¤¬à¥ˆà¤• के "
"दौरान ऊरà¥à¤œà¤¾ पà¥à¤°à¤¬à¤‚धन डेमॉन को रोकता है."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2315,7 -2315,7 +2390,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2443,12 -2443,12 +2522,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2456,7 -2456,7 +2544,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2759,7 -2759,7 +2851,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3571,7 -3571,7 +3667,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3595,8 -3595,8 +3695,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3676,10 -3676,10 +3781,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3692,10 -3692,10 +3804,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr ""
@@@ -3704,9 -3704,9 +3823,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3941,9 -3941,9 +4066,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4357,7 -4357,7 +4488,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4554,12 -4554,12 +4689,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr ""
@@@ -5315,7 -5315,7 +5459,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7611,7 -7611,7 +7759,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8343,7 -8343,7 +8495,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9454,7 -9454,7 +9610,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9485,7 -9485,7 +9645,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9493,30 -9493,30 +9657,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10682,46 -10682,46 +10870,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10729,61 -10729,61 +10945,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10913,7 -10913,7 +11165,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12700,10 -12700,10 +12956,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -12808,8 -12808,8 +13071,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13145,9 -13145,9 +13413,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -15026,7 -15026,7 +15300,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15205,7 -15205,7 +15483,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15293,9 -15293,9 +15575,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr ""
@@@ -15434,7 -15434,7 +15722,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15454,7 -15454,7 +15746,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15464,7 -15464,7 +15760,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15484,84 -15484,84 +15784,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15597,7 -15597,7 +15968,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15780,8 -15780,8 +16155,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -15874,36 -15874,36 +16254,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16055,7 -16055,7 +16467,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16184,7 -16184,7 +16600,11 @@@ msgstr "
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr ""
@@@ -16269,15 -16269,15 +16689,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16293,30 -16293,30 +16725,56 @@@ msgstr "
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16325,7 -16325,7 +16783,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16553,7 -16553,7 +17015,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -16724,7 -16724,7 +17190,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -16953,12 -16953,12 +17423,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17135,129 -17135,125 +17613,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "फ़ॉनà¥à¤Ÿ रंग"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "शकà¥à¤¤à¤¿ मोटा"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "शकà¥à¤¤à¤¿ मोटा"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "रंग को रेखांकित करें"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "मोटाई को रेखांकित करें"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17270,35 -17266,35 +17856,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19236,20 -19232,20 +19852,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22552,45 -22548,45 +23184,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr "आचà¥à¤›à¤¾à¤¦à¤¨ /उपशीरà¥à¤·à¤•"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "फ़ॉनà¥à¤Ÿ के लिठफ़ॉनà¥à¤Ÿ परिवार जिसे आप उपयोग करना चाहते हैंफ़ॉनà¥à¤Ÿ परिवार"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "फ़ॉनà¥à¤Ÿ के लिठफ़ॉनà¥à¤Ÿ फ़ाइल जिसे आप उपयोग करना चाहते हैं"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "पिकà¥à¤¸à¤² में फ़ॉनà¥à¤Ÿ आकार"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "फ़ॉनà¥à¤Ÿ के लिठफ़ॉनà¥à¤Ÿ परिवार जिसे आप उपयोग करना चाहते हैंफ़ॉनà¥à¤Ÿ परिवार"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "फ़ॉनà¥à¤Ÿ के लिठफ़ॉनà¥à¤Ÿ फ़ाइल जिसे आप उपयोग करना चाहते हैं"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "पिकà¥à¤¸à¤² में फ़ॉनà¥à¤Ÿ आकार"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "पाठकी असà¥à¤ªà¤·à¥à¤Ÿà¤¤à¤¾"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "पाठकी असà¥à¤ªà¤·à¥à¤Ÿà¤¤à¤¾"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "पाठका मूलà¤à¥‚त रंग"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22599,93 -22595,93 +23267,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "सापेकà¥à¤· फ़ॉनà¥à¤Ÿ आकार"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "पृषà¥à¤ à¤à¥‚मि असà¥à¤ªà¤·à¥à¤Ÿà¤¤à¤¾"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "पृषà¥à¤ à¤à¥‚मि रंग"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "असà¥à¤ªà¤·à¥à¤Ÿà¤¤à¤¾ को रेखांकित करें"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "परछाई की असà¥à¤ªà¤·à¥à¤Ÿà¤¤à¤¾"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "परछाई रंग"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "परछाई का कोण"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "परछाई की दूरी"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "पृषà¥à¤ à¤à¥‚मि असà¥à¤ªà¤·à¥à¤Ÿà¤¤à¤¾"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "पृषà¥à¤ à¤à¥‚मि रंग"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "असà¥à¤ªà¤·à¥à¤Ÿà¤¤à¤¾ को रेखांकित करें"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "परछाई की असà¥à¤ªà¤·à¥à¤Ÿà¤¤à¤¾"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "परछाई रंग"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "परछाई का कोण"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "परछाई की दूरी"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "बहà¥à¤¤ छोटा"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "छोटा"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "विशाल"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "बड़ा"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "YUVP पà¥à¤°à¤¤à¤¿à¤ªà¤¾à¤¦à¤• का उपयोग करें"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "YUVP पà¥à¤°à¤¤à¤¿à¤ªà¤¾à¤¦à¤• का उपयोग करें"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "पतला"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "गाढ़ा"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "पाठपà¥à¤°à¤¤à¤¿à¤ªà¤¾à¤¦à¤•"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 फ़ॉनà¥à¤Ÿ पà¥à¤°à¤¤à¤¿à¤ªà¤¾à¤¦à¤•"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "पतला"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "गाढ़ा"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "पाठपà¥à¤°à¤¤à¤¿à¤ªà¤¾à¤¦à¤•"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 फ़ॉनà¥à¤Ÿ पà¥à¤°à¤¤à¤¿à¤ªà¤¾à¤¦à¤•"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/hr.po
index 0be0530,4436740..561bd33
--- a/po/hr.po
+++ b/po/hr.po
@@@ -7,8 -7,8 +7,13 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc 1.0.0\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-12-05 18:52+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-09-08 20:10+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Last-Translator: Dominko Aždajić <domazd at mail.ru>\n"
"Language-Team: Croatian\n"
"Language: hr\n"
@@@ -138,7 -138,7 +143,11 @@@ msgstr "Razne postavke zvuka i moduli.
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -237,6 -237,7 +246,10 @@@ msgid "Settings for the audio-only deco
msgstr "Postavke dekodera i kodera samo za zvuka."
#: include/vlc_config_cat.h:117
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Subtitle codecs"
msgstr "Kodeki podnaslova"
@@@ -491,10 -492,10 +504,17 @@@ msgid "&About
msgstr "&O programu..."
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -533,17 -534,17 +553,29 @@@ msgid "Save...
msgstr "Spremi..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Ponovi sve"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Ponovi jednu"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -651,7 -652,7 +683,11 @@@ msgstr "Dosegnut je maksimalni broj fil
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "IskljuÄi"
@@@ -686,8 -687,9 +722,14 @@@ msgstr "PretpojaÄanje ponovnog izvoÄ‘e
#: src/audio_output/output.c:377 modules/gui/macosx/MainMenu.m:383
#: modules/gui/macosx/MainMenu.m:384
++<<<<<<< HEAD
+msgid "Stereo audio mode"
+msgstr "Stereo naÄin zvuka"
++=======
+ #, fuzzy
+ msgid "Stereo audio mode"
+ msgstr "Stereo naÄin"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/audio_output/output.c:412 src/libvlc-module.c:189
msgid "Dolby Surround"
@@@ -902,8 -904,9 +944,14 @@@ msgstr "
"Za nastaviti stisnite tipku RETURN...\n"
#: src/config/keys.c:56
++<<<<<<< HEAD
+msgid "Backspace"
+msgstr "Backspace"
++=======
+ #, fuzzy
+ msgid "Backspace"
+ msgstr "Natrag"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:57
#, fuzzy
@@@ -1387,20 -1390,20 +1435,36 @@@ msgstr "Stopa protoka okvira
msgid "Decoded format"
msgstr "Oblik dekodiranog"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Vaš ulazni sadržaj ne može biti otvoren."
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Vaš ulazni sadržaj ne može biti otvoren."
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC ne može otvoriti MRL '%s'. Za pojedinosti pogledajte zapisnik."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC ne može prepoznati ulazni format."
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC ne može prepoznati ulazni format."
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1507,6 -1510,7 +1571,10 @@@ msgid "Audio Track
msgstr "Zapis zvuka"
#: src/input/var.c:210
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Subtitle Track"
msgstr "Zapis podnaslova"
@@@ -1746,12 -1750,14 +1814,23 @@@ msgstr "
"opterećenja."
#: src/libvlc-module.c:138
++<<<<<<< HEAD
+msgid "Audio gain"
+msgstr "Prirast zvuka"
+
+#: src/libvlc-module.c:140
+msgid "This linear gain will be applied to outputted audio."
+msgstr "Na izlazeći zvuk će biti priijenjen linearni prirast."
++=======
+ #, fuzzy
+ msgid "Audio gain"
+ msgstr "Automatsko pojaÄavanje"
+
+ #: src/libvlc-module.c:140
+ #, fuzzy
+ msgid "This linear gain will be applied to outputted audio."
+ msgstr "Ovo je multiplekser koji će biti korišten za zvuk."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:142
msgid "Audio output volume step"
@@@ -1773,8 -1779,6 +1852,11 @@@ msgstr "Zadana jaÄina glasnoće zvuka
msgid ""
"The volume can be recorded and automatically restored next time VLC is used."
msgstr ""
++<<<<<<< HEAD
+"Glasnoća može biti snimljena i automatski obnovljena pri slijedećoj uporabi "
+"VLC-a."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:152
msgid "Audio desynchronization compensation"
@@@ -1842,7 -1846,7 +1924,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1929,7 -1933,7 +2015,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Ništa"
@@@ -1960,7 -1964,7 +2050,11 @@@ msgstr "
"To je postupak koji VLC koristi za izlaz video slike. Zadano ponašanje je "
"automatski odabrati najbolju raspoloživu metodu."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Omogući prikaz video slike"
@@@ -2171,7 -2175,7 +2265,11 @@@ msgstr "
"koristiti tu mogućnost."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Uvijek u prvom planu"
@@@ -2231,7 -2235,7 +2329,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2240,7 -2244,7 +2342,11 @@@ msgstr "Raspletanje
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "NaÄin raspletanja"
@@@ -2298,7 -2302,7 +2404,11 @@@ msgstr "
"Tijekom izvoÄ‘enja sprijeÄava službu (daemon) za upravljanje energijom, kako "
"bi se izbjeglo da raÄunalo uslijed nedjelatnosti bude obustavljeno."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Ukrasi okna"
@@@ -2503,7 -2507,7 +2613,11 @@@ msgstr "
"Äetvrtaste piksele (1:1). Ukoliko imate zaslon omjera 16:9, možda ćete to "
"morati izmijeniti u 4:3 kako biste zadržali omjere."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "PreskoÄi okvire"
@@@ -2653,12 -2657,12 +2767,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2666,7 -2670,7 +2789,11 @@@ msgid "Default
msgstr "Zadano"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -3019,7 -3023,7 +3146,11 @@@ msgid "You can completely disable the s
msgstr "Ovdje možete potpuno onemogućiti obrađivanje podslîka."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3300,8 -3304,9 +3431,14 @@@ msgid "
"This file contains an optional CRL to prevent remote clients from using "
"revoked certificates in TLS sessions."
msgstr ""
++<<<<<<< HEAD
+"Ta datoteka sadrži opcionalni popis opozvanih HTTP/TLS potvrda, kako bi se "
+"sprijeÄilo da klijenti uporabe opozvane potvrde tijekom TLS-zasjedanja."
++=======
+ "Ta datoteka sadrži opcionalni CRL (potvrde za opoziv HTTP-a/TLS-a) da bi "
+ "zaštitila klijente od uporabe opozvanih potvrda tijekom jednog zasjedanja "
+ "TLS-a."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:845
msgid "SOCKS server"
@@@ -3960,8 -3965,6 +4097,11 @@@ msgid "
"If pending audio communication is detected, playback will be paused "
"automatically."
msgstr ""
++<<<<<<< HEAD
+"Ako se otkrije audio komunikacija u tijeku, automatski će se napraviti "
+"stanka u izvođenju."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1166
msgid "Use media library"
@@@ -4003,7 -4006,7 +4143,11 @@@ msgstr "
"Ove postavke su VLC-ova vezivanja tipki, poznata i kao \"tipkovniÄku preÄicu"
"\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Zanemari"
@@@ -4029,8 -4032,8 +4173,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4119,10 -4122,10 +4268,17 @@@ msgid "Slower (fine)
msgstr "Sporije (istanÄano)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4137,10 -4140,10 +4293,17 @@@ msgstr "
"popisa za izvođenje."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Prethodno"
@@@ -4151,9 -4154,9 +4314,15 @@@ msgstr "
"Odabir tipkovniÄke preÄice koja će se koristiti za preskakanje na prethodnu "
"stavku popisa za izvođenje."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4393,9 -4396,9 +4562,15 @@@ msgid "Select the key to decrease audi
msgstr "Odabir tipke za smanjivanje glasnoće zvuka."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "NeÄujno"
@@@ -4421,7 -4424,7 +4596,11 @@@ msgstr "Odabir tipkovniÄke preÄice z
#: src/libvlc-module.c:1302
msgid "Subtitle sync / bookmark audio timestamp"
++<<<<<<< HEAD
+msgstr "Vremenska oznaka usklaÄ‘ivanja podnaslova/straniÄnika zvuka"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1303
#, fuzzy
@@@ -4430,7 -4433,7 +4609,11 @@@ msgstr "Odabir tipke za pomjeranje podn
#: src/libvlc-module.c:1304
msgid "Subtitle sync / bookmark subtitle timestamp"
++<<<<<<< HEAD
+msgstr "Vremenska oznaka usklaÄ‘ivanja podnaslova/straniÄnika podnaslova"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1305
#, fuzzy
@@@ -4440,7 -4443,6 +4623,10 @@@ msgstr "Odabir tipke za pomjeranje podn
#: src/libvlc-module.c:1306
msgid "Subtitle sync / synchronize audio & subtitle timestamps"
msgstr ""
++<<<<<<< HEAD
+"Vremenska oznaka usklađivanja podnaslova/usklađivanja zvuka i podnaslova"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1307
#, fuzzy
@@@ -4660,7 -4662,7 +4846,11 @@@ msgstr "Kruži kroz raspoložive zapis
#: src/libvlc-module.c:1368
msgid "Cycle previous program Service ID"
++<<<<<<< HEAD
+msgstr "Slijedi prethodni servisni ID programa"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1369
#, fuzzy
@@@ -4758,8 -4760,9 +4948,14 @@@ msgid "Record access filter start/stop.
msgstr "Pokreće/zaustavlja pristupni filtar snimanja."
#: src/libvlc-module.c:1395
++<<<<<<< HEAD
+msgid "Normal/Loop/Repeat"
+msgstr "Normalno/petlja/ponavljanje"
++=======
+ #, fuzzy
+ msgid "Normal/Loop/Repeat"
+ msgstr "UobiÄajeno/opetuj/petlja"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1396
#, fuzzy
@@@ -4824,7 -4827,7 +5020,11 @@@ msgstr "Kruženje kroz raspoložive ure
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Snimka stanja"
@@@ -5030,12 -5033,12 +5230,21 @@@ msgstr "Preuzimanje...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Odustani"
@@@ -5801,7 -5804,7 +6010,11 @@@ msgstr "Obrezivanje
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "BoÄni omjer"
@@@ -5919,10 -5922,12 +6132,18 @@@ msgid "Blu-ray
msgstr "Blu-ray"
#: modules/access/bluray.c:70
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Blu-ray Disc support (libbluray)"
msgstr "Podrška diskova Blu-Ray (libbluray)"
#: modules/access/bluray.c:263
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This Blu-ray Disc needs a library for AACS decoding, and your system does "
"not have it."
@@@ -5931,6 -5936,7 +6152,10 @@@ msgstr "
"nema."
#: modules/access/bluray.c:272
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Blu-ray Disc is corrupted."
msgstr "Blu-Ray disk je oštećen."
@@@ -5963,6 -5969,7 +6188,10 @@@ msgstr "
"kljuÄevi?"
#: modules/access/bluray.c:303
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This Blu-ray Disc needs a library for BD+ decoding, and your system does not "
"have it."
@@@ -5976,6 -5983,7 +6205,10 @@@ msgstr "
"konfiguracija?"
#: modules/access/bluray.c:370
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Blu-ray error"
msgstr "Pogreška Blu-Raya"
@@@ -6018,8 -6026,9 +6251,14 @@@ msgid "DC1394
msgstr "DC1394"
#: modules/access/dc1394.c:52
++<<<<<<< HEAD
+msgid "IIDC Digital Camera (FireWire) input"
+msgstr "Ulaz IIDC za digitalnu kameru (FireWire)"
++=======
+ #, fuzzy
+ msgid "IIDC Digital Camera (FireWire) input"
+ msgstr "Digitalni video ulaz (Firewire/IEEE 1394)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/decklink.cpp:44
msgid "Input card to use"
@@@ -6146,8 -6155,9 +6385,14 @@@ msgid "Blackmagic DeckLink SDI input
msgstr "Ulaz SDI za Blackmagic DeckLink"
#: modules/access/decklink.cpp:118 modules/video_output/decklink.cpp:99
++<<<<<<< HEAD
+msgid "10 bits"
+msgstr "10 bita"
++=======
+ #, fuzzy
+ msgid "10 bits"
+ msgstr "15 bita"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:92
msgid "Cable"
@@@ -6412,6 -6422,7 +6657,10 @@@ msgid "No video or audio device selecte
msgstr "Nije odabran ni jedan uređaj zvuka ili slike."
#: modules/access/dshow/dshow.cpp:602
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "VLC cannot open ANY capture device. Check the error log for details."
msgstr ""
"VLC ne može otvoriti NIJEDAN uređaj za snimanje. Za pojedinosti pregledajte "
@@@ -7017,12 -7028,14 +7266,23 @@@ msgstr "
"raširi: svi podimenici su rašireni.\n"
#: modules/access/fs.c:42
++<<<<<<< HEAD
+msgid "Collapse"
+msgstr "Sažmi"
+
+#: modules/access/fs.c:42
+msgid "Expand"
+msgstr "Raširi"
++=======
+ #, fuzzy
+ msgid "Collapse"
+ msgstr "sažmi"
+
+ #: modules/access/fs.c:42
+ #, fuzzy
+ msgid "Expand"
+ msgstr "raširi"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/fs.c:44
msgid "Ignored extensions"
@@@ -7051,12 -7064,11 +7311,20 @@@ msgid "
"Sort items in a natural order (for example: 1.ogg 2.ogg 10.ogg). This method "
"does not take the current language's collation rules into account."
msgstr ""
++<<<<<<< HEAD
+"Razvrstaj stavke prema prirodnom redoslijedu (primjerice: 1.ogg 2.ogg 10."
+"ogg). Ta metoda ne uzima u obzir abecedni slijed dotiÄnog jezika."
+
+#: modules/access/fs.c:55
+msgid "Do not sort the items."
+msgstr "Ne razvstavaj stavke."
++=======
+
+ #: modules/access/fs.c:55
+ #, fuzzy
+ msgid "Do not sort the items."
+ msgstr "Vrsta fonta koja će se koristiti za naslove"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/fs.c:57
#, fuzzy
@@@ -7066,7 -7078,6 +7334,10 @@@ msgstr "Kazalo imenika
#: modules/access/fs.c:59
msgid "Define the sort algorithm used when adding items from a directory."
msgstr ""
++<<<<<<< HEAD
+"Odredi vrstu algoritma koji će se koristiti pri dodavanju stavki iz imenika."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/fs.c:62
msgid "File input"
@@@ -7593,12 -7604,13 +7864,22 @@@ msgid "Please enter a valid login name
msgstr "Unesite valjano prijavno ime i zaporku."
#: modules/access/live555.cpp:655
++<<<<<<< HEAD
+msgid "RTSP connection failed"
+msgstr "Povezivanje RTSP-a nije uspjelo"
+
+#: modules/access/live555.cpp:656
+msgid "Access to the stream is denied by the server configuration."
+msgstr "Pristup strujanju je uskraćen zbog konfiguracije poslužitelja."
++=======
+ #, fuzzy
+ msgid "RTSP connection failed"
+ msgstr "Povezivanje nije uspjelo"
+
+ #: modules/access/live555.cpp:656
+ msgid "Access to the stream is denied by the server configuration."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/mms/mms.c:49
msgid "Force selection of all streams"
@@@ -7815,7 -7827,7 +8096,11 @@@ msgstr "Broj segmenata za obuhvatiti u
#: modules/access_output/livehttp.c:79
msgid "Allow cache"
++<<<<<<< HEAD
+msgstr "Dopusti predmemoriju"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/livehttp.c:80
msgid "Add EXT-X-ALLOW-CACHE:NO directive in playlist-file if this is disabled"
@@@ -7863,7 -7875,7 +8148,11 @@@ msgstr "Datoteka osobnog kljuÄa
#: modules/access_output/livehttp.c:97
msgid "File containing the 16 bytes encryption key"
++<<<<<<< HEAD
+msgstr "Datoteka sadrži 16-bitni kljuÄ za deÅ¡ifriranje"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/livehttp.c:99
msgid "File where vlc reads key-uri and keyfile-location"
@@@ -8099,7 -8111,7 +8388,11 @@@ msgstr "RTP
#: modules/access/rdp.c:69
msgid "RDP Remote Desktop"
++<<<<<<< HEAD
+msgstr "Udaljena radna površina RDP"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/rtp/rtp.c:45
msgid "RTCP (local) port"
@@@ -8317,7 -8329,7 +8610,11 @@@ msgstr "Zaslonski ulaz
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Zaslon"
@@@ -9087,7 -9099,7 +9384,11 @@@ msgstr "Maks. jaÄina #
msgid "Volume Set"
msgstr "Postavljena jaÄina"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9283,7 -9295,7 +9584,11 @@@ msgstr "Osobni kljuÄ za ovjeravanje po
#: modules/access/vnc.c:58
msgid "RGB chroma (RV32, RV24, RV16, RGB2)"
++<<<<<<< HEAD
+msgstr "RGB zasićenost bojom (RV32, RV24, RV16, RGB2)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:61
#, fuzzy
@@@ -10096,7 -10108,7 +10401,11 @@@ msgstr "Funkcija otkljuÄavanja
#: modules/audio_filter/resampler/src.c:50
msgid "Zero Order Hold (fastest)"
++<<<<<<< HEAD
+msgstr "Nulta mapa za Äuvanje (najbrže)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/resampler/src.c:50
msgid "Linear (fastest)"
@@@ -10210,7 -10222,7 +10519,11 @@@ msgstr "
#: modules/audio_filter/stereo_widen.c:66
msgid "Crossfeed"
++<<<<<<< HEAD
+msgstr "Unakrsni sažetci"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/stereo_widen.c:67
msgid ""
@@@ -10218,9 -10230,6 +10531,12 @@@
"the mono. If the value is 1 it will cancel all the signal common to both "
"channels."
msgstr ""
++<<<<<<< HEAD
+"Ukršta napajanje s lijeva na desno s obrnutom fazom. To pomaže pri "
+"potiskivanju mono zvuka. Ukoliko je vrijednost 1 onda će biti poništeni svi "
+"signali zajedniÄki obadvoma kanalima."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/stereo_widen.c:70
#, fuzzy
@@@ -10233,8 -10242,9 +10549,14 @@@ msgid "Level of input signal of origina
msgstr "Razina ulaznog signala"
#: modules/audio_filter/stereo_widen.c:77
++<<<<<<< HEAD
+msgid "Stereo Enhancer"
+msgstr "Stereo poboljÅ¡ivaÄ"
++=======
+ #, fuzzy
+ msgid "Stereo Enhancer"
+ msgstr "Stereo naÄin"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/stereo_widen.c:78
msgid "Simple stereo widening effect"
@@@ -10293,14 -10303,15 +10615,24 @@@ msgid "Surround 5.1
msgstr "Kružno ozvuÄenje 5.1"
#: modules/audio_output/alsa.c:77
++<<<<<<< HEAD
+msgid "Surround 7.1"
+msgstr "Surround 7.1"
++=======
+ #, fuzzy
+ msgid "Surround 7.1"
+ msgstr "Surround"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/alsa.c:82
msgid "ALSA audio output"
msgstr "Izlaz zvuka ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Izlaz zvuka nije uspio"
@@@ -10334,28 -10345,30 +10666,54 @@@ msgstr "Zvukovni red Äekanja izlaza zv
msgid "Android AudioTrack audio output"
msgstr "Plošni video izlaz za Android"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
+msgid "AudioUnit output for iOS"
+msgstr "Izlaz zvukovne jedinice za iOS"
+
+#: modules/audio_output/auhal.c:69
+msgid "Last audio device"
+msgstr "Posljednji uređaj zvuka"
+
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Izlaz zvukovne jedinice HAL"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/audiounit_ios.c:89
+ #, fuzzy
+ msgid "AudioUnit output for iOS"
+ msgstr "Izlaz zvukovne jedinice HAL"
+
+ #: modules/audio_output/auhal.c:69
+ #, fuzzy
+ msgid "Last audio device"
+ msgstr "Uređaj zvuka"
+
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Izlaz zvukovne jedinice HAL"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr "Odabrani izlaz zvuka je u iskljuÄivoj uporabi jednim drugim programom."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Uređaj zvuka nije prilagođen"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Uređaj zvuka nije prilagođen"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
@@@ -10365,12 -10378,12 +10723,20 @@@ msgstr "
"Midi\" iz odsjeka /Applikacije/Uslužni programi. NaÄin stereo se poÄinje "
"koristiti odmah sada."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Odaberite Vaš uređaj za izlaz zvuka"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (kodirani izlaz)"
@@@ -11498,8 -11511,9 +11864,14 @@@ msgid "AAC extension
msgstr "Proširenje AAC-a"
#: modules/codec/fdkaac.c:67
++<<<<<<< HEAD
+msgid "Encoder Profile"
+msgstr "Profil kôdera"
++=======
+ #, fuzzy
+ msgid "Encoder Profile"
+ msgstr "Nametni profil"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fdkaac.c:68
msgid "Encoder Algorithm to use"
@@@ -11515,13 -11529,13 +11887,22 @@@ msgid "This is an optional feature onl
msgstr "To je svojstvo moguće samo za profil AAC-ELD"
#: modules/codec/fdkaac.c:73
++<<<<<<< HEAD
+msgid "VBR Quality"
+msgstr "Kakvoća VBR-a"
++=======
+ #, fuzzy
+ msgid "VBR Quality"
+ msgstr "Kakvoća"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fdkaac.c:74
msgid "Quality of the VBR Encoding (0=cbr, 1-5 constant quality vbr, 5 is best"
msgstr ""
++<<<<<<< HEAD
+"Kakvoća kodiranja VBR-om (0=cbr, 1-5 konstantna kakvoća vbr-a, 5 je najbolja"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fdkaac.c:76
msgid "Enable afterburner library"
@@@ -11568,8 -11582,9 +11949,14 @@@ msgid "FDKAAC
msgstr "FDKAAC"
#: modules/codec/fdkaac.c:101
++<<<<<<< HEAD
+msgid "FDK-AAC Audio encoder"
+msgstr "Kôder zvuka FDK-AAC"
++=======
+ #, fuzzy
+ msgid "FDK-AAC Audio encoder"
+ msgstr "Kôder zvuka"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/flac.c:112
msgid "Flac audio decoder"
@@@ -11642,12 -11657,14 +12029,23 @@@ msgstr "
"(Ulaz / kodeki > Kodeki zvuka > FluidSynth).\n"
#: modules/codec/g711.c:45
++<<<<<<< HEAD
+msgid "G.711 decoder"
+msgstr "Dekôder G.711"
+
+#: modules/codec/g711.c:53
+msgid "G.711 encoder"
+msgstr "Kôder G.711"
++=======
+ #, fuzzy
+ msgid "G.711 decoder"
+ msgstr "dekoder"
+
+ #: modules/codec/g711.c:53
+ #, fuzzy
+ msgid "G.711 encoder"
+ msgstr "Koder teksta T.140"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/kate.c:194 modules/codec/subsdec.c:173
msgid "Formatted Subtitles"
@@@ -11671,46 -11688,46 +12069,74 @@@ msgstr "Sjenka
msgid "Outline"
msgstr "Oris"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Crna"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Siva"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Srebrna"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Bijela"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Kestenjasta"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Crvena"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11718,61 -11735,61 +12144,97 @@@ msgid "Fuchsia
msgstr "RužiÄasto-ljubiÄasta"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Žuta"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Maslinasta"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Zelena"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Modro zelena"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Limunasto žuta"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "LjubiÄasta"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Mornarsko plava"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Plava"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11926,7 -11943,7 +12388,11 @@@ msgstr "Podnaslovi (dodatno)
msgid "Subtitle renderers using libass"
msgstr "PrikazivaÄi podnaslova koji koriste libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Izgradnja međuspremnika fontova"
@@@ -12009,8 -12026,9 +12475,14 @@@ msgid "
msgstr ""
#: modules/codec/qsv.c:61
++<<<<<<< HEAD
+msgid "Codec Profile"
+msgstr "Profil kôdeka"
++=======
+ #, fuzzy
+ msgid "Codec Profile"
+ msgstr "Odaberite datoteku"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:63
msgid ""
@@@ -12020,8 -12038,9 +12492,14 @@@
msgstr ""
#: modules/codec/qsv.c:67
++<<<<<<< HEAD
+msgid "Codec Level"
+msgstr "Razina kôdeka"
++=======
+ #, fuzzy
+ msgid "Codec Level"
+ msgstr "Naziv kodeka"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:69
msgid ""
@@@ -12063,8 -12082,9 +12541,14 @@@ msgid "
msgstr ""
#: modules/codec/qsv.c:90
++<<<<<<< HEAD
+msgid "IDR interval"
+msgstr "Interval IDR-a"
++=======
+ #, fuzzy
+ msgid "IDR interval"
+ msgstr "Interval kljuÄa"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:92
msgid ""
@@@ -13881,8 -13901,9 +14365,14 @@@ msgid "Default preset setting used
msgstr "Postavke dobavljaÄa dijaloga"
#: modules/codec/x264.c:412
++<<<<<<< HEAD
+msgid "x264 advanced options."
+msgstr "Dodatne mogućnosti x264."
++=======
+ #, fuzzy
+ msgid "x264 advanced options."
+ msgstr "Prikaži dodatne mogućnosti"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:413
msgid "x264 advanced options, in the form {opt=val,op2=val2} ."
@@@ -13909,33 -13930,37 +14399,65 @@@ msgid "tesa
msgstr "tesa"
#: modules/codec/x264.c:429
++<<<<<<< HEAD
+msgid "Fast"
+msgstr "Brzo"
+
+#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #, fuzzy
+ msgid "Fast"
+ msgstr "Brže"
+
+ #: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "UobiÄajeno"
#: modules/codec/x264.c:429
++<<<<<<< HEAD
+msgid "Slow"
+msgstr "Polako"
+
+#: modules/codec/x264.c:434
+msgid "Spatial"
+msgstr "Prostorno"
+
+#: modules/codec/x264.c:434
+msgid "Temporal"
+msgstr "Vremensko"
+
+#: modules/codec/x264.c:439
+msgid "checkerboard"
+msgstr "karirano"
++=======
+ #, fuzzy
+ msgid "Slow"
+ msgstr "Sporije"
+
+ #: modules/codec/x264.c:434
+ #, fuzzy
+ msgid "Spatial"
+ msgstr "prostorno"
+
+ #: modules/codec/x264.c:434
+ #, fuzzy
+ msgid "Temporal"
+ msgstr "vremensko"
+
+ #: modules/codec/x264.c:439
+ msgid "checkerboard"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:439
#, fuzzy
@@@ -13949,7 -13974,7 +14471,11 @@@ msgstr "Zasićenost
#: modules/codec/x264.c:439
msgid "side by side"
++<<<<<<< HEAD
+msgstr "jedno uz drugo"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:439
#, fuzzy
@@@ -13962,12 -13987,14 +14488,23 @@@ msgid "frame alternation
msgstr "Interaktivnost suÄelja"
#: modules/codec/x264.c:443
++<<<<<<< HEAD
+msgid "H.264/MPEG-4 Part 10/AVC encoder (x264 10-bit)"
+msgstr "Kôder H.264/MPEG-4 Part 10/AVC (x264 10-bitni)"
+
+#: modules/codec/x264.c:446
+msgid "H.264/MPEG-4 Part 10/AVC encoder (x264)"
+msgstr "Kôder H.264/MPEG-4 Part 10/AVC (x264)"
++=======
+ #, fuzzy
+ msgid "H.264/MPEG-4 Part 10/AVC encoder (x264 10-bit)"
+ msgstr "Koder H.264/MPEG4 AVC (x264)"
+
+ #: modules/codec/x264.c:446
+ #, fuzzy
+ msgid "H.264/MPEG-4 Part 10/AVC encoder (x264)"
+ msgstr "Koder H.264/MPEG4 AVC (x264)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/xwd.c:36
#, fuzzy
@@@ -14030,8 -14057,8 +14567,13 @@@ msgid "D-Bus control interface
msgstr "UpravljaÄko suÄelje D-Busa"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14113,18 -14140,19 +14655,34 @@@ msgid "Hotkeys management interface
msgstr "SuÄelje upravljanja tipkovnim preÄicama"
#: modules/control/hotkeys.c:188
++<<<<<<< HEAD
+msgid "One"
+msgstr "Jedan"
+
+#: modules/control/hotkeys.c:195
+#, c-format
+msgid "Loop: %s"
+msgstr "Petlja: %s"
+
+#: modules/control/hotkeys.c:202
+#, c-format
+msgid "Random: %s"
+msgstr "NasumiÄno: %s"
++=======
+ #, fuzzy
+ msgid "One"
+ msgstr "UkljuÄeno"
+
+ #: modules/control/hotkeys.c:195
+ #, fuzzy, c-format
+ msgid "Loop: %s"
+ msgstr "Obrezati: %s"
+
+ #: modules/control/hotkeys.c:202
+ #, fuzzy, c-format
+ msgid "Random: %s"
+ msgstr "Nasumice"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:331
#, c-format
@@@ -14241,9 -14269,9 +14799,15 @@@ msgid "Subtitle position %d px
msgstr "Položaj podslike %i px"
#: modules/control/hotkeys.c:1168
++<<<<<<< HEAD
+#, c-format
+msgid "Volume %ld%%"
+msgstr "Glasnoća %ld%%"
++=======
+ #, fuzzy, c-format
+ msgid "Volume %ld%%"
+ msgstr "Glasnoća %d%%"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:1173
#, c-format
@@@ -14388,9 -14416,9 +14952,15 @@@ msgstr "Inicijaliziranje
msgid "Opening"
msgstr "Otvaranje"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Stanka"
@@@ -14625,8 -14653,9 +15195,14 @@@ msgid "| voldown [X] . . . . . . lowe
msgstr "| voldown [X] . . . . . . smanjuje jaÄinu glasnoće zvuka za X koraka"
#: modules/control/rc.c:824
++<<<<<<< HEAD
+msgid "| adev [device] . . . . . . . . set/get audio device"
+msgstr "| adev [device] . . . . . . . . prikazuje/prilagođava uređaj zvuka"
++=======
+ #, fuzzy
+ msgid "| adev [device] . . . . . . . . set/get audio device"
+ msgstr "| adev [X] . . . . . . . . . . . prikazuje/prilagođava uređaj zvuka"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:825
msgid "| achan [X]. . . . . . . . . . set/get audio channels"
@@@ -14661,8 -14690,9 +15237,14 @@@ msgid "| snapshot . . . . . . . . . .
msgstr "| snapshot . . . . . . . . . . . . snima fotografije video prikaza"
#: modules/control/rc.c:832
++<<<<<<< HEAD
+msgid "| strack [X] . . . . . . . . . set/get subtitle track"
+msgstr "| strack [X] . . . . . . . . . prikazuje/prilagođava zapis podnaslova"
++=======
+ #, fuzzy
+ msgid "| strack [X] . . . . . . . . . set/get subtitle track"
+ msgstr "| strack [X] . . . . . . . . . prikazuje/prilagođava zapis podnaslova"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:833
msgid "| key [hotkey name] . . . . . . simulate hotkey press"
@@@ -14703,12 -14733,12 +15285,21 @@@ msgid "Error: `goto' needs an argument
msgstr "Pogreška: `idi na' potrebuje neki argument veći od ništice."
#: modules/control/rc.c:1296
++<<<<<<< HEAD
+#, c-format
+msgid "Playlist has only %u element"
+msgid_plural "Playlist has only %u elements"
+msgstr[0] "Popis za izvođenje ima samo %u element"
+msgstr[1] "Popis za izvođenje ima samo %u elementa"
+msgstr[2] "Popis za izvođenje ima samo %u elemenata"
++=======
+ #, fuzzy, c-format
+ msgid "Playlist has only %u element"
+ msgid_plural "Playlist has only %u elements"
+ msgstr[0] "Popis za izvođenje ima samo %d elemenata"
+ msgstr[1] "Popis za izvođenje ima samo %d elemenata"
+ msgstr[2] "Popis za izvođenje ima samo %d elemenata"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:1747 modules/gui/ncurses.c:805
msgid "+-[Incoming]"
@@@ -14883,7 -14913,7 +15474,11 @@@ msgstr "Nikada ne ispravljaj
#: modules/demux/avi/avi.c:68
msgid "Fix when necessary"
++<<<<<<< HEAD
+msgstr "Popravi ako je potrebno"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/avi/avi.c:72
msgid "AVI demuxer"
@@@ -15196,6 -15226,7 +15791,10 @@@ msgid "Blues
msgstr "Blues"
#: modules/demux/mp4/id3genres.h:33
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Classic Rock"
msgstr "KlasiÄni rock"
@@@ -15256,6 -15287,7 +15855,10 @@@ msgid "Alternative
msgstr "Alternativa"
#: modules/demux/mp4/id3genres.h:54
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Death Metal"
msgstr "Death metal"
@@@ -15312,8 -15344,9 +15915,14 @@@ msgid "Game
msgstr "Igra"
#: modules/demux/mp4/id3genres.h:69
++<<<<<<< HEAD
+msgid "Sound Clip"
+msgstr "ZvuÄni isjeÄak"
++=======
+ #, fuzzy
+ msgid "Sound Clip"
+ msgstr "Sound clip"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:70
msgid "Gospel"
@@@ -15324,6 -15357,7 +15933,10 @@@ msgid "Noise
msgstr "Å um"
#: modules/demux/mp4/id3genres.h:72
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Alternative Rock"
msgstr "Alternativni rock"
@@@ -15344,10 -15378,12 +15957,18 @@@ msgid "Meditative
msgstr "Meditativna"
#: modules/demux/mp4/id3genres.h:78
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Instrumental Pop"
msgstr "Instrumentalni pop"
#: modules/demux/mp4/id3genres.h:79
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Instrumental Rock"
msgstr "Instrumentalni rock"
@@@ -15384,6 -15420,7 +16005,10 @@@ msgid "Dream
msgstr "Dream"
#: modules/demux/mp4/id3genres.h:88
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Southern Rock"
msgstr "JužnjaÄki rock"
@@@ -15404,6 -15441,7 +16029,10 @@@ msgid "Top 40
msgstr "Prvih 40"
#: modules/demux/mp4/id3genres.h:93
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Christian Rap"
msgstr "Kršćanski rap"
@@@ -15670,8 -15708,9 +16299,14 @@@ msgid "Hardcore
msgstr "Hardcore"
#: modules/demux/mp4/id3genres.h:162
++<<<<<<< HEAD
+msgid "Terror"
+msgstr "Terror"
++=======
+ #, fuzzy
+ msgid "Terror"
+ msgstr "pogreške"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:163
msgid "Indie"
@@@ -15694,16 -15733,19 +16329,32 @@@ msgid "Beat
msgstr "Beat"
#: modules/demux/mp4/id3genres.h:168
++<<<<<<< HEAD
+msgid "Christian Gangsta Rap"
+msgstr "Kršćanski gangsterski rap"
+
+#: modules/demux/mp4/id3genres.h:169
+msgid "Heavy Metal"
+msgstr "Heavy metal"
+
+#: modules/demux/mp4/id3genres.h:170
+msgid "Black Metal"
+msgstr "Black Metal"
++=======
+ #, fuzzy
+ msgid "Christian Gangsta Rap"
+ msgstr "Kršćanski rap"
+
+ #: modules/demux/mp4/id3genres.h:169
+ #, fuzzy
+ msgid "Heavy Metal"
+ msgstr "Death metal"
+
+ #: modules/demux/mp4/id3genres.h:170
+ #, fuzzy
+ msgid "Black Metal"
+ msgstr "Crni utor"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:171
msgid "Crossover"
@@@ -15714,20 -15756,23 +16365,37 @@@ msgid "Contemporary Christian
msgstr "Suvremena kršćanska glazba"
#: modules/demux/mp4/id3genres.h:173
++<<<<<<< HEAD
+msgid "Christian Rock"
+msgstr "Kršćanski rock"
+
+#: modules/demux/mp4/id3genres.h:174
+msgid "Merengue"
+msgstr "Merengue"
++=======
+ #, fuzzy
+ msgid "Christian Rock"
+ msgstr "Kršćanski rap"
+
+ #: modules/demux/mp4/id3genres.h:174
+ #, fuzzy
+ msgid "Merengue"
+ msgstr "Interlingue"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:175
msgid "Salsa"
msgstr "Salsa"
#: modules/demux/mp4/id3genres.h:176
++<<<<<<< HEAD
+msgid "Thrash Metal"
+msgstr "Thrash Metal"
++=======
+ #, fuzzy
+ msgid "Thrash Metal"
+ msgstr "Death metal"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:177
msgid "Anime"
@@@ -15834,6 -15879,7 +16502,10 @@@ msgid "Grouping
msgstr "Grupiranje"
#: modules/demux/mp4/mp4.c:1080
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Sub-Title"
msgstr "Podnaslov"
@@@ -15842,8 -15888,9 +16514,14 @@@ msgid "Arranger
msgstr "Aranžer"
#: modules/demux/mp4/mp4.c:1082
++<<<<<<< HEAD
+msgid "Art Director"
+msgstr "UmjetniÄki redatelj"
++=======
+ #, fuzzy
+ msgid "Art Director"
+ msgstr "Redatelj"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1083
#, fuzzy
@@@ -15851,12 -15898,14 +16529,23 @@@ msgid "Copyright Acknowledgement
msgstr "Metapodatci autorskih prava"
#: modules/demux/mp4/mp4.c:1084
++<<<<<<< HEAD
+msgid "Conductor"
+msgstr "Dirigent"
+
+#: modules/demux/mp4/mp4.c:1085
+msgid "Song Description"
+msgstr "Opis skladbe"
++=======
+ #, fuzzy
+ msgid "Conductor"
+ msgstr "Proizvod"
+
+ #: modules/demux/mp4/mp4.c:1085
+ #, fuzzy
+ msgid "Song Description"
+ msgstr "Opis"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1086
msgid "Liner Notes"
@@@ -15879,8 -15928,9 +16568,14 @@@ msgid "Thanks
msgstr "Zahvale"
#: modules/demux/mp4/mp4.c:1092
++<<<<<<< HEAD
+msgid "Executive Producer"
+msgstr "Izvršni producent"
++=======
+ #, fuzzy
+ msgid "Executive Producer"
+ msgstr "Producent"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mpc.c:62
msgid "MusePack demuxer"
@@@ -16241,6 -16291,7 +16936,10 @@@ msgid "Override the default track descr
msgstr "Nadomješta zadani opis zapisa."
#: modules/demux/subtitle.c:70
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Text subtitle parser"
msgstr "RaÅ¡ÄlanjivaÄ teksta podnaslova"
@@@ -16250,10 -16301,12 +16949,18 @@@ msgid "Subtitle delay
msgstr "Odgađanje podnaslova"
#: modules/demux/subtitle.c:80
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Subtitle format"
msgstr "Format podnaslova"
#: modules/demux/subtitle.c:83
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Subtitle description"
msgstr "Opis podnaslova"
@@@ -16357,7 -16410,7 +17064,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Demuxer struje prijenosa MPEG-a"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletekst"
@@@ -16516,8 -16569,9 +17227,14 @@@ msgid "
msgstr ""
#: modules/gui/macosx/about.m:115
++<<<<<<< HEAD
+msgid "Compiled by %s with %@"
+msgstr "Sastavili %s pomoću %@"
++=======
+ #, fuzzy
+ msgid "Compiled by %s with %@"
+ msgstr "Sastavili %@ pomoću %@"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/about.m:132 modules/gui/qt4/dialogs/help.cpp:94
msgid ""
@@@ -16536,7 -16590,7 +17253,11 @@@ msgid "VLC media player Help
msgstr "Pomoć korisnicima medijskog izvoÄ‘aÄa VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Kazalo"
@@@ -16602,13 -16656,15 +17323,25 @@@ msgid "Audio Effects
msgstr "UÄinci zvuka"
#: modules/gui/macosx/AudioEffects.m:202 modules/gui/macosx/VideoEffects.m:231
++<<<<<<< HEAD
+msgid "Duplicate current profile..."
+msgstr "UdvostruÄi tekući profil..."
+
+#: modules/gui/macosx/AudioEffects.m:207
+#: modules/gui/macosx/ConvertAndSave.m:1054
+msgid "Organize Profiles..."
+msgstr "Organiziranje profila..."
++=======
+ #, fuzzy
+ msgid "Duplicate current profile..."
+ msgstr "Izbriši tekući profil"
+
+ #: modules/gui/macosx/AudioEffects.m:207
+ #: modules/gui/macosx/ConvertAndSave.m:1054
+ #, fuzzy
+ msgid "Organize Profiles..."
+ msgstr "Glavni profil"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:385 modules/gui/macosx/VideoEffects.m:877
msgid "Duplicate current profile for a new profile"
@@@ -16625,17 -16681,18 +17358,29 @@@ msgstr "Unesite naziv za novu mapu:
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Spremi"
#: modules/gui/macosx/AudioEffects.m:399 modules/gui/macosx/AudioEffects.m:738
#: modules/gui/macosx/VideoEffects.m:940
++<<<<<<< HEAD
+msgid "Remove a preset"
+msgstr "Ukloni zadanu postavu"
++=======
+ #, fuzzy
+ msgid "Remove a preset"
+ msgstr "Ukloni odabrano"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:400 modules/gui/macosx/AudioEffects.m:739
#: modules/gui/macosx/VideoEffects.m:941
@@@ -16649,24 -16706,27 +17394,48 @@@ msgid "Remove
msgstr "Ukloni"
#: modules/gui/macosx/AudioEffects.m:461
++<<<<<<< HEAD
+msgid "Add new Preset..."
+msgstr "Dodaj novu zadanu postavu..."
+
+#: modules/gui/macosx/AudioEffects.m:466
+msgid "Organize Presets..."
+msgstr "Uređvanje zadanih postava..."
+
+#: modules/gui/macosx/AudioEffects.m:639
+msgid "Save current selection as new preset"
+msgstr "Spremi tekući izbor kao novu zadanu postavu"
+
+#: modules/gui/macosx/AudioEffects.m:640
+msgid "Enter a name for the new preset:"
+msgstr "Unesite naziv nove zadane postave:"
+
+#: modules/gui/macosx/AudioEffects.m:705 modules/gui/macosx/VideoEffects.m:903
+msgid "Please enter a unique name for the new profile."
+msgstr "Unesite molim jedinstveni naziv za novi profil."
++=======
+ #, fuzzy
+ msgid "Add new Preset..."
+ msgstr "Dodaj direktorij..."
+
+ #: modules/gui/macosx/AudioEffects.m:466
+ msgid "Organize Presets..."
+ msgstr ""
+
+ #: modules/gui/macosx/AudioEffects.m:639
+ msgid "Save current selection as new preset"
+ msgstr ""
+
+ #: modules/gui/macosx/AudioEffects.m:640
+ #, fuzzy
+ msgid "Enter a name for the new preset:"
+ msgstr "Unesite naziv novog imenika:"
+
+ #: modules/gui/macosx/AudioEffects.m:705 modules/gui/macosx/VideoEffects.m:903
+ #, fuzzy
+ msgid "Please enter a unique name for the new profile."
+ msgstr "Unesite molim novi naziv profila."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:706 modules/gui/macosx/VideoEffects.m:904
msgid "Multiple profiles with the same name are not allowed."
@@@ -16771,7 -16831,7 +17540,11 @@@ msgstr "Nije pronađen ulazni sadržaj
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Strujanje se mora izvoditi ili zaustaviti "
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "SkoÄi na vremensku toÄku"
@@@ -16785,13 -16845,13 +17558,21 @@@ msgstr "SkoÄi na vremensku toÄku
#: modules/gui/macosx/ControlsBar.m:53 modules/gui/macosx/fspanel.m:418
msgid "Click to play or pause the current media."
++<<<<<<< HEAD
+msgstr "Kliknite za izvođenje ili stanku tekućeg medija."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ControlsBar.m:56 modules/gui/macosx/fspanel.m:417
msgid "Backward"
msgstr "Korak natrag"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16801,7 -16861,7 +17582,11 @@@ msgstr "
msgid "Forward"
msgstr "Proslijedi"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16822,99 -16882,101 +17607,179 @@@ msgstr "Prebaci naÄin prikaza preko ci
msgid "Click to enable fullscreen video playback."
msgstr "IskljuÄivanje zaslonskog Äuvara tijekom prikazivanja video zapisa."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "Odabir tipkovniÄke preÄice za zaustavljanje izvoÄ‘enja."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Prikaži/sakrij popis za izvođenje"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Prikaži/sakrij popis za izvođenje"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Ponovi"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Izmješaj"
+
+#: modules/gui/macosx/ControlsBar.m:484
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Izmješaj"
+
+ #: modules/gui/macosx/ControlsBar.m:450
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to enable or disable random playback."
msgstr "Odaberite pojedinaÄno osnovno strujanje za u-/iskljuÄiti iz strujanja"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "Odabir tipke za neÄujno izvoÄ‘enje zvuka."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Puni opseg glasnoće"
+
+#: modules/gui/macosx/ControlsBar.m:493
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Puni opseg glasnoće"
+
+ #: modules/gui/macosx/ControlsBar.m:459
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to play the audio at maximum volume."
msgstr "Å irinu i visinu se uzima u obzir kao maksimum veliÄîna."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "UÄinci"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr ""
"Odabir tipkovniÄke preÄice koja će se koristiti za preskakanje na prethodnu "
"stavku popisa za izvođenje."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the next playlist item."
msgstr "VLC će uvijek iznova izvoditi tekuću stavku s popisa za izvođenje."
++<<<<<<< HEAD
+#: modules/gui/macosx/ConvertAndSave.m:152
+msgid "Convert & Stream"
+msgstr "Pretvori i spremi"
+
+#: modules/gui/macosx/ConvertAndSave.m:153
+msgid "Go!"
+msgstr "Kreni!"
++=======
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:152
+ #, fuzzy
+ msgid "Convert & Stream"
+ msgstr "&Pretvori / spremi"
+
+ #: modules/gui/macosx/ConvertAndSave.m:153
+ #, fuzzy
+ msgid "Go!"
+ msgstr "&Kreni"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:154 modules/gui/macosx/MainWindow.m:173
msgid "Drop media here"
@@@ -16925,16 -16987,19 +17790,32 @@@ msgid "Open media...
msgstr "Otvori medij..."
#: modules/gui/macosx/ConvertAndSave.m:156
++<<<<<<< HEAD
+msgid "Choose Profile"
+msgstr "Odaberite profil"
+
+#: modules/gui/macosx/ConvertAndSave.m:157
+msgid "Customize..."
+msgstr "Prilagodba..."
+
+#: modules/gui/macosx/ConvertAndSave.m:158
+msgid "Choose Destination"
+msgstr "Odaberite odredište"
++=======
+ #, fuzzy
+ msgid "Choose Profile"
+ msgstr "Odaberite datoteku"
+
+ #: modules/gui/macosx/ConvertAndSave.m:157
+ #, fuzzy
+ msgid "Customize..."
+ msgstr "Prila&godba suÄelja..."
+
+ #: modules/gui/macosx/ConvertAndSave.m:158
+ #, fuzzy
+ msgid "Choose Destination"
+ msgstr "Odredište"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:159
msgid "Choose an output location"
@@@ -16943,7 -17008,7 +17824,11 @@@ msgstr "Odaberite izlazno mjesto
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16954,12 -17019,14 +17839,23 @@@ msgid "Browse...
msgstr "Pregledaj..."
#: modules/gui/macosx/ConvertAndSave.m:162
++<<<<<<< HEAD
+msgid "Setup Streaming..."
+msgstr "Postavi strujanje..."
+
+#: modules/gui/macosx/ConvertAndSave.m:164
+msgid "Save as File"
+msgstr "Spremi kao datoteku"
++=======
+ #, fuzzy
+ msgid "Setup Streaming..."
+ msgstr "&Strujanje..."
+
+ #: modules/gui/macosx/ConvertAndSave.m:164
+ #, fuzzy
+ msgid "Save as File"
+ msgstr "Spremi datoteku"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:165
#: modules/gui/macosx/ConvertAndSave.m:416 modules/gui/macosx/output.m:134
@@@ -16973,8 -17040,9 +17869,14 @@@ msgid "Apply
msgstr "Primijeniti"
#: modules/gui/macosx/ConvertAndSave.m:169
++<<<<<<< HEAD
+msgid "Save as new Profile..."
+msgstr "Spremi kao novi profil"
++=======
+ #, fuzzy
+ msgid "Save as new Profile..."
+ msgstr "Stvori novi profil"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:170 modules/gui/qt4/ui/profiles.h:708
msgid "Encapsulation"
@@@ -17022,12 -17090,14 +17924,23 @@@ msgid "Overlay subtitles on the video
msgstr "Prekrij podnaslove preko video slike"
#: modules/gui/macosx/ConvertAndSave.m:195
++<<<<<<< HEAD
+msgid "Stream Destination"
+msgstr "Odredište strujanja"
+
+#: modules/gui/macosx/ConvertAndSave.m:196
+msgid "Stream Announcement"
+msgstr "Najava strujanja"
++=======
+ #, fuzzy
+ msgid "Stream Destination"
+ msgstr "Opis strujanja"
+
+ #: modules/gui/macosx/ConvertAndSave.m:196
+ #, fuzzy
+ msgid "Stream Announcement"
+ msgstr "Najavljivanje strujanja"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:198 modules/gui/macosx/open.m:195
#: modules/gui/macosx/output.m:137
@@@ -17058,18 -17128,21 +17971,36 @@@ msgstr "PrikljuÄak
#: modules/gui/macosx/ConvertAndSave.m:203 modules/gui/macosx/output.m:172
#: modules/gui/macosx/wizard.m:400 modules/gui/macosx/wizard.m:432
#: modules/gui/macosx/wizard.m:1798
++<<<<<<< HEAD
+msgid "SAP Announcement"
+msgstr "Najava SAP-a"
+
+#: modules/gui/macosx/ConvertAndSave.m:205 modules/gui/macosx/output.m:174
+#: modules/gui/macosx/output.m:550
+msgid "HTTP Announcement"
+msgstr "Najava HTTP-a"
+
+#: modules/gui/macosx/ConvertAndSave.m:206 modules/gui/macosx/output.m:173
+#: modules/gui/macosx/output.m:546
+msgid "RTSP Announcement"
+msgstr "Najava RTSP-a"
++=======
+ #, fuzzy
+ msgid "SAP Announcement"
+ msgstr "Objave SAP-a"
+
+ #: modules/gui/macosx/ConvertAndSave.m:205 modules/gui/macosx/output.m:174
+ #: modules/gui/macosx/output.m:550
+ #, fuzzy
+ msgid "HTTP Announcement"
+ msgstr "Objave SAP-a"
+
+ #: modules/gui/macosx/ConvertAndSave.m:206 modules/gui/macosx/output.m:173
+ #: modules/gui/macosx/output.m:546
+ #, fuzzy
+ msgid "RTSP Announcement"
+ msgstr "Objave SAP-a"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:207 modules/gui/macosx/output.m:175
#: modules/gui/macosx/output.m:554
@@@ -17078,7 -17151,7 +18009,11 @@@ msgstr "Izvoz SDP-a kao datoteke
#: modules/gui/macosx/ConvertAndSave.m:284
msgid "Invalid container format for HTTP streaming"
++<<<<<<< HEAD
+msgstr "Nevažeći oblik spremnika za strujanje HTTP-a"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:286
msgid ""
@@@ -17131,11 -17204,11 +18066,19 @@@ msgstr "SDP URL
#: modules/gui/macosx/ConvertAndSave.m:494
msgid "A SDP export is requested, but no URL is provided."
++<<<<<<< HEAD
+msgstr "Zahtijeva se izvoz SDP-a, ali nije naveden ni jedan URL."
+
+#: modules/gui/macosx/ConvertAndSave.m:1052
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:1052
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Prilagođeno"
@@@ -17179,7 -17252,7 +18122,11 @@@ msgstr "(ne izvodi se ni jedna stavka)
#: modules/gui/macosx/fspanel.m:421
msgid "Click to exit fullscreen playback."
++<<<<<<< HEAD
+msgstr "Kliknite za izlaz iz cjelozaslonskog prikaza."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/intf.m:842 modules/gui/qt4/dialogs/messages.cpp:77
#: modules/gui/qt4/ui/messages_panel.h:138
@@@ -17237,38 -17310,38 +18184,70 @@@ msgstr "
msgid "Don't ask again"
msgstr "Više nemoj pitati"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "IzvoÄ‘aÄ medija VLC"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Zapisnik o padu programa nije pronađen"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Zapisnik o padu programa nije pronađen"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Nastavi"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Nije mogao biti pronađen nikakav trag nekog prethodnog urušavanja."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Ukloniti stare postavke?"
+
+#: modules/gui/macosx/intf.m:1937
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Nije mogao biti pronađen nikakav trag nekog prethodnog urušavanja."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Ukloniti stare postavke?"
+
+ #: modules/gui/macosx/intf.m:1922
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "We just found an older version of VLC's preferences files."
msgstr ""
"Upravo smo pronaÅ¡li jednu stariju inaÄicu VLC-ovih datoteka osobnih postavki."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Baci u Koš za smeće i iznova pokreni VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Baci u Koš za smeće i iznova pokreni VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "Zapisnik ispravaka VLC-a (%s).rtfd"
@@@ -17447,7 -17520,7 +18426,11 @@@ msgstr "
"Ova mogućnost dopuÅ¡ta suÄelju da u razliÄitim okolnostima mijenja svoju "
"ikonu."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "ZakljuÄaj boÄni omjer"
@@@ -17583,7 -17656,7 +18566,11 @@@ msgstr "Sakrij VLC
msgid "Hide Others"
msgstr "Sakrij ostalo"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Prikaži sve"
@@@ -17668,54 -17741,54 +18655,100 @@@ msgstr "&Usklađivanje zapisa
msgid "A→B Loop"
msgstr "Petlja A→B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Zatvori nakon izvođenja"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Korak naprijed"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Zatvori nakon izvođenja"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Korak naprijed"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Korak natrag"
#: modules/gui/macosx/MainMenu.m:378
msgid "Increase Volume"
++<<<<<<< HEAD
+msgstr "Glasnije"
+
+#: modules/gui/macosx/MainMenu.m:379
+msgid "Decrease Volume"
+msgstr "Tiše"
++=======
+ msgstr "Povisi jaÄinu zvuka"
+
+ #: modules/gui/macosx/MainMenu.m:379
+ msgid "Decrease Volume"
+ msgstr "Smanji jaÄinu zvuka"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:385 modules/gui/macosx/MainMenu.m:386
msgid "Audio Device"
msgstr "Uređaj zvuka"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "PoloviÄna veliÄina"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "UobiÄajena veliÄina"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dvostruka veliÄina"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Prilagodi veliÄini zaslona"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "PoloviÄna veliÄina"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "UobiÄajena veliÄina"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dvostruka veliÄina"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Prilagodi veliÄini zaslona"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Stalno u prvom planu"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Uređaj prikaza preko cijelog zaslona"
@@@ -17724,7 -17797,7 +18757,11 @@@
msgid "Post processing"
msgstr "Završna obrada"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Dodaj datoteku podnaslova..."
@@@ -17955,7 -18028,7 +18992,11 @@@ msgid "Play another media synchronously
msgstr "Usklađeno izvodi i druge medije"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Odaberite..."
@@@ -18139,7 -18212,7 +19180,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Kodiranje podnaslova"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "VeliÄina fonta"
@@@ -18368,12 -18441,12 +19413,20 @@@ msgstr "Pogreška pri pohranjivanju met
msgid "VLC was unable to save the meta data."
msgstr "VLC nije mogao spremiti metapodatke."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Osobne postavke"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Vrati sve na izvorno"
@@@ -18552,130 -18625,125 +19605,238 @@@ msgstr "Omogući obavijesti Growla (nak
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Zaustavi iTunes tijekom izvođenja VLC-om"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Zadano kodiranje"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Postavke prikaza"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Zadano kodiranje"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Postavke prikaza"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Boja fonta"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Font"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Jezik podnaslova"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Jezik podnaslova"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Preferirani jezik podnaslova"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Omogući OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Omogući OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Neprozirnost"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Nametni podebljano"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Nametni podebljano"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Boja obrisa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Debljina obrisa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Crni zasloni u naÄinu preko cijelog zaslona"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Crni zasloni u naÄinu preko cijelog zaslona"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Prikaz"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Modul izlaza"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Fotografije video slike"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Mapa"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Format"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Predmetak"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Slijedno znamenkovanje"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Posljednja provjera dne: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Još nije provedena provjera."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Modul izlaza"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Fotografije video slike"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Mapa"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Format"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Predmetak"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Slijedno znamenkovanje"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Posljednja provjera dne: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Još nije provedena provjera."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Najniža zadrška"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Niska zadrška"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Visoka zadrška"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Viša zadrška"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Vrati izvorne postavke"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18688,20 -18756,20 +19849,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Odaberite mapu za spremanje fotografija Vaših video prikaza."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Odabrati"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Mapa ili naziv datoteke u kojem će biti spremljeni zapisi snimki."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Odaberite mapu za spremanje fotografija Vaših video prikaza."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Odabrati"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Mapa ili naziv datoteke u kojem će biti spremljeni zapisi snimki."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18709,16 -18777,16 +19887,29 @@@ msgstr "
"Stisnite novi kljuÄ za\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Pogrešna kombinacija"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Te tipke na žalost ne mogu biti koriÅ¡tene kao tipkovniÄke preÄice."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Pogrešna kombinacija"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Te tipke na žalost ne mogu biti koriÅ¡tene kao tipkovniÄke preÄice."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Ta kombinacija je već zauzeta s \"%@\"."
@@@ -19015,7 -19083,7 +20206,11 @@@ msgstr "UÄinak Voda
#: modules/gui/macosx/VideoEffects.m:161 modules/video_filter/anaglyph.c:73
msgid "Anaglyph"
++<<<<<<< HEAD
+msgstr "Stereoskopski prikaz"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:163
#: modules/gui/qt4/ui/video_effects.h:1366
@@@ -19044,8 -19112,9 +20239,14 @@@ msgid "Transparency
msgstr "Prozirnost"
#: modules/gui/macosx/VideoEffects.m:236
++<<<<<<< HEAD
+msgid "Organize profiles..."
+msgstr "Organiziraj profile..."
++=======
+ #, fuzzy
+ msgid "Organize profiles..."
+ msgstr "Spremi datoteku..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:116
msgid "MPEG-1 Video codec (usable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
@@@ -19210,7 -19279,6 +20411,10 @@@ msgstr "
"pristupati na http://vašip:8080."
#: modules/gui/macosx/wizard.m:265
++<<<<<<< HEAD
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Use this to stream to several computers using the Microsoft MMS protocol. "
"This protocol is used as transport method by many Microsoft's software. Note "
@@@ -19718,8 -19786,9 +20922,14 @@@ msgid " i Show/Hid
msgstr " i Prikaži/sakrij informativni okvir"
#: modules/gui/ncurses.c:869
++<<<<<<< HEAD
+msgid " M Show/Hide metadata box"
+msgstr "M Prikaži/sakrij okvir metapodataka"
++=======
+ #, fuzzy
+ msgid " M Show/Hide metadata box"
+ msgstr " m Prikaži/sakrij okvir metapodataka"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:870
msgid " L Show/Hide messages box"
@@@ -19792,8 -19861,9 +21002,14 @@@ msgid " a, z Volume U
msgstr " a, z Glasnoća gore/dolje"
#: modules/gui/ncurses.c:892
++<<<<<<< HEAD
+msgid " m Mute"
+msgstr " m Utišano"
++=======
+ #, fuzzy
+ msgid " m Mute"
+ msgstr " s Stani"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#. xgettext: You can use ↑ and ↓ characters
#: modules/gui/ncurses.c:894
@@@ -19845,8 -19915,9 +21061,14 @@@ msgid " / Look fo
msgstr " / Traženje neke stavke"
#: modules/gui/ncurses.c:911
++<<<<<<< HEAD
+msgid " ; Look for the next item"
+msgstr " ; Traži slijedeću stavku"
++=======
+ #, fuzzy
+ msgid " ; Look for the next item"
+ msgstr " / Traženje neke stavke"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:912
msgid " A Add an entry"
@@@ -19910,17 -19981,19 +21132,33 @@@ msgid " Position : %s/%s
msgstr " Pozicija : %s/%s"
#: modules/gui/ncurses.c:1099
++<<<<<<< HEAD
+msgid " Volume : Mute"
+msgstr "Glasnoća : Utišaj"
+
+#: modules/gui/ncurses.c:1100
+#, c-format
+msgid " Volume : %3ld%%"
+msgstr "Glasnoća : %3ld%%"
+
+#: modules/gui/ncurses.c:1100
+msgid " Volume : ----"
+msgstr "Glasnoća : ----"
++=======
+ #, fuzzy
+ msgid " Volume : Mute"
+ msgstr " JaÄina zvuka : %u%%"
+
+ #: modules/gui/ncurses.c:1100
+ #, fuzzy, c-format
+ msgid " Volume : %3ld%%"
+ msgstr " JaÄina zvuka : %u%%"
+
+ #: modules/gui/ncurses.c:1100
+ #, fuzzy
+ msgid " Volume : ----"
+ msgstr " JaÄina zvuka : %u%%"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:1106
#, c-format
@@@ -20197,16 -20270,19 +21435,32 @@@ msgid "dB
msgstr "dB"
#: modules/gui/qt4/components/extended_panels.cpp:1192
++<<<<<<< HEAD
+msgid "170 Hz"
+msgstr "170 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1193
+msgid "310 Hz"
+msgstr "310 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1194
+msgid "600 Hz"
+msgstr "600 Hz"
++=======
+ #, fuzzy
+ msgid "170 Hz"
+ msgstr "50 Hz"
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1193
+ #, fuzzy
+ msgid "310 Hz"
+ msgstr "50 Hz"
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1194
+ #, fuzzy
+ msgid "600 Hz"
+ msgstr "60 Hz"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1195
#: modules/gui/qt4/components/extended_panels.cpp:1209
@@@ -20247,12 -20323,14 +21501,23 @@@ msgid "125 Hz
msgstr "125 Hz"
#: modules/gui/qt4/components/extended_panels.cpp:1207
++<<<<<<< HEAD
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1208
+msgid "500 Hz"
+msgstr "500 Hz"
++=======
+ #, fuzzy
+ msgid "250 Hz"
+ msgstr "50 Hz"
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1208
+ #, fuzzy
+ msgid "500 Hz"
+ msgstr "50 Hz"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1210
msgid "2 KHz"
@@@ -20268,8 -20346,9 +21533,14 @@@ msgstr "8 KHz
#: modules/gui/qt4/components/extended_panels.cpp:1380
#: modules/gui/qt4/components/extended_panels.cpp:1381
++<<<<<<< HEAD
+msgid "ms"
+msgstr "ms"
++=======
+ #, fuzzy
+ msgid "ms"
+ msgstr " ms"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1384
msgid ""
@@@ -20403,12 -20482,14 +21674,23 @@@ msgid "buffers
msgstr "međuspremnika"
#: modules/gui/qt4/components/info_panels.cpp:609
++<<<<<<< HEAD
+msgid "Last 60 seconds"
+msgstr "Zadnjih 60 sekunda"
+
+#: modules/gui/qt4/components/info_panels.cpp:610
+msgid "Overall"
+msgstr "Sveukupno"
++=======
+ #, fuzzy
+ msgid "Last 60 seconds"
+ msgstr "Trajanje u sekundama"
+
+ #: modules/gui/qt4/components/info_panels.cpp:610
+ #, fuzzy
+ msgid "Overall"
+ msgstr "Prekrivanje"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/interface_widgets.cpp:427
msgid "Current visualization"
@@@ -20435,8 -20516,9 +21717,14 @@@ msgid "Add cover art from file
msgstr "Dodaj sliku omota iz datoteke"
#: modules/gui/qt4/components/interface_widgets.cpp:717
++<<<<<<< HEAD
+msgid "Choose Cover Art"
+msgstr "Odaberite naslovnicu"
++=======
+ #, fuzzy
+ msgid "Choose Cover Art"
+ msgstr "Preuzmi naslovnicu"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/interface_widgets.cpp:718
msgid "Image Files (*.gif *.jpg *.jpeg *.png)"
@@@ -20507,8 -20589,9 +21795,14 @@@ msgid "Use VLC pace
msgstr "Koristi VLC-ov tempo"
#: modules/gui/qt4/components/open_panels.cpp:900
++<<<<<<< HEAD
+msgid "TV - digital"
+msgstr "TV - digitalna"
++=======
+ #, fuzzy
+ msgid "TV - digital"
+ msgstr "TV (digitalna)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/open_panels.cpp:903
msgid "Tuner card"
@@@ -20531,8 -20614,9 +21825,14 @@@ msgid "Bandwidth
msgstr "Pojasna Å¡irina"
#: modules/gui/qt4/components/open_panels.cpp:1021
++<<<<<<< HEAD
+msgid "TV - analog"
+msgstr "TV - analogna"
++=======
+ #, fuzzy
+ msgid "TV - analog"
+ msgstr "Tagalog"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/open_panels.cpp:1024
msgid "Device name"
@@@ -20566,8 -20650,9 +21866,14 @@@ msgid "Search the playlist
msgstr "Pretraži popis za izvođenje"
#: modules/gui/qt4/components/playlist/playlist_model.cpp:377
++<<<<<<< HEAD
+msgid "unknown"
+msgstr "nepoznato"
++=======
+ #, fuzzy
+ msgid "unknown"
+ msgstr "Nepoznato"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/selector.cpp:250
msgid "My Computer"
@@@ -20634,8 -20719,9 +21940,14 @@@ msgid "Decrease
msgstr "Smanji"
#: modules/gui/qt4/components/playlist/standardpanel.cpp:281
++<<<<<<< HEAD
+msgid "Playlist View Mode"
+msgstr "NaÄin prikaza popisa za izvoÄ‘enja"
++=======
+ #, fuzzy
+ msgid "Playlist View Mode"
+ msgstr "Datoteke popisa za izvođenja"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/standardpanel.cpp:510
msgid ""
@@@ -20648,12 -20734,14 +21960,23 @@@ msgid "Icons
msgstr "Ikone"
#: modules/gui/qt4/components/playlist/standardpanel.hpp:157
++<<<<<<< HEAD
+msgid "Detailed List"
+msgstr "Iscrpniji popis"
+
+#: modules/gui/qt4/components/playlist/standardpanel.hpp:158
+msgid "List"
+msgstr "Popis"
++=======
+ #, fuzzy
+ msgid "Detailed List"
+ msgstr "Iscrpniji prikaz"
+
+ #: modules/gui/qt4/components/playlist/standardpanel.hpp:158
+ #, fuzzy
+ msgid "List"
+ msgstr "ID popisa"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/standardpanel.hpp:159
#, fuzzy
@@@ -20673,24 -20761,27 +21996,42 @@@ msgstr "
"Odaberite neku radnju kojom ćete izmijeniti pridruženu tipkovnu preÄicu"
#: modules/gui/qt4/components/preferences_widgets.cpp:1137
++<<<<<<< HEAD
+msgid "in"
+msgstr "u"
++=======
+ #, fuzzy
+ msgid "in"
+ msgstr "PojaÄavanje"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1139
msgid "Any field"
msgstr "Bilo koje polje"
#: modules/gui/qt4/components/preferences_widgets.cpp:1140
++<<<<<<< HEAD
+msgid "Actions"
+msgstr "Radnje"
++=======
+ #, fuzzy
+ msgid "Actions"
+ msgstr "Radnja"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1147
msgid "Hotkey"
msgstr "TipkovniÄka preÄica"
#: modules/gui/qt4/components/preferences_widgets.cpp:1148
++<<<<<<< HEAD
+msgid "Application level hotkey"
+msgstr "TipkovniÄki preÄac aplikacijske razine"
++=======
+ #, fuzzy
+ msgid "Application level hotkey"
+ msgstr "Aplikacija"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1149
#: modules/gui/qt4/components/preferences_widgets.cpp:1409
@@@ -20703,36 -20794,39 +22044,66 @@@ msgstr "
#: modules/gui/qt4/components/preferences_widgets.cpp:1233
#: modules/gui/qt4/components/preferences_widgets.cpp:1234
++<<<<<<< HEAD
+msgid ""
+"Double click to change.\n"
+"Delete key to remove."
+msgstr ""
+"Dvoklik za promjenu.\n"
+"Tipka brisanja za uklanjanje."
+
+#: modules/gui/qt4/components/preferences_widgets.cpp:1410
+msgid "Hotkey change"
+msgstr "Promjena tipkovniÄkog preÄaca"
+
+#: modules/gui/qt4/components/preferences_widgets.cpp:1414
+msgid "Press the new key or combination for "
+msgstr "Pritisnite novu tipku ili kombinaciju za"
++=======
+ #, fuzzy
+ msgid ""
+ "Double click to change.\n"
+ "Delete key to remove."
+ msgstr "Dvoklik za dobivanje podataka o mediju"
+
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1410
+ #, fuzzy
+ msgid "Hotkey change"
+ msgstr "TipkovniÄka preÄica"
+
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1414
+ #, fuzzy
+ msgid "Press the new key or combination for "
+ msgstr "Pritisnite nove tipke za"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1423
msgid "Assign"
msgstr "Dodijeli"
#: modules/gui/qt4/components/preferences_widgets.cpp:1458
++<<<<<<< HEAD
+msgid "Warning: this key or combination is already assigned to "
+msgstr "Pozor: Ta tipka odnosno kombinacija je već dodijeljena \""
++=======
+ #, fuzzy
+ msgid "Warning: this key or combination is already assigned to "
+ msgstr "Pozor: Ta tipka je već dodijeljena \""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1470
msgid "Warning: <b>%1</b> is already an application menu shortcut"
msgstr ""
#: modules/gui/qt4/components/preferences_widgets.cpp:1493
++<<<<<<< HEAD
+msgid "Key or combination: "
+msgstr "Tipka ili kombinacija:"
++=======
+ #, fuzzy
+ msgid "Key or combination: "
+ msgstr "Pogrešna kombinacija"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1502
msgid "Key: "
@@@ -20827,20 -20921,20 +22198,36 @@@ msgstr "Izbriši odabrani profil
msgid "Create a new profile"
msgstr "Stvori novi profil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Stvori"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Nedostaje naziv profila"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Nedostaje naziv profila"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Morate zadati naziv za taj profil."
@@@ -20993,8 -21087,9 +22380,14 @@@ msgid "&Start
msgstr "&ZapoÄni"
#: modules/gui/qt4/dialogs/convert.cpp:132
++<<<<<<< HEAD
+msgid "Containers (*"
+msgstr "Spremnici (*"
++=======
+ #, fuzzy
+ msgid "Containers (*"
+ msgstr "Nastavi"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/errors.cpp:40
msgid "Errors"
@@@ -21025,8 -21120,9 +22418,14 @@@ msgid "v4l2 controls
msgstr "Upravljanje v4l2"
#: modules/gui/qt4/dialogs/extended.cpp:101
++<<<<<<< HEAD
+msgid "&Write changes to config"
+msgstr "&Zapiši izmjene u konfiguracijsku datoteku"
++=======
+ #, fuzzy
+ msgid "&Write changes to config"
+ msgstr "ID procesa zapisati u datoteku "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:61
#: modules/gui/qt4/dialogs/firstrun.cpp:69
@@@ -21053,11 -21149,12 +22452,20 @@@ msgstr "Smjernica pristupa mreži
#: modules/gui/qt4/dialogs/firstrun.cpp:98
#, fuzzy
msgid "Automatically retrieve media info"
++<<<<<<< HEAD
+msgstr "Automatski dohvaćaj podatke mediju"
+
+#: modules/gui/qt4/dialogs/firstrun.cpp:103
+msgid "Regularly check for VLC updates"
+msgstr "Redovno provjeravaj dogradnje VLC-a"
++=======
+ msgstr "Automatski odreÄ‘uje pojaÄavanje video zapisa."
+
+ #: modules/gui/qt4/dialogs/firstrun.cpp:103
+ #, fuzzy
+ msgid "Regularly check for VLC updates"
+ msgstr "Dopusti provjeru raspoloživosti dogradnji..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/gototime.cpp:42
msgid "Go to Time"
@@@ -21104,8 -21201,9 +22512,14 @@@ msgid "An error occurred while checkin
msgstr "Tijekom provjere raspoloživosti dogradnji je nastala neka pogreška..."
#: modules/gui/qt4/dialogs/mediainfo.cpp:52
++<<<<<<< HEAD
+msgid "Current Media Information"
+msgstr "Tekuća informacija o mediju"
++=======
+ #, fuzzy
+ msgid "Current Media Information"
+ msgstr "Informacija o mediju"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/mediainfo.cpp:63
msgid "&General"
@@@ -21156,8 -21254,9 +22570,14 @@@ msgid "Update the tree
msgstr "Dopuni stablo"
#: modules/gui/qt4/dialogs/messages.cpp:332
++<<<<<<< HEAD
+msgid "Clear the messages"
+msgstr "Ukloni poruke"
++=======
+ #, fuzzy
+ msgid "Clear the messages"
+ msgstr "Boja poruka"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/open.cpp:78 modules/gui/qt4/menus.cpp:915
msgid "Open Media"
@@@ -21198,12 -21297,14 +22618,23 @@@ msgid "&Stream
msgstr "&Struji"
#: modules/gui/qt4/dialogs/open.cpp:121
++<<<<<<< HEAD
+msgid "C&onvert"
+msgstr "P&retvori"
+
+#: modules/gui/qt4/dialogs/open.cpp:205
+msgid "C&onvert / Save"
+msgstr "P&retvori / spremi"
++=======
+ #, fuzzy
+ msgid "C&onvert"
+ msgstr "Pretvori"
+
+ #: modules/gui/qt4/dialogs/open.cpp:205
+ #, fuzzy
+ msgid "C&onvert / Save"
+ msgstr "&Pretvori / spremi"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/openurl.cpp:47
msgid "Open URL"
@@@ -21214,8 -21315,9 +22645,14 @@@ msgid "Enter URL here...
msgstr "Ovdje unijeti internetsku adresu..."
#: modules/gui/qt4/dialogs/openurl.cpp:66
++<<<<<<< HEAD
+msgid "Please enter the URL or path to the media you want to play."
+msgstr "Unesite URL ili stazu do medija koji želite izvoditi."
++=======
+ #, fuzzy
+ msgid "Please enter the URL or path to the media you want to play."
+ msgstr "Unesite internetsku adresu ili stazu do medija koji želite izvoditi"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/openurl.cpp:70
msgid ""
@@@ -21304,12 -21406,14 +22741,23 @@@ msgid "Only show modules related to cur
msgstr "Prikaži samo module koji se tiÄu tekućeg izvoÄ‘enja"
#: modules/gui/qt4/dialogs/preferences.cpp:201
++<<<<<<< HEAD
+msgid "Advanced Preferences"
+msgstr "Dodatne osobne postavke"
+
+#: modules/gui/qt4/dialogs/preferences.cpp:222
+msgid "Simple Preferences"
+msgstr "ObiÄne osobne postavke"
++=======
+ #, fuzzy
+ msgid "Advanced Preferences"
+ msgstr "Osobne postavke"
+
+ #: modules/gui/qt4/dialogs/preferences.cpp:222
+ #, fuzzy
+ msgid "Simple Preferences"
+ msgstr "Osobne postavke"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:306
msgid "Cannot save Configuration"
@@@ -21362,6 -21466,7 +22810,10 @@@ msgid "Media Files
msgstr "Medijske datoteke"
#: modules/gui/qt4/dialogs_provider.hpp:44
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Subtitle Files"
msgstr "Datoteke podnaslova"
@@@ -21374,6 -21479,7 +22826,10 @@@ msgid "Stream Output
msgstr "Izlazni sadržaj strujanja"
#: modules/gui/qt4/dialogs/sout.cpp:51
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This wizard will allow you to stream or convert your media for use locally, "
"on your private network, or on the Internet.\n"
@@@ -21513,12 -21619,14 +22969,23 @@@ msgid "Playback Buttons
msgstr "Gumbi za reprodukciju"
#: modules/gui/qt4/dialogs/toolbar.cpp:453
++<<<<<<< HEAD
+msgid "Aspect ratio selector"
+msgstr "Izbornik boÄnog omjera"
+
+#: modules/gui/qt4/dialogs/toolbar.cpp:457
+msgid "Speed selector"
+msgstr "Izbornik brzine"
++=======
+ #, fuzzy
+ msgid "Aspect ratio selector"
+ msgstr "BoÄni omjer: %s"
+
+ #: modules/gui/qt4/dialogs/toolbar.cpp:457
+ #, fuzzy
+ msgid "Speed selector"
+ msgstr "Modul preuzorkovanja za oblik Speex"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/vlm.cpp:73
msgid "Broadcast"
@@@ -21614,8 -21722,9 +23081,14 @@@ msgid "Subti&tle
msgstr "Pod&naslov"
#: modules/gui/qt4/menus.cpp:335 modules/gui/qt4/menus.cpp:1068
++<<<<<<< HEAD
+msgid "T&ools"
+msgstr "A&lati"
++=======
+ #, fuzzy
+ msgid "T&ools"
+ msgstr "Alati"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:338 modules/gui/qt4/menus.cpp:1103
msgid "V&iew"
@@@ -21630,8 -21739,9 +23103,14 @@@ msgid "Open &File...
msgstr "Otvori &datoteku..."
#: modules/gui/qt4/menus.cpp:355
++<<<<<<< HEAD
+msgid "&Open Multiple Files..."
+msgstr "&Otvori više datoteka..."
++=======
+ #, fuzzy
+ msgid "&Open Multiple Files..."
+ msgstr "&Otvori datoteku..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:359 modules/gui/qt4/menus.cpp:920
msgid "Open &Disc..."
@@@ -21738,16 -21848,19 +23217,32 @@@ msgid "Visualizations selector
msgstr "Izbornik vizualizacija"
#: modules/gui/qt4/menus.cpp:583
++<<<<<<< HEAD
+msgid "&Increase Volume"
+msgstr "&Povisi jaÄinu zvuka"
+
+#: modules/gui/qt4/menus.cpp:586
+msgid "&Decrease Volume"
+msgstr "&Smanji jaÄinu zvuka"
+
+#: modules/gui/qt4/menus.cpp:589
+msgid "&Mute"
+msgstr "&NeÄujno"
++=======
+ #, fuzzy
+ msgid "&Increase Volume"
+ msgstr "Povisi jaÄinu zvuka"
+
+ #: modules/gui/qt4/menus.cpp:586
+ #, fuzzy
+ msgid "&Decrease Volume"
+ msgstr "Smanji jaÄinu zvuka"
+
+ #: modules/gui/qt4/menus.cpp:589
+ #, fuzzy
+ msgid "&Mute"
+ msgstr "NeÄujno"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:606
msgid "Audio &Track"
@@@ -21758,20 -21871,23 +23253,37 @@@ msgid "Audio &Device
msgstr "&Uređaj zvuka"
#: modules/gui/qt4/menus.cpp:608
++<<<<<<< HEAD
+msgid "&Stereo Mode"
+msgstr "&Stereo naÄin"
++=======
+ #, fuzzy
+ msgid "&Stereo Mode"
+ msgstr "Stereo naÄin"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:611
msgid "&Visualizations"
msgstr "&Vizualizacije"
#: modules/gui/qt4/menus.cpp:637
++<<<<<<< HEAD
+msgid "Add &Subtitle File..."
+msgstr "Dodaj datoteku &podnaslova"
+
+#: modules/gui/qt4/menus.cpp:639
+msgid "Sub &Track"
+msgstr "Pod &zapis"
++=======
+ #, fuzzy
+ msgid "Add &Subtitle File..."
+ msgstr "Datoteka podnaslova"
+
+ #: modules/gui/qt4/menus.cpp:639
+ #, fuzzy
+ msgid "Sub &Track"
+ msgstr "&Zapis zvuka"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:662
msgid "Video &Track"
@@@ -21898,16 -22014,19 +23410,32 @@@ msgid "&Playback
msgstr "&Izvođenje"
#: modules/gui/qt4/menus.cpp:1147
++<<<<<<< HEAD
+msgid "&Hide VLC media player in taskbar"
+msgstr "&Sakrij izvoÄ‘aÄ medija VLC u traci zadaća"
+
+#: modules/gui/qt4/menus.cpp:1153
+msgid "Sho&w VLC media player"
+msgstr "Pri&kaži izvoÄ‘aÄ medija VLC"
+
+#: modules/gui/qt4/menus.cpp:1164
+msgid "&Open Media"
+msgstr "&Otvaranje medija"
++=======
+ #, fuzzy
+ msgid "&Hide VLC media player in taskbar"
+ msgstr "Sakrij izvoÄ‘aÄ medija VLC u traci zadaća"
+
+ #: modules/gui/qt4/menus.cpp:1153
+ #, fuzzy
+ msgid "Sho&w VLC media player"
+ msgstr "Prikaži izvoÄ‘aÄ medija VLC"
+
+ #: modules/gui/qt4/menus.cpp:1164
+ #, fuzzy
+ msgid "&Open Media"
+ msgstr "Otvaranje medija"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:1628
msgid "&Clear"
@@@ -22131,16 -22250,19 +23659,32 @@@ msgstr "
"onda se preko istih tipki mijenja glasnoća sustava."
#: modules/gui/qt4/qt4.cpp:184
++<<<<<<< HEAD
+msgid "Never"
+msgstr "Nikada"
+
+#: modules/gui/qt4/qt4.cpp:184
+msgid "When minimized"
+msgstr "Kada je minimizirano"
+
+#: modules/gui/qt4/qt4.cpp:184
+msgid "Always"
+msgstr "Uvijek"
++=======
+ #, fuzzy
+ msgid "Never"
+ msgstr "Odjek"
+
+ #: modules/gui/qt4/qt4.cpp:184
+ #, fuzzy
+ msgid "When minimized"
+ msgstr "SkoÄno okno na programskoj traci kada je minimizirano"
+
+ #: modules/gui/qt4/qt4.cpp:184
+ #, fuzzy
+ msgid "Always"
+ msgstr "Uvijek ispravi"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:189
msgid "Qt interface"
@@@ -22353,8 -22475,9 +23897,14 @@@ msgid "Lua CLI
msgstr "Lua CLI"
#: modules/lua/vlc.c:110
++<<<<<<< HEAD
+msgid "Command-line interface"
+msgstr "SuÄelje naredbenog retka"
++=======
+ #, fuzzy
+ msgid "Command-line interface"
+ msgstr "Glavna suÄelja"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:119 modules/lua/vlc.c:130
msgid "Lua Telnet"
@@@ -22522,16 -22645,18 +24072,28 @@@ msgid "
msgstr ""
#: modules/misc/gnutls.c:294 modules/misc/gnutls.c:311
++<<<<<<< HEAD
+msgid "Insecure site"
+msgstr "Nesiguran sadržaj"
++=======
+ #, fuzzy
+ msgid "Insecure site"
+ msgstr "VeliÄina teksture"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/gnutls.c:295 modules/misc/gnutls.c:314
msgid "Abort"
msgstr "Prekini"
#: modules/misc/gnutls.c:295
++<<<<<<< HEAD
+msgid "View certificate"
+msgstr "Prikaži certifikat"
++=======
+ #, fuzzy
+ msgid "View certificate"
+ msgstr "Datoteka certifikata"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/gnutls.c:312
#, c-format
@@@ -23325,13 -23450,15 +24887,25 @@@ msgstr "Radna ploha
#: modules/stream_filter/dash/dash.cpp:51
#: modules/stream_filter/dash/dash.cpp:52
++<<<<<<< HEAD
+msgid "Preferred Width"
+msgstr "Željena širina"
+
+#: modules/stream_filter/dash/dash.cpp:54
+#: modules/stream_filter/dash/dash.cpp:55
+msgid "Preferred Height"
+msgstr "Željena visina"
++=======
+ #, fuzzy
+ msgid "Preferred Width"
+ msgstr "Poželjna razluÄivost video slike"
+
+ #: modules/stream_filter/dash/dash.cpp:54
+ #: modules/stream_filter/dash/dash.cpp:55
+ #, fuzzy
+ msgid "Preferred Height"
+ msgstr "Popis pretpostavljenih dekodera"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/dash/dash.cpp:57
msgid "Buffer Size (Seconds)"
@@@ -23351,8 -23478,9 +24925,14 @@@ msgid "Dynamic Adaptive Streaming over
msgstr "DinamiÄko adaptivno strujanje putem HTTP-a"
#: modules/stream_filter/decomp.c:59
++<<<<<<< HEAD
+msgid "LZMA decompression"
+msgstr "Dekompresija LZMA"
++=======
+ #, fuzzy
+ msgid "LZMA decompression"
+ msgstr "Dekompresija"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/decomp.c:63
#, fuzzy
@@@ -23360,8 -23488,9 +24940,14 @@@ msgid "Burrows-Wheeler decompression
msgstr "Sažimanje krivine QP"
#: modules/stream_filter/decomp.c:68
++<<<<<<< HEAD
+msgid "gzip decompression"
+msgstr "Dekompresija GZIP"
++=======
+ #, fuzzy
+ msgid "gzip decompression"
+ msgstr "Dekompresija"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/httplive.c:55
msgid "Http Live Streaming stream filter"
@@@ -24311,6 -24440,7 +25897,10 @@@ msgstr "
"popis filtara."
#: modules/stream_out/transcode/transcode.c:107
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Subtitle encoder"
msgstr "Kôder podnaslova"
@@@ -24402,23 -24532,23 +25992,43 @@@ msgstr "Izlaz prekodiranog toka strujan
msgid "Overlays/Subtitles"
msgstr "Prekrivanja/podnaslovi"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Monospace slova"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Obitelj fontova za font koji želite koristiti"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Naziv datoteke fonta za font koji želite koristiti"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "VeliÄina fonta u pikselima"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Obitelj fontova za font koji želite koristiti"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Naziv datoteke fonta za font koji želite koristiti"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "VeliÄina fonta u pikselima"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24428,11 -24558,11 +26038,19 @@@ msgstr "
"Ukoliko postavite nešto drugo nego 0, onda će ta mogućnost nadomjestiti "
"srazmjernu veliÄinu fonta."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Neprozirnost teksta"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Neprozirnost teksta"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24440,12 -24570,12 +26058,20 @@@ msgstr "
"Pokrivenost bojom (kao suprotnost prozirnosti) teksta, koji će biti "
"predoÄavan na video slici. 0 = prozirno, 255 = posve neprozirno."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Zadana boja teksta"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24458,12 -24588,12 +26084,20 @@@ msgstr "
"zeleno a onda plavo. #000000 = crno, #FF0000 = crveno, #00FF00 = zeleno, "
"#FFFF00 = žuto (crveno + zeleno), #FFFFFF = bijelo."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Razmjerna veliÄina fonta"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24473,59 -24603,59 +26107,111 @@@ msgstr "
"slici. Ukoliko se postavi apsolutna veliÄina fonta, razmjerna veliÄina će "
"biti nadomještena."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Neprozirnost pozadine"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Boja pozadine"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Neprozirnost obrisa"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Neprozirnost sjenke"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Boja sjenke"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Kut sjenke"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Odmak sjenke"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Neprozirnost pozadine"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Boja pozadine"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Neprozirnost obrisa"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Neprozirnost sjenke"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Boja sjenke"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Kut sjenke"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Odmak sjenke"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Manja"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Mala"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Velika"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Veća"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Koristi prikazivaÄ YUVP-a"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Koristi prikazivaÄ YUVP-a"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24533,23 -24663,23 +26219,43 @@@ msgstr "
"UobliÄava prikaz fontova pomoću \"paletiziranog YUV-a\". Ova mogućnost je "
"neophodna samo ukoliko želite kodirati u podnaslove DVB-a."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Tanko"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Debelo"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "PrikazivaÄ teksta"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "PrikazivaÄ fontova Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Tanko"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Debelo"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "PrikazivaÄ teksta"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "PrikazivaÄ fontova Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -24720,7 -24850,7 +26426,11 @@@ msgstr "
#: modules/video_filter/anaglyph.c:72
msgid "Convert 3D picture to anaglyph image video filter"
++<<<<<<< HEAD
+msgstr "Pretvori 3D sliku u video filtar stereoskopske slike "
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/antiflicker.c:50
msgid "Window size"
@@@ -26230,8 -26360,9 +27940,14 @@@ msgstr "
"$U = izdavaÄ, $V = jaÄina glasnoće, $_ = novi redak) "
#: modules/video_filter/marq.c:104
++<<<<<<< HEAD
+msgid "Text file"
+msgstr "Tekstualna datoteka"
++=======
+ #, fuzzy
+ msgid "Text file"
+ msgstr "Datoteka kazala"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:105
msgid "File to read the marquee text from."
@@@ -26968,8 -27099,9 +28684,14 @@@ msgid "Select game mode variation from
msgstr ""
#: modules/video_filter/puzzle.c:57
++<<<<<<< HEAD
+msgid "Border"
+msgstr "Rubovi"
++=======
+ #, fuzzy
+ msgid "Border"
+ msgstr "Å irina rubova"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:58
#, fuzzy
@@@ -26983,15 -27115,15 +28705,27 @@@ msgstr "Brzina lopte
#: modules/video_filter/puzzle.c:60
msgid "Show small preview."
++<<<<<<< HEAD
+msgstr "Prikaži mali pretpregled."
+
+#: modules/video_filter/puzzle.c:61
+msgid "Small preview size"
+msgstr "VeliÄina malog pretpregleda"
+
+#: modules/video_filter/puzzle.c:62
+msgid "Show small preview size (percent of source)."
+msgstr "Prikaži veliÄinu malog pretpregleda (u postotcima izvora)"
++=======
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:61
+ msgid "Small preview size"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:62
+ msgid "Show small preview size (percent of source)."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:63
msgid "Piece edge shape size"
@@@ -27020,8 -27152,9 +28754,14 @@@ msgid "Auto solve delay during game
msgstr ""
#: modules/video_filter/puzzle.c:69
++<<<<<<< HEAD
+msgid "Rotation"
+msgstr "Rotacija"
++=======
+ #, fuzzy
+ msgid "Rotation"
+ msgstr "Omjer"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:70
msgid "Rotation parameter: none;180;90-270;mirror"
@@@ -27029,19 -27162,19 +28769,35 @@@ msgstr "
#: modules/video_filter/puzzle.c:73
msgid "jigsaw puzzle"
++<<<<<<< HEAD
+msgstr "obiÄna slagalica"
+
+#: modules/video_filter/puzzle.c:73
+msgid "sliding puzzle"
+msgstr "klizna slagalica"
+
+#: modules/video_filter/puzzle.c:73
+msgid "swap puzzle"
+msgstr "preklopna slagalica"
+
+#: modules/video_filter/puzzle.c:73
+msgid "exchange puzzle"
+msgstr "izmjenjiva slagalica"
++=======
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:73
+ msgid "sliding puzzle"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:73
+ msgid "swap puzzle"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:73
+ msgid "exchange puzzle"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:75
msgid "0"
@@@ -27168,8 -27301,9 +28924,14 @@@ msgid "Angle in degrees (0 to 359)
msgstr "Kut u stupnjevima (0 do 359)"
#: modules/video_filter/rotate.c:56
++<<<<<<< HEAD
+msgid "Use motion sensors"
+msgstr "Koristi senzore pokreta"
++=======
+ #, fuzzy
+ msgid "Use motion sensors"
+ msgstr "Vektori vizualizacije pokreta"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/rotate.c:66
msgid "Rotate video filter"
@@@ -27394,6 -27528,7 +29156,10 @@@ msgid "Sharpen video filter
msgstr "Izoštravanja slike"
#: modules/video_filter/subsdelay.c:45
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Change subtitle delay"
msgstr "Izmijeni odgodu podnaslova"
@@@ -27635,9 -27770,10 +29401,16 @@@ msgid "Chroma used
msgstr "Korištena obojenost"
#: modules/video_output/androidsurface.c:51
++<<<<<<< HEAD
+msgid "Force use of a specific chroma for output. Default is RGB32."
+msgstr ""
+"Za izlaz možete nametnuti korištenje posebne obojenosti. Zadano je RGB32."
++=======
+ #, fuzzy
+ msgid "Force use of a specific chroma for output. Default is RGB32."
+ msgstr ""
+ "Za izlaz možete nametnuti korištenje posebne obojenosti. Zadano je I420."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/androidsurface.c:62
msgid "Android Surface video output"
@@@ -27648,17 -27784,21 +29421,35 @@@ msgid "Color ASCII art video output
msgstr "Izlaz video slike pomoću obojanog znakovlja ASCII"
#: modules/video_output/decklink.cpp:69
++<<<<<<< HEAD
+msgid "Output card"
+msgstr "Kartica izlaza"
+
+#: modules/video_output/decklink.cpp:71
+msgid "DeckLink output card, if multiple exist. The cards are numbered from 0."
+msgstr ""
+"Izlazna kartica DeckLink, ako ih imate više. Kartice su znamenkovane od 0."
+
+#: modules/video_output/decklink.cpp:74
+msgid "Desired output mode"
+msgstr "Željeni naÄin izlaza"
++=======
+ #, fuzzy
+ msgid "Output card"
+ msgstr "Izlazni prikljuÄak"
+
+ #: modules/video_output/decklink.cpp:71
+ #, fuzzy
+ msgid "DeckLink output card, if multiple exist. The cards are numbered from 0."
+ msgstr ""
+ "Kartica za snimanje DeckLinkom koja će se koristiti, ako ih imate više. "
+ "Kartice su, poÄevÅ¡i od 0, oznaÄene znamenkama."
+
+ #: modules/video_output/decklink.cpp:74
+ #, fuzzy
+ msgid "Desired output mode"
+ msgstr "Željena vrsta video ulaza"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:76
#, fuzzy
@@@ -27670,15 -27810,17 +29461,29 @@@ msgstr "
"biti neki FourCC kôd u tekstualnom obliku , na pr. \"ntsc\"."
#: modules/video_output/decklink.cpp:82
++<<<<<<< HEAD
+msgid "Audio connection for DeckLink output."
+msgstr "Audio veza za izlaz DeckLinka."
+
+#: modules/video_output/decklink.cpp:87
+msgid ""
+"Audio sampling rate (in hertz) for DeckLink output. 0 disables audio output."
+msgstr ""
+"Stopa uzorkovanja zvuka (u Hertzima) za izlaz DeckLinka. 0 onemogućava izlaz "
+"zvuka."
++=======
+ #, fuzzy
+ msgid "Audio connection for DeckLink output."
+ msgstr "Audio veza"
+
+ #: modules/video_output/decklink.cpp:87
+ #, fuzzy
+ msgid ""
+ "Audio sampling rate (in hertz) for DeckLink output. 0 disables audio output."
+ msgstr ""
+ "Stopa uzorkovanja zvuka (u Hertzima) za snimanje DeckLinkom. 0 onemogućava "
+ "ulaz zvuka."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:92
#, fuzzy
@@@ -27690,16 -27832,18 +29495,28 @@@ msgstr "
"onemogućava ulaz zvuka."
#: modules/video_output/decklink.cpp:97
++<<<<<<< HEAD
+msgid "Video connection for DeckLink output."
+msgstr "Video veza za izlaz DeckLinka."
++=======
+ #, fuzzy
+ msgid "Video connection for DeckLink output."
+ msgstr "Video veza"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:101
msgid "Use 10 bits per pixel for video frames."
msgstr ""
#: modules/video_output/decklink.cpp:174
++<<<<<<< HEAD
+msgid "DecklinkOutput"
+msgstr "Izlaz DeckLinka"
++=======
+ #, fuzzy
+ msgid "DecklinkOutput"
+ msgstr "DeckLink"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:175
msgid "output module to write to Blackmagic SDI card"
@@@ -27710,16 -27854,19 +29527,32 @@@ msgid "Decklink General Options
msgstr ""
#: modules/video_output/decklink.cpp:181
++<<<<<<< HEAD
+msgid "Decklink Video Output module"
+msgstr "Modul izlaza slike DeckLinka"
+
+#: modules/video_output/decklink.cpp:186
+msgid "Decklink Video Options"
+msgstr "Video mogućnosti DeckLinka"
+
+#: modules/video_output/decklink.cpp:197
+msgid "Decklink Audio Output module"
+msgstr "Modul izlaza zvuka DeckLinka"
++=======
+ #, fuzzy
+ msgid "Decklink Video Output module"
+ msgstr "Modul izlaza video slike"
+
+ #: modules/video_output/decklink.cpp:186
+ #, fuzzy
+ msgid "Decklink Video Options"
+ msgstr "Razne mogućnosti"
+
+ #: modules/video_output/decklink.cpp:197
+ #, fuzzy
+ msgid "Decklink Audio Output module"
+ msgstr "Modul izlaza zvuka"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:202
msgid "Decklink Audio Options"
@@@ -27868,16 -28015,18 +29701,28 @@@ msgid "GLX
msgstr "GLX"
#: modules/video_output/glx.c:43
++<<<<<<< HEAD
+msgid "GLX extension for OpenGL"
+msgstr "Proširenje GLX za OpenGL"
++=======
+ #, fuzzy
+ msgid "GLX extension for OpenGL"
+ msgstr "Proširenje EGL za OpenGL"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/ios.m:66
msgid "iOS OpenGL ES video output (requires UIView)"
msgstr "Video izlaz iOS OpenGL ES (iziskuje UIView)"
#: modules/video_output/ios2.m:72
++<<<<<<< HEAD
+msgid "iOS OpenGL video output"
+msgstr "Video izlaz iOS OpenGL"
++=======
+ #, fuzzy
+ msgid "iOS OpenGL video output"
+ msgstr "Video izlaz OpenGL"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:50 modules/gui/qt4/ui/sprefs_video.h:352
msgid "Enable a workaround for T23"
@@@ -27957,8 -28106,9 +29802,14 @@@ msgid "Use hardware blending support
msgstr "Koristi sklopovsku podršku stapanja"
#: modules/video_output/msw/direct3d.c:61
++<<<<<<< HEAD
+msgid "Try to use hardware acceleration for subtitle/OSD blending."
+msgstr "Pokušaj koristiti sklopovsko ubrzanje za stapanja podnaslova/OSD-a."
++=======
+ #, fuzzy
+ msgid "Try to use hardware acceleration for subtitle/OSD blending."
+ msgstr "Pokušava koristiti sklopovsko ubrzavanje za stapanja podnaslova/OSD-a."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/msw/direct3d.c:63
msgid "Recommended video output for Windows Vista and later versions"
@@@ -28503,12 -28653,14 +30354,23 @@@ msgid "Output
msgstr "Izlaz"
#: share/lua/http/dialogs/create_stream.html:193
++<<<<<<< HEAD
+msgid "Subtitle codec"
+msgstr "Kodek podnaslova"
+
+#: share/lua/http/dialogs/create_stream.html:200
+msgid "Output\tmethod"
+msgstr "Izlaz\tmetoda"
++=======
+ #, fuzzy
+ msgid "Subtitle codec"
+ msgstr "Kodeki podnaslova"
+
+ #: share/lua/http/dialogs/create_stream.html:200
+ #, fuzzy
+ msgid "Output\tmethod"
+ msgstr "NaÄin izlaza"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:249
msgid "Multiplexer"
@@@ -28519,25 -28671,30 +30381,51 @@@ msgid "Video FPS
msgstr "FPS video zapisa"
#: share/lua/http/dialogs/create_stream.html:297
++<<<<<<< HEAD
+msgid "MUX options"
+msgstr "Mogućnosti MUX-a"
+
+#: share/lua/http/dialogs/create_stream.html:303
+msgid "Video scale"
+msgstr "Stupnjevanje videa"
+
+#: share/lua/http/dialogs/create_stream.html:330
+#: share/lua/http/dialogs/create_stream.html:374
++=======
+ #, fuzzy
+ msgid "MUX options"
+ msgstr "Mogućnosti DMX-a"
+
+ #: share/lua/http/dialogs/create_stream.html:303
+ #, fuzzy
+ msgid "Video scale"
+ msgstr "Stupnjevanje video zapisa"
+
+ #: share/lua/http/dialogs/create_stream.html:330
+ #: share/lua/http/dialogs/create_stream.html:374
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Output port"
msgstr "Izlazni prikljuÄak"
#: share/lua/http/dialogs/create_stream.html:338
++<<<<<<< HEAD
+msgid "Output\tfile"
+msgstr "Izlaz\tdatoteka"
+
+#: share/lua/http/dialogs/create_stream.html:355
+msgid "Input media"
+msgstr "Ulazni mediji"
++=======
+ #, fuzzy
+ msgid "Output\tfile"
+ msgstr "Izlazna datoteka"
+
+ #: share/lua/http/dialogs/create_stream.html:355
+ #, fuzzy
+ msgid "Input media"
+ msgstr "Ulazni medij"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:367
msgid "Error:"
@@@ -28548,6 -28705,7 +30436,10 @@@ msgid "Sample ui-state-error style.
msgstr "Uzorak stila pogreÅ¡ke u stanju korisniÄkog suÄelja."
#: share/lua/http/dialogs/create_stream.html:390
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "File name"
msgstr "Naziv datoteke"
@@@ -28557,12 -28715,14 +30449,22 @@@ msgid "Preamp:
msgstr "PretpojaÄalo:"
#: share/lua/http/dialogs/mosaic_window.html:104
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Row border"
msgstr "Rub retka"
#: share/lua/http/dialogs/mosaic_window.html:122
++<<<<<<< HEAD
+msgid "Column border"
+msgstr "Rub stupca"
++=======
+ #, fuzzy
+ msgid "Column border"
+ msgstr "rub stupca"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/mosaic_window.html:133
msgid "Background"
@@@ -28602,36 -28762,43 +30504,73 @@@ msgid "Hide / Show Viewer
msgstr "Prikaži / sakrij Preglednik"
#: share/lua/http/index.html:217
++<<<<<<< HEAD
+msgid "Manage Streams"
+msgstr "Upravljanje strujanjem"
+
+#: share/lua/http/index.html:218
+msgid "Track Synchronisation"
+msgstr "Usklađivanje zapisa"
+
+#: share/lua/http/index.html:220
+msgid "VLM Batch Commands"
+msgstr "VLM-ove skupne naredbe"
++=======
+ #, fuzzy
+ msgid "Manage Streams"
+ msgstr "Strujanje"
+
+ #: share/lua/http/index.html:218
+ #, fuzzy
+ msgid "Track Synchronisation"
+ msgstr "&Usklađivanje tragova"
+
+ #: share/lua/http/index.html:220
+ #, fuzzy
+ msgid "VLM Batch Commands"
+ msgstr "Naredbe"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:240 modules/gui/qt4/ui/vlm.h:298
msgid "Loop"
msgstr "Petlja"
#: share/lua/http/index.html:242
++<<<<<<< HEAD
+msgid "Empty Playlist"
+msgstr "Prazan popis za izvođenje"
+
+#: share/lua/http/index.html:243
+msgid "Queue Selected"
+msgstr "Stavi odabrano u red Äekanja"
+
+#: share/lua/http/index.html:244
+msgid "Play Selected"
+msgstr "Izvedi odabrano"
+
+#: share/lua/http/index.html:245
+msgid "Refresh List"
+msgstr "Obnovi popis"
++=======
+ #, fuzzy
+ msgid "Empty Playlist"
+ msgstr "Spisak izvođenja"
+
+ #: share/lua/http/index.html:243
+ #, fuzzy
+ msgid "Queue Selected"
+ msgstr "Nije odabrana ni jedna datoteka"
+
+ #: share/lua/http/index.html:244
+ #, fuzzy
+ msgid "Play Selected"
+ msgstr "Izvođenje"
+
+ #: share/lua/http/index.html:245
+ #, fuzzy
+ msgid "Refresh List"
+ msgstr "Osvježiti spisak"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:252
msgid "Loading flowplayer..."
@@@ -28693,8 -28860,9 +30632,14 @@@ msgstr "
"opet na gumb <i>Otvori strujanje</i>."
#: share/lua/http/index.html:278
++<<<<<<< HEAD
+msgid "Are you sure you wish to create the stream?"
+msgstr "Jeste li sigurni da želite stvoriti to strujanje?"
++=======
+ #, fuzzy
+ msgid "Are you sure you wish to create the stream?"
+ msgstr "Jeste li sigurni da želite stvoriti strujanje?"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/about.h:287 modules/gui/qt4/ui/open.h:242
#: modules/gui/qt4/ui/podcast_configuration.h:100
@@@ -28723,12 -28891,14 +30668,23 @@@ msgid "0.00 dB
msgstr "0.00 dB"
#: modules/gui/qt4/ui/messages_panel.h:139
++<<<<<<< HEAD
+msgid "&Verbosity:"
+msgstr "&Opširnost:"
+
+#: modules/gui/qt4/ui/messages_panel.h:140
+msgid "&Filter:"
+msgstr "&Filtar:"
++=======
+ #, fuzzy
+ msgid "&Verbosity:"
+ msgstr "Opširnost:"
+
+ #: modules/gui/qt4/ui/messages_panel.h:140
+ #, fuzzy
+ msgid "&Filter:"
+ msgstr "Filtar:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/messages_panel.h:141
msgid "&Save as..."
@@@ -28843,10 -29013,12 +30799,18 @@@ msgid "Audio and Subtitles
msgstr "Zvuk i podnaslovi"
#: modules/gui/qt4/ui/open_file.h:143
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Use a sub&title file"
msgstr "Koristi datoteku pod&naslova"
#: modules/gui/qt4/ui/open_file.h:145
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Select the subtitle file"
msgstr "Odaberite datoteku podnaslova"
@@@ -28875,8 -29047,9 +30839,14 @@@ msgid "Please enter a network URL:
msgstr "Unesite mrežni URL:"
#: modules/gui/qt4/ui/profiles.h:686
++<<<<<<< HEAD
+msgid "Profile edition"
+msgstr "Izdanje profila"
++=======
+ #, fuzzy
+ msgid "Profile edition"
+ msgstr "Nedostaje naziv profila"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:687
msgid "MPEG-TS"
@@@ -28931,56 -29104,66 +30901,110 @@@ msgid "AVI
msgstr "AVI"
#: modules/gui/qt4/ui/profiles.h:700
++<<<<<<< HEAD
+msgid "Features"
+msgstr "ZnaÄajke"
+
+#: modules/gui/qt4/ui/profiles.h:702
+msgid "Streamable"
+msgstr "Mogućnost strujanja"
+
+#: modules/gui/qt4/ui/profiles.h:703
+msgid "Chapters"
+msgstr "Poglavlja"
+
+#: modules/gui/qt4/ui/profiles.h:706
+msgid "Menus"
+msgstr "Izbornici"
+
+#: modules/gui/qt4/ui/profiles.h:714
+msgid "Same as source"
+msgstr "Isto kao i izvor"
++=======
+ #, fuzzy
+ msgid "Features"
+ msgstr "Geste"
+
+ #: modules/gui/qt4/ui/profiles.h:702
+ #, fuzzy
+ msgid "Streamable"
+ msgstr "Naziv strujanja"
+
+ #: modules/gui/qt4/ui/profiles.h:703
+ #, fuzzy
+ msgid "Chapters"
+ msgstr "Poglavlje"
+
+ #: modules/gui/qt4/ui/profiles.h:706
+ #, fuzzy
+ msgid "Menus"
+ msgstr "Izbornik"
+
+ #: modules/gui/qt4/ui/profiles.h:714
+ #, fuzzy
+ msgid "Same as source"
+ msgstr "Podizvor logotipa"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:716
msgid " fps"
msgstr " fps"
#: modules/gui/qt4/ui/profiles.h:717
++<<<<<<< HEAD
+msgid "Custom options"
+msgstr "KorisniÄke postavke"
++=======
+ #, fuzzy
+ msgid "Custom options"
+ msgstr "Korisnikov popis omjera obrezivanja"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:718
msgid "Quality"
msgstr "Kakvoća"
#: modules/gui/qt4/ui/profiles.h:719 modules/gui/qt4/ui/profiles.h:720
++<<<<<<< HEAD
+msgid "Not Used"
+msgstr "Nije korišteno"
++=======
+ #, fuzzy
+ msgid "Not Used"
+ msgstr "Nije postavljeno"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:721 modules/gui/qt4/ui/profiles.h:740
msgid " kb/s"
msgstr " kb/s"
#: modules/gui/qt4/ui/profiles.h:722 modules/gui/qt4/ui/profiles.h:742
++<<<<<<< HEAD
+msgid "Encoding parameters"
+msgstr "Parametri kodiranja"
+
+#: modules/gui/qt4/ui/profiles.h:725
+msgid "Frame size"
+msgstr "VeliÄina okvira"
+
+#: modules/gui/qt4/ui/profiles.h:728 modules/gui/qt4/ui/profiles.h:731
+msgid "px"
+msgstr "px"
++=======
+ #, fuzzy
+ msgid "Encoding parameters"
+ msgstr "Kodiranje smjernice X"
+
+ #: modules/gui/qt4/ui/profiles.h:725
+ #, fuzzy
+ msgid "Frame size"
+ msgstr "Stopa protoka okvira"
+
+ #: modules/gui/qt4/ui/profiles.h:728 modules/gui/qt4/ui/profiles.h:731
+ #, fuzzy
+ msgid "px"
+ msgstr " px"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:741
msgid "Sample Rate"
@@@ -28995,8 -29178,9 +31019,14 @@@ msgid "Destination Setup
msgstr "Postavljanje odredišta"
#: modules/gui/qt4/ui/sout.h:206
++<<<<<<< HEAD
+msgid "Select destinations to stream to"
+msgstr "Odaberite odredište prema kojem će teći strujanje"
++=======
+ #, fuzzy
+ msgid "Select destinations to stream to"
+ msgstr "Odaberite strujanje"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sout.h:207
msgid ""
@@@ -29015,12 -29199,14 +31045,22 @@@ msgid "Display locally
msgstr "Prikaži lokalno"
#: modules/gui/qt4/ui/sout.h:212
++<<<<<<< HEAD
++=======
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Transcoding Options"
msgstr "Mogućnosti prekodiranja"
#: modules/gui/qt4/ui/sout.h:213
++<<<<<<< HEAD
+msgid "Select and choose transcoding options"
+msgstr "Birajte i odaberite mogućnosti prekodiranja"
++=======
+ #, fuzzy
+ msgid "Select and choose transcoding options"
+ msgstr "Mogućnosti strujanja i prekodiranja"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sout.h:214
msgid "Activate Transcoding"
@@@ -29482,7 -29668,7 +31522,11 @@@ msgstr "Zrcalo
#: modules/gui/qt4/ui/video_effects.h:1400
msgid "Anaglyph 3D"
++<<<<<<< HEAD
+msgstr "Stereoskopijska 3D"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:286
msgid "VLM configurator"
@@@ -29735,14 -29921,6 +31779,17 @@@ msgstr "Popis medijskog upravitelja
#~ msgid "Audio visualizations "
#~ msgstr "Vizualizacije zvuka"
++<<<<<<< HEAD
+#~ msgid ""
+#~ "This file countains an optional CRL to prevent remove clients from using "
+#~ "revoked certificates in TLS sessions."
+#~ msgstr ""
+#~ "Ta datoteka sadrži opcionalni CRL (potvrde za opoziv HTTP-a/TLS-a) da bi "
+#~ "zaštitila klijente od uporabe opozvanih potvrda tijekom jednog zasjedanja "
+#~ "TLS-a."
+
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Control SAP flow"
#~ msgstr "Nadzor toka SAP-a"
@@@ -33077,7 -33255,7 +35124,11 @@@
#~ "<p><i>VideoLAN</i> prefers when applications request authorization before "
#~ "accessing Internet.</p>\n"
#~ "<p><b>VLC media player</b> can get information from the Internet in order "
++<<<<<<< HEAD
+#~ "to get <b>media informations</b> or to check for available <b>updates</b>."
++=======
+ #~ "to get <b>media information</b> or to check for available <b>updates</b>."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "</p>\n"
#~ "<p><i>VLC media player</i> <b>doesn't</b> send or collect any "
#~ "information, even anonymously, about your usage.</p>\n"
diff --combined po/hu.po
index 21a7508,85359a2..5125e67
--- a/po/hu.po
+++ b/po/hu.po
@@@ -4,14 -4,13 +4,23 @@@
#
# Translators:
# Gabor Kelemen <kelemeng at gnome dot hu>, 2005-2013
++<<<<<<< HEAD
+# isc _ <iscreamd at gmail.com>, 2013
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-08 08:17+0000\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-10-25 15:37+0000\n"
+ "Last-Translator: kelemeng <kelemeng at gnome.hu>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Hungarian (http://www.transifex.com/projects/p/vlc-trans/"
"language/hu/)\n"
"Language: hu\n"
@@@ -141,7 -140,7 +150,11 @@@ msgstr "Egyéb hangbeállÃtások és m
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -491,10 -490,10 +504,17 @@@ msgid "&About
msgstr "&Névjegy"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -533,17 -532,17 +553,29 @@@ msgid "Save...
msgstr "Mentés…"
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Összes ismétlése"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Egy szám ismétlése"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -650,7 -649,7 +682,11 @@@ msgstr "A szűrők legnagyobb száma (%
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Tiltás"
@@@ -1354,20 -1353,20 +1390,36 @@@ msgstr "Képkockasebesség
msgid "Decoded format"
msgstr "Dekódolt formátum"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "A bemenet nem nyitható meg"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "A bemenet nem nyitható meg"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "A VLC nem képes megnyitni a(z) „%s†MRL-t."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "A VLC nem ismerte fel a bemenet formátumát"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "A VLC nem ismerte fel a bemenet formátumát"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1801,7 -1800,7 +1853,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1890,7 -1889,7 +1946,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Semmi"
@@@ -1920,7 -1919,7 +1980,11 @@@ msgstr "
"Itt adható meg a VLC által használt videokimeneti mód. Alapértelmezésben a "
"VLC kiválasztja a legjobb módot."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Video engedélyezése"
@@@ -2130,7 -2129,7 +2194,11 @@@ msgstr "
"használni."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Mindig felül"
@@@ -2185,7 -2184,7 +2253,11 @@@ msgstr "A kurzor és a teljesméret-vez
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2194,7 -2193,7 +2266,11 @@@ msgstr "Váltottsorosság megszünteté
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Váltottsorosság-mentesÃtési mód"
@@@ -2252,7 -2251,7 +2328,11 @@@ msgstr "
"Korlátozza az energiakezelÅ‘ démont lejátszáskor, Ãgy megakadályozza a "
"számÃtógép inaktivitás miatti felfüggesztését."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Ablakdekorációk"
@@@ -2453,7 -2452,7 +2533,11 @@@ msgstr "
"képpontokkal rendelkezik (1:1). Ha 16:9 arányú képernyővel rendelkezik, "
"akkor ezt módosÃtsa 4:3-ra az arányok megtartása érdekében."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Képkockák kihagyása"
@@@ -2600,12 -2599,12 +2684,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2613,7 -2612,7 +2706,11 @@@ msgid "Default
msgstr "Alapértelmezett"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2964,7 -2963,7 +3061,11 @@@ msgid "You can completely disable the s
msgstr "Teljesen letilthatja az alkép-feldolgozást."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3924,7 -3923,7 +4025,11 @@@ msgstr "
"Ezek a beállÃtások a globális VLC billentyű-hozzárendelések, gyorsbillentyű "
"néven is ismertek."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Mellőzés"
@@@ -3950,8 -3949,8 +4055,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4036,10 -4035,10 +4146,17 @@@ msgid "Slower (fine)
msgstr "Lassabban (kicsivel)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4054,10 -4053,10 +4171,17 @@@ msgstr "
"gyorsbillentyűt."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Előző"
@@@ -4068,9 -4067,9 +4192,15 @@@ msgstr "
"Válassza ki a lejátszólista előző elemére ugráshoz használandó "
"gyorsbillentyűt."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4322,9 -4321,9 +4452,15 @@@ msgid "Select the key to decrease audi
msgstr "Válassza ki a hangerő csökkentéséhez használandó billentyűt."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "NémÃtás"
@@@ -4755,7 -4754,7 +4891,11 @@@ msgstr "Körbelépkedés az elérhető
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Pillanatkép"
@@@ -4962,12 -4961,12 +5102,21 @@@ msgstr "Letöltés…
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Mégse"
@@@ -5733,7 -5732,7 +5882,11 @@@ msgstr "Levágás
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Méretarány"
@@@ -8234,7 -8233,7 +8387,11 @@@ msgstr "Képernyőbemenet
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Képernyő"
@@@ -8990,7 -8989,7 +9147,11 @@@ msgstr "Max kötet #
msgid "Volume Set"
msgstr "HangerÅ‘ beállÃtása"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10180,7 -10179,7 +10341,11 @@@ msgstr "Térhatású 7.1
msgid "ALSA audio output"
msgstr "ALSA hangkimenet"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "A hangkimenet meghiúsult"
@@@ -10213,7 -10212,7 +10378,11 @@@ msgstr "AudioQueue (iOS / Mac OS) hangk
msgid "Android AudioTrack audio output"
msgstr "Android AudioTrack videokimenet"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "iOS AudioUnit kimenet"
@@@ -10221,22 -10220,22 +10390,38 @@@
msgid "Last audio device"
msgstr "Utolsó hangeszköz"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit kimenet"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit kimenet"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"A kijelölt hangkimeneti eszközt már kizárólagosan használja egy másik "
"program."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "A hangeszköz nincs beállÃtva"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "A hangeszköz nincs beállÃtva"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10244,11 -10243,11 +10429,19 @@@ msgstr "
"A hangszóró-elrendezést az /Alkalmazások/Kellékek menüpont alatt a „Midi "
"hangbeállÃtó†használatával állÃtsa be. A VLC most csak sztereó kimenetet ad."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Rendszer-hangkimeneti eszköz"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Rendszer-hangkimeneti eszköz"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (kódolt kimenet)"
@@@ -11531,46 -11530,46 +11724,74 @@@ msgstr "Ãrnyék
msgid "Outline"
msgstr "Körvonal"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Fekete"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Szürke"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Ezüst"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Fehér"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Gesztenyebarna"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Vörös"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11578,61 -11577,61 +11799,97 @@@ msgid "Fuchsia
msgstr "Fukszia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Sárga"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "OlÃvazöld"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Zöld"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Kékeszöld"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Élénkzöld"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Lila"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Tengerészkék"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Kék"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11787,7 -11786,7 +12044,11 @@@ msgstr "Feliratok (speciális)
msgid "Subtitle renderers using libass"
msgstr "Libass-t használó feliratmegjelenÃtÅ‘k"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Betűkészlet-gyorsÃtótár épÃtése"
@@@ -13752,10 -13751,10 +14013,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Hagyományos"
@@@ -13864,8 -13863,8 +14132,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus vezérlőfelület"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14069,7 -14068,7 +14342,11 @@@ msgstr "
#: modules/control/hotkeys.c:1034
#, c-format
msgid "Subtitle position %d px"
++<<<<<<< HEAD
+msgstr "Felirat pozÃció %d px"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:1168
#, c-format
@@@ -14218,9 -14217,9 +14495,15 @@@ msgstr "ElÅ‘készÃtés
msgid "Opening"
msgstr "Megnyitás"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Szünet"
@@@ -16166,7 -16165,7 +16449,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG továbbÃtó műsorszétválasztó"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -16345,7 -16344,7 +16632,11 @@@ msgid "VLC media player Help
msgstr "VLC médialejátszó súgó"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Tárgymutató"
@@@ -16433,9 -16432,9 +16724,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Mentés"
@@@ -16580,7 -16579,7 +16877,11 @@@ msgstr "
"A könyvjelzők működéséhez a műsornak lejátszás vagy szüneteltetett "
"állapotban kell lennie."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Ugrás időpontra"
@@@ -16600,7 -16599,7 +16901,11 @@@ msgstr "
msgid "Backward"
msgstr "Vissza"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16610,7 -16609,7 +16915,11 @@@ msgstr "
msgid "Forward"
msgstr "Előre"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16630,84 -16629,84 +16939,155 @@@ msgstr "Teljes képernyős üzemmód
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Lejátszólista megjelenÃtése/elrejtése"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Lejátszólista megjelenÃtése/elrejtése"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Ismétlés"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Véletlen sorrend"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Véletlen sorrend"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Teljes hangerő"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Teljes hangerő"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Hatások"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16743,7 -16742,7 +17123,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16928,8 -16927,8 +17312,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Egyéni"
@@@ -17031,36 -17030,36 +17420,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Nem található összeomlási napló"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Nem található összeomlási napló"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Folytatás"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Nincs nyoma korábbi összeomlásnak."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "EltávolÃtja a régi beállÃtásokat?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "A VLC beállÃtásfájljának régebbi változata is megtalálható."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Ãthelyezés a Lomtárba és a VLC újraindÃtása"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Nincs nyoma korábbi összeomlásnak."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "EltávolÃtja a régi beállÃtásokat?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "A VLC beállÃtásfájljának régebbi változata is megtalálható."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Ãthelyezés a Lomtárba és a VLC újraindÃtása"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -17227,7 -17226,7 +17648,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr "A felület megváltoztathatja az ikonját különböző alkalmakkor."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Méretarány zárolása"
@@@ -17356,7 -17355,7 +17781,11 @@@ msgstr "A VLC elrejtése
msgid "Hide Others"
msgstr "Egyebek elrejtése"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Összes megjelenÃtése"
@@@ -17441,15 -17440,15 +17870,27 @@@ msgstr "Sávszinkronizálás
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Kilépés a lejátszás után"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Előrelépés"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Kilépés a lejátszás után"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Előrelépés"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Visszalépés"
@@@ -17465,30 -17464,30 +17906,56 @@@ msgstr "Hangerő csökkentése
msgid "Audio Device"
msgstr "Hangeszköz"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Fél méret"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Normál méret"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dupla méret"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "KépernyÅ‘höz igazÃtás"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Fél méret"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Normál méret"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dupla méret"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "KépernyÅ‘höz igazÃtás"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Lebegés felül"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Teljes képernyős videoeszköz"
@@@ -17497,7 -17496,7 +17964,11 @@@
msgid "Post processing"
msgstr "Utófeldolgozás"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -17725,7 -17724,7 +18196,11 @@@ msgid "Play another media synchronously
msgstr "Másik média lejátszása szinkronban"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Kiválasztás…"
@@@ -17909,7 -17908,7 +18384,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Betűméret"
@@@ -18138,12 -18137,12 +18617,20 @@@ msgstr "Hiba a metaadatok mentésekor
msgid "VLC was unable to save the meta data."
msgstr "A VLC nem tudta elmenteni a metaadatokat."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "BeállÃtások"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Összes alaphelyzetbe"
@@@ -18322,129 -18321,125 +18809,237 @@@ msgstr "Growl értesÃtések engedélye
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Alapértelmezett kódolás"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "MegjelenÃtési beállÃtások"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Alapértelmezett kódolás"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "MegjelenÃtési beállÃtások"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Betűkészlet szÃne"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Betűkészlet"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OSD engedélyezése"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OSD engedélyezése"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Ãtlátszatlanság"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Félkövér kényszerÃtése"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Félkövér kényszerÃtése"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Körvonal szÃne"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Körvonal vastagsága"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Fekete képernyő teljes képernyőn"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Fekete képernyő teljes képernyőn"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "MegjelenÃtés"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Kimeneti modul"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Videó pillanatképek"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Mappa"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Formátum"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Előtag"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Egymást követő számozás"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Utolsó ellenőrzés ideje: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Még nem történt ellenőrzés."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Kimeneti modul"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Videó pillanatképek"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Mappa"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Formátum"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Előtag"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Egymást követő számozás"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Utolsó ellenőrzés ideje: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Még nem történt ellenőrzés."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Legkisebb késleltetés"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Kis késleltetés"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Nagy késleltetés"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Nagyobb késleltetés"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "BeállÃtások visszaállÃtása"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18457,20 -18452,20 +19052,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Válassza ki a video-pillanatképek mentési mappáját."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Válasszon"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Válassza ki a felvételek tárolására használandó könyvtárt vagy fájlt."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Válassza ki a video-pillanatképek mentési mappáját."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Válasszon"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Válassza ki a felvételek tárolására használandó könyvtárt vagy fájlt."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18478,16 -18473,16 +19090,29 @@@ msgstr "
"Nyomja meg a következő új billentyűit:\n"
" „%@â€"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Érvénytelen kombináció"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Sajnos ezek a billentyűk nem oszthatók ki gyorsbillentyűkként."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Érvénytelen kombináció"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Sajnos ezek a billentyűk nem oszthatók ki gyorsbillentyűkként."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Ezt a kombinációt már használja a következÅ‘: „%@â€."
@@@ -20560,20 -20555,20 +21185,36 @@@ msgstr "Kijelölt profil eltávolÃtás
msgid "Create a new profile"
msgstr "Új profil létrehozása"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Létrehozás"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "A profil neve hiányzik"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "A profil neve hiányzik"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Meg kell adni a profil nevét."
@@@ -24093,23 -24088,23 +24734,43 @@@ msgstr "Ãtkódolás műsorkimenet
msgid "Overlays/Subtitles"
msgstr "Ãtfedések/feliratok"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "A használandó betűkészlet betűkészlet-családjának neve"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "A használandó betűkészlet betűkészletfájlja"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "A betűkészlet mérete képpontban"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "A használandó betűkészlet betűkészlet-családjának neve"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "A használandó betűkészlet betűkészletfájlja"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "A betűkészlet mérete képpontban"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24119,11 -24114,11 +24780,19 @@@ msgstr "
"eltérÅ‘ értéket állÃt be, akkor ez a beállÃtás felülÃrja a viszonylagos "
"betűméretet."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Szöveg átlátszatlansága"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Szöveg átlátszatlansága"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24131,12 -24126,12 +24800,20 @@@ msgstr "
"A képen megjelenÃtett szöveg átlátszatlansága. 0 = átlátszó, 255 = teljesen "
"átlátszatlan."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Szöveg alapértelmezett szÃne"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24150,12 -24145,12 +24827,20 @@@ msgstr "
"fekete, #FF0000 = vörös, #00FF00 = zöld, #FFFF00 = sárga (vörös + zöld), "
"#FFFFFF = fehér."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "A betűkészlet viszonylagos mérete"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24165,59 -24160,59 +24850,111 @@@ msgstr "
"van állÃtva abszolút betűkészletméret, akkor az felülbÃrálja a relatÃv "
"méretet."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Háttér átlátszatlansága"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Háttér szÃne"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Körvonal átlátszatlansága"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Ãrnyék átlátszatlansága"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Ãrnyék szÃne"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Ãrnyék szöge"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Ãrnyék távolsága"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Háttér átlátszatlansága"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Háttér szÃne"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Körvonal átlátszatlansága"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Ãrnyék átlátszatlansága"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Ãrnyék szÃne"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Ãrnyék szöge"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Ãrnyék távolsága"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Kisebb"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Kicsi"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Nagy"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Nagyobb"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "YUVP megjelenÃtÅ‘ használata"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "YUVP megjelenÃtÅ‘ használata"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24225,23 -24220,23 +24962,43 @@@ msgstr "
"Ez a betűket a „paletized YUV†használatával jelenÃti meg. Ez csak akkor "
"szükséges, ha DVB feliratformátumba kÃván kódolni."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Vékony"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Vastag"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "SzövegmegjelenÃtÅ‘"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 betűmegjelenÃtÅ‘"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Vékony"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Vastag"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "SzövegmegjelenÃtÅ‘"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 betűmegjelenÃtÅ‘"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -29207,6 -29202,9 +29964,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Médiakezelési lista"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Részletek megjelenÃtése"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -31891,10 -31889,6 +32654,13 @@@
#~ msgstr "Körbelépkedés a váltottsorosság-megszüntetési módokon."
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Kodek részletei"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Add a subtitle file"
#~ msgstr "Feliratfájl használata"
diff --combined po/hy.po
index bbf813e,2bd309f..0bb4b64
--- a/po/hy.po
+++ b/po/hy.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2010-09-21 15:58+0400\n"
"Last-Translator: Eduard Babayan <edo248 at gmail.com>\n"
"Language-Team: VLC Armenian <edo248 at gmail.com>\n"
@@@ -145,7 -145,7 +149,11 @@@ msgstr "ÕÕ¡Ö€Õ¢Õ¥Ö€ Õ±Õ¡ÕµÕ¶Õ¡ÕµÕ«Õ¶ Õ
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -526,10 -526,10 +534,17 @@@ msgid "&About
msgstr "&Ô¾Ö€Õ¡Õ£Ö€Õ« Õ„Õ¡Õ½Õ«Õ¶"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -568,17 -568,17 +583,29 @@@ msgid "Save...
msgstr "ÕŠÕ¡Õ°Õ¥Õ¬..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Ô¿Ö€Õ¯Õ¶Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€Õ¨"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Ô¿Ö€Õ¯Õ¶Õ¥Õ¬ Õ„Õ¥Õ¯Õ¨"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -691,7 -691,7 +718,11 @@@ msgstr "Õ¡Õ¼Õ¡Õ¾Õ¥Õ¬Õ¡Õ£Õ¸Ö‚ÕµÕ¶ Õ©Õ«Õ¾
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬"
@@@ -1454,23 -1454,23 +1485,39 @@@ msgstr "Ô¿Õ¡Õ¤Ö€Õ¥Ö€Õ« Õ¡Ö€Õ¡Õ£Õ¸Ö‚Õ©Õ¸
msgid "Decoded format"
msgstr "Ô±ÕºÕ¡Õ¯Õ¸Õ¤Õ¡Õ¾Õ¸Ö€Õ¾Õ¡Õ®"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "ÕÕ¥Ö€ Õ£Ö€Õ¡Õ®Õ¨ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¢Õ¡ÖÕ¾Õ¥Õ¬"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "ÕÕ¥Ö€ Õ£Ö€Õ¡Õ®Õ¨ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¢Õ¡ÖÕ¾Õ¥Õ¬"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ²Õ¡Õ¶Õ¸Ö‚Õ´ Õ¢Õ¡ÖÕ¥Õ¬ MRL '%s'. ÕÕ¿Õ¸Ö‚Õ£Õ¥Ö„ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶Õ¸Ö‚Õ´ Õ„Õ¡Õ¶Ö€Õ¡Õ´Õ¡Õ½Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€"
"\"."
++<<<<<<< HEAD
+#: src/input/input.c:2549
++=======
+ #: src/input/input.c:2548
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC can't recognize the input's format"
msgstr "VLC Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ³Õ¡Õ¶Õ¡Õ¹Õ¥Õ¬ Õ´Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ´Õ¡Õ¶ Õ« Ö†Õ¸Ö€Õ´Õ¡Õ¿"
++<<<<<<< HEAD
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1946,7 -1946,7 +1993,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -2048,7 -2048,7 +2099,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "ÕˆÕ¹ Õ´Õ«"
@@@ -2081,7 -2081,7 +2136,11 @@@ msgstr "
"ÕÕ¡ Õ§ Õ¡ÕµÕ¶ Õ¿Õ¥Õ½Õ¡Õ°Õ¸Õ¬Õ¸Õ¾Õ¡Õ¯Õ¨, Õ¡Ö€Õ¿Õ¡Õ¤Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¥Õ²Õ¡Õ¶Õ¡Õ¯Õ¨ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¾Õ¸Ö‚Õ´ Õ§ VLC. Ô¼Õ¼Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ "
"Õ¾Õ¡Ö€Ö„Õ¶ Õ§ Õ¡Õ¾Õ¿Õ¸Õ´Õ¡Õ¿ Õ¯Õ¥Ö€ÕºÕ¸Õ¾ Õ¨Õ¶Õ¿Ö€Õ¥Õ¬ Õ¬Õ¡Õ¾Õ¡Õ£Õ¸Ö‚ÕµÕ¶ Õ¥Õ²Õ¡Õ¶Õ¡Õ¯Õ¨ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ«."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬ Õ¾Õ«Õ¤Õ¥Õ¸Õ¶"
@@@ -2304,7 -2304,7 +2363,11 @@@ msgstr "
"Õ´Õ¡Õ¿Õ¸Ö‚ÖÕ¥Õ¬ Õ¾Õ«Õ¤Õ¥Õ¸ Õ¸Ö‚Õ²Õ²Õ¡Õ¯Õ«Õ¸Ö€Õ¥Õ¶). VLC ÖƒÕ¸Ö€Õ±Õ¥Õ¬Õ¸Ö‚ Õ§ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ¡ÕµÕ¶ Õ¯Õ¸Õ²Õ´Õ«Ö Õ¬Õ¼Õ¥Õ¬ÕµÕ¡ÕµÕ¶."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Õ„Õ«Õ·Õ¿ Õ¥Ö€Ö‡Õ¡ÖÕ¸Õ²"
@@@ -2370,7 -2370,7 +2433,11 @@@ msgstr "Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ Õ¯Õ¸Ö‚Ö€Õ½Õ¸Ö€Õ
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2380,7 -2380,7 +2447,11 @@@ msgstr "Deinterlace
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
#, fuzzy
msgid "Deinterlace mode"
@@@ -2445,7 -2445,7 +2516,11 @@@ msgstr "
"Inhibits Õ«Õ·ÕÕ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ´Õ¡Õ¶ daemon Õ¨Õ¶Õ©Õ¡ÖÖ„Õ¸Ö‚Õ´ Õ¸Ö€Õ¥Ö‚Õ§ Õ¨Õ¶Õ©Õ¡ÖÖ„, ÕÕ¸Ö‚Õ½Õ¡ÖƒÕ¥Õ¬ "
"Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¹Õ¡ÕµÕ«Õ¶ Õ¬Õ«Õ¶Õ¥Õ¬Õ¸Õ¾ Õ¯Õ¡Õ½Õ¥ÖÕ¾Õ¥Õ¬ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾ Õ¡Õ¶Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "ÕŠÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ« Õ¡Ö€Õ¿Õ¡Ö„Õ«Õ¶ Õ¤Õ¥Õ½Ö„"
@@@ -2668,7 -2668,7 +2743,11 @@@ msgstr "
"Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¸Ö‚Õ´ ÕºÕ«Ö„Õ½Õ¥Õ¬ (1.1). ÔµÕ©Õ¥ Õ¤Õ¸Ö‚Ö„ Õ¸Ö‚Õ¶Õ¥Ö„ 16:9 Õ§Õ¯Ö€Õ¡Õ¶Õ«Õ¶, Õ¤Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Ô±Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ "
"Õ§ ÖƒÕ¸ÕÕ¥Õ¬ Õ¡ÕµÕ½ Õ§ 4.3 ÕºÕ¡Õ°Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ°Õ¡Õ´Õ¡Õ´Õ¡Õ½Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¸Õ¾\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Õ‡Ö€Õ»Õ¡Õ¶ÖÕ¥Õ¬ Õ¯Õ¡Õ¤Ö€Õ¥Ö€Õ¨"
@@@ -2843,12 -2843,12 +2922,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2856,7 -2856,7 +2944,11 @@@ msgid "Default
msgstr "Õ€Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -3246,7 -3246,7 +3338,11 @@@ msgid "You can completely disable the s
msgstr "Ô´Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Ö„ Õ¬Õ«Õ¸Õ¾Õ«Õ¶ Õ¡Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ Õ¥Õ¶Õ©Õ¡Õ°Õ¡Õ¶Õ±Õ¶Õ¡ÕªÕ¸Õ²Õ¸Õ¾ ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¨ Õ¾Õ¥Ö€Õ¡Õ´Õ·Õ¡Õ¯Õ´Õ¡Õ¶."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -4291,7 -4291,7 +4387,11 @@@ msgstr "
"Ô±ÕµÕ½ Õ¯Õ¡ÕµÕ¡Õ¶Ö„Õ¶Õ¥Ö€Õ¨ Õ¥Õ¶ Õ°Õ¡Õ´Õ¡Õ·ÕÕ¡Ö€Õ°Õ¡ÕµÕ«Õ¶ VLC Õ°Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶ bindings, Õ¸Ö€Õ¨ Õ°Õ¡ÕµÕ¿Õ¶Õ« Õ§ Õ¸Ö€ÕºÕ¥Õ½ \" "
"Õ¯Õ¸Õ³Õ¡Õ¯ \"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ô±Õ¶Õ¿Õ¥Õ½Õ¥Õ¬"
@@@ -4318,8 -4318,8 +4418,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4408,10 -4408,10 +4513,17 @@@ msgid "Slower (fine)
msgstr "Ô±Õ¾Õ¥Õ¬Õ« Õ¤Õ¡Õ¶Õ¤Õ¡Õ² (Õ¹Õ¶Õ¹Õ«Õ¶)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4425,10 -4425,10 +4537,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Ô¸Õ¶Õ¿Ö€Õ¥Ö„ Õ¯Õ¸Õ³Õ¡Õ¯ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ§ ÖÕ¡Õ¿Õ¯Õ¡Õ¶ÖÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ»Õ¸Ö€Õ¤ Õ¯Õ¥Õ¿Õ«Õ¶, Õ¥Ö€Õ£Õ¡ÖÕ¡Õ¶Õ¯\"."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Õ†Õ¡ÕÕ¸Ö€Õ¤"
@@@ -4438,9 -4438,9 +4557,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "Ô¸Õ¶Õ¿Ö€Õ¥Ö„ Õ¯Õ¸Õ³Õ¡Õ¯ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ§ ÖÕ¡Õ¿Õ¯Õ¡Õ¶ÖÕ¥Õ¬Õ¸Ö‚ Õ¶Õ¡ÕÕ¸Ö€Õ¤ Õ¯Õ¥Õ¿Õ«Õ¶, Õ¥Ö€Õ£Õ¡ÖÕ¡Õ¶Õ¯\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4699,9 -4699,9 +4824,15 @@@ msgid "Select the key to decrease audi
msgstr "Ô¸Õ¶Õ¿Ö€Õ¥Õ¬ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶ Õ¶Õ¾Õ¡Õ¦Õ¸Ö‚Õ´ Õ±Õ¡ÕµÕ¶ Õ®Õ¡Õ¾Õ¡Õ¬Õ¸Õ¾\"."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ Õ±Õ¡ÕµÕ¶Õ¨"
@@@ -5158,7 -5158,7 +5289,11 @@@ msgstr "Õ€Õ¥Ö€Õ©Õ¸Õ¾ Õ¡Õ¶ÖÕ¶Õ¥Õ¬ Õ¡Õ¼
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "ÕŽÕ«Õ¤Õ¥Õ¸ÕµÕ«Ö Õ†Õ¯Õ¡Ö€"
@@@ -5381,12 -5381,12 +5516,21 @@@ msgstr "Ô²Õ¥Õ¼Õ¶Õ¸Ö‚Õ´...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "ÕˆÕ¹Õ«Õ¶Õ¹ Õ¹Õ¡Õ¶Õ¥Õ¬"
@@@ -6159,7 -6159,7 +6303,11 @@@ msgstr "ÔµÕ¦Ö€Õ¥Ö€Õ«Ö Õ¯Õ¿Ö€Õ¥Õ¬
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Õ‰Õ¡ÖƒÕ¥Ö€Õ« Õ°Õ¡Ö€Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨"
@@@ -8852,7 -8852,7 +9000,11 @@@ msgstr "Ô·Õ¯Ö€Õ¡Õ¶Õ« Õ´Õ¸Ö‚Õ¿Ö„
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Ô·Õ¯Ö€Õ¡Õ¶"
@@@ -9712,7 -9712,7 +9864,11 @@@ msgstr "Vol max #
msgid "Volume Set"
msgstr "ÕÕ¡ÕµÕ¶Õ¨ ÕÕ¡Õ°Õ´Õ¡Õ¶Õ¥Õ¬"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -11056,7 -11056,7 +11212,11 @@@ msgstr "Õ‡Ö€Õ»Õ¡ÖƒÕ¡Õ¯Õ¸Ö‚Õ´
msgid "ALSA audio output"
msgstr "ALSA Õ¡Õ¸Ö‚Õ¤Õ«Õ¸ Õ¥Õ¬Ö„"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "ÕÕ¡ÕµÕ¶Õ¡ÕµÕ«Õ¶ Õ¥Õ¬Ö„Õ¡ÕµÕ«Õ¶ Õ±Õ¡ÕÕ¸Õ²Õ¾Õ¥Ö"
@@@ -11093,7 -11093,7 +11253,11 @@@ msgstr "Linux OSS Õ¡Õ¸Ö‚Õ¤Õ«Õ¸ Õ¥Õ¬Ö„Õ¡
msgid "Android AudioTrack audio output"
msgstr "Grayscale Õ¾Õ«Õ¤Õ¥Õ¸ Õ¥Õ¬Ö„"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "HAL AudioUnit Õ¥Õ¬Ö„"
@@@ -11103,23 -11103,23 +11267,39 @@@
msgid "Last audio device"
msgstr "ÕÕ¡ÕµÕ¶Õ¡ÕµÕ«Õ¶ ÕÕ¡Ö€Ö„"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit Õ¥Õ¬Ö„"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit Õ¥Õ¬Ö„"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Ô¸Õ¶Õ¿Ö€Õ¾Õ¡Õ® Õ¡Õ¸Ö‚Õ¤Õ«Õ¸ Õ¥Õ¬Ö„Õ¨ Õ½Õ¡Ö€Ö„Õ¨ Õ§ Õ¢Õ¡ÖÕ¡Õ¼Õ¡ÕºÕ¥Õ½ Õ¶Ö€Õ¡ Õ¯Õ¸Õ²Õ´Õ«Ö Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¾Õ¸Õ² Õ¡ÕµÕ¬ Õ®Ö€Õ¡Õ£Õ«Ö€."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
++=======
+ #: modules/audio_output/auhal.c:578
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio device is not configured"
msgstr "ÕÕ¡ÕµÕ¶Õ¡ÕµÕ«Õ¶ Õ½Õ¡Ö€Ö„Õ¨ Õ´Õ«Õ¡ÖÕ¾Õ¡Õ® Õ¹Õ§ Õ¯Õ¡Õ¦Õ´Õ¡Õ±Õ¥Ö‚Õ¾Õ¥Õ¬"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
@@@ -11129,12 -11129,12 +11309,20 @@@ msgstr "
"\"Ö…Õ£Õ¿Õ¡Õ¯Õ¡Ö€ Õ§ / Ô¾Ö€Õ¡Õ£Ö€Õ¥Ö€ / Õ¯Õ¸Õ´Õ¸Ö‚Õ¶Õ¡Õ¬ Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨. Stereo Õ¼Õ¥ÕªÕ«Õ´Õ¸Ö‚Õ´ Õ§ "
"Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¾Õ¸Ö‚Õ´, Õ°Õ«Õ´Õ¡\"."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Ô¸Õ¶Õ¿Ö€Õ¥Ö„ ÕÕ¥Ö€ Õ±Õ¡ÕµÕ¶Õ¡ÕµÕ«Õ¶ Õ¥Õ¬Ö„Õ¡ÕµÕ«Õ¶ Õ½Õ¡Ö€Ö„Õ«"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Õ¯Õ¸Õ¤Õ¡Õ¾Õ¸Ö€Õ¾Õ¡Õ® Õ¥Õ¬Ö„)"
@@@ -12603,32 -12603,32 +12791,52 @@@ msgstr "Õ½Õ¿Õ¾Õ¥Ö€Õ¨`
msgid "Outline"
msgstr "Õ‡Ö€Õ»Õ¡Õ¶Õ¡Õ¯"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "ÕÕ¥Ö‚"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Ô³Õ¸Ö€Õ·"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Ô±Ö€Õ®Õ¡Õ©Õ¥"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "ÕÕºÕ«Õ¿Õ¡Õ¯"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
#, fuzzy
@@@ -12636,14 -12636,14 +12844,22 @@@ msgid "Maroon
msgstr "ÕºÕ¡Ö€Õ¡Õº - Õ½Õ¡Ö€Õ¡Õº Õ´Õ¡Õ¶ Õ£Õ¡Õ¬\":"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Ô¿Õ¡Ö€Õ´Õ«Ö€"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -12651,35 -12651,35 +12867,55 @@@ msgid "Fuchsia
msgstr "Fuchsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Ô´Õ¥Õ²Õ«Õ¶"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "ÕÕ«Õ©Õ¡ÕºÕ¿Õ²Õ¡Õ£Õ¸Ö‚ÕµÕ¶"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Ô¿Õ¡Õ¶Õ¡Õ¹"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
#, fuzzy
msgid "Teal"
msgstr "Teal"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
@@@ -12687,27 -12687,27 +12923,43 @@@
msgid "Lime"
msgstr "Õ¬Õ¸Ö€Õ«"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Õ„Õ¡Õ¶Õ¸Ö‚Õ·Õ¡Õ¯Õ¡Õ£Õ¸Ö‚ÕµÕ¶"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Õ„Õ¸Ö‚Õ£ Õ¯Õ¡ÕºÕ¸Ö‚ÕµÕ¿"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Ô¿Õ¡ÕºÕ¸Ö‚ÕµÕ¿"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -12883,7 -12883,7 +13135,11 @@@ msgstr "ÔµÕ¶Õ©Õ¡Õ£Ö€Õ¥Ö€ (Õ¨Õ¶Õ¤Õ¬Õ¡Õµ
msgid "Subtitle renderers using libass"
msgstr "ÔµÕ¶Õ©Õ¡Õ£Ö€Õ« renderers Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Õ¾ libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Building font cache"
msgstr "Õ·Õ¥Õ¶Ö„ Õ¿Õ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯ cache"
@@@ -15070,10 -15070,10 +15326,17 @@@ msgid "Fast
msgstr "Ô±Õ¾Õ¥Õ¬Õ« Õ¡Ö€Õ¡Õ£ "
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Õ†Õ¸Ö€Õ´Õ¡Õ¬"
@@@ -15201,8 -15201,8 +15464,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus Õ¾Õ¥Ö€Õ¡Õ°Õ½Õ¯Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ«Õ¶Õ¿Õ¥Ö€Ö†Õ¥ÕµÕ½Õ«"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -15597,9 -15597,9 +15865,15 @@@ msgstr "Initializing
msgid "Opening"
msgstr "Ô²Õ¡ÖÕ¸Ö‚Õ´"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Ô¸Õ¶Õ¤Õ´Õ«Õ»Õ¥Õ¬"
@@@ -17796,7 -17796,7 +18070,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG Õ¿Ö€Õ¡Õ¶Õ½ÕºÕ¸Ö€Õ¿Õ« Stream Õ¤Õ¥Õ´Õ¸Ö‚Õ¬Õ¿Õ«ÕºÕ¬Õ¥Ö„Õ½Õ¸Ö€"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "ÕÕ¥Õ¬Õ¥Õ¿Õ¥Ö„Õ½Õ¿"
@@@ -17999,7 -17999,7 +18277,11 @@@ msgid "VLC media player Help
msgstr "VLC Õ´Õ¥Õ¤Õ«Õ¡ Õ¶Õ¾Õ¡Õ£Õ¡Ö€Õ¯Õ¹Õ« Õ•Õ£Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Ô»Õ¶Õ¤Õ¥Ö„Õ½"
@@@ -18097,9 -18097,9 +18379,15 @@@ msgstr "Õ„Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ¥Ö„ Õ¡Õ¶Õ¸Ö‚Õ¶
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "ÕŠÕ¡Õ°Õ¥Õ¬"
@@@ -18249,7 -18249,7 +18537,11 @@@ msgstr "Õ„Õ¸Ö‚Õ¿Ö„ Õ¹Õ« Õ°Õ¡ÕµÕ¿Õ¶Õ¡Õ¢Õ
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Õ€Õ€ Õ°Õ¸Õ½Ö„Õ« ÕºÕ¥Õ¿Ö„ Õ§ ÕÕ¡Õ²Õ¸Ö‚Õ´ Õ¯Õ¡Õ´ Ô¸Õ¶Õ¤Õ´Õ«Õ»Õ¾Õ¡Õ® Õ°Õ¡Õ´Õ¡Ö€ Õ§Õ»Õ¡Õ¶Õ«Õ·Õ¶Õ¥Ö€Õ¨ Õ¡Õ·ÕÕ¡Õ¿Õ¥Õ¬Õ¸Ö‚\"."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Ô±Õ¶ÖÕ¶Õ¥Õ¬ ÔºÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ« ÕºÕ¡Õ°Õ«Õ¶"
@@@ -18270,7 -18270,7 +18562,11 @@@ msgstr "
msgid "Backward"
msgstr "Õ©Õ¡Ö€Õ½"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -18281,7 -18281,7 +18577,11 @@@ msgstr "
msgid "Forward"
msgstr "ÕˆÖ€Õ¸Õ¶Õ¸Ö‚Õ´"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -18303,92 -18303,92 +18603,163 @@@ msgstr "Toggle ÕˆÕ²Õ» Õ§Õ¯Ö€Õ¡Õ¶Õ¸Õ¾ Ô»
msgid "Click to enable fullscreen video playback."
msgstr "Ô±Ö€Õ£Õ¥Õ¬Õ¥Õ¬ Õ¥Õ¶ Ô·Õ¯Ö€Õ¡Õ¶Õ¡ÕºÕ¡Õ° Õ¨Õ¶Õ©Õ¡ÖÖ„Õ¸Ö‚Õ´ Õ¾Õ«Õ¤Õ¥Õ¸ Õ¨Õ¶Õ©Õ¡ÖÖ„\"."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "Ô¸Õ¶Õ¿Ö€Õ¥Ö„ Õ¯Õ¸Õ³Õ¡Õ¯ Õ¤Õ¡Õ¤Õ¡Ö€Õ¥ÖÕ¶Õ¥Õ¬ Õ¨Õ¶Õ©Õ¡ÖÖ„\"."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "Õ‘Õ¸Ö‚ÕµÖ Õ¿Õ¡Õ¬ Õ¥Ö€Õ£Õ¡ÖÕ¡Õ¶Õ¯"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "Ô¿Ö€Õ¯Õ¶Õ¸Ö‚Õ´Õ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "Ô¸Õ¶Õ¿Ö€Õ¥Õ¬ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶ Õ°Õ¡Õ´Ö€ Õ¡Õ¸Ö‚Õ¤Õ«Õ¸\"."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "Õ“Õ¸Ö„Ö€ ÕÕ¡ÕµÕ¶"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to play the audio at maximum volume."
msgstr "Õ„Õ¿Õ¡Õ®Õ¥Ö„, Õ¬Õ¡ÕµÕ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¥Ö‚ Õ¢Õ¡Ö€Õ±Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨, Õ¸Ö€ÕºÕ¥Õ½ Õ¡Õ¼Õ¡Õ¾Õ¥Õ¬Õ¡Õ£Õ¸Ö‚ÕµÕ¶ Õ¡Ö€ÕªÕ¥Ö„Õ¶Õ¥Ö€Õ¨\"."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Õ§Ö†Õ¥Õ¯Õ¿Õ¶Õ¥Ö€"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr "Õ†Õ¡ÕÕ¸Ö€Õ¤ Õ¥Ö€Õ£Õ¡ÖÕ¡Õ¶Õ¯ Õ¯Õ¥Õ¿`"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the next playlist item."
msgstr "VLC Õ¯Õ·Õ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ« ÕÕ¡Õ²Õ¡Õ¬ Õ¶Õ¥Ö€Õ¯Õ¡ Õ¥Ö€Õ£Õ¡ÖÕ¡Õ¶Õ¯ Õ¯Õ¥Õ¿."
++<<<<<<< HEAD
++=======
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -18430,7 -18430,7 +18801,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -18634,8 -18634,8 +19009,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "ÕÕ¥ÖƒÕ¡Õ¯Õ¡Õ¶ "
@@@ -18743,41 -18743,41 +19123,73 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "VLC Õ„Õ¥Õ¤Õ«Õ¡ Õ†Õ¾Õ¡Õ£Õ¡Ö€Õ¯Õ«Õ¹"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "CrashLog Õ¹Õ« Õ°Õ¡ÕµÕ¿Õ¶Õ¡Õ¢Õ¥Ö€Õ¾Õ¥Õ¬"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "CrashLog Õ¹Õ« Õ°Õ¡ÕµÕ¿Õ¶Õ¡Õ¢Õ¥Ö€Õ¾Õ¥Õ¬"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Õ‡Õ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¥Õ¬"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
++=======
+ #: modules/gui/macosx/intf.m:1877
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Couldn't find any trace of a previous crash."
msgstr " msgstr \"Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ¹Õ§ Õ£Õ¿Õ¶Õ¥Õ¬ Õ¸Ö€Õ¥Ö‚Õ§ Õ°Õ¥Õ¿Ö„ Õ§ Õ¶Õ¡ÕÕ¸Ö€Õ¤ Õ¾Õ©Õ¡Ö€Õ«."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Õ‹Õ¶Õ»Õ¥ÕžÕ¬ Õ°Õ«Õ¶ Õ¶Õ¡ÕÕ¨Õ¶Õ¿Ö€Õ¡Õ¶Ö„Õ¶Õ¥Ö€Õ¨"
+
+#: modules/gui/macosx/intf.m:1937
++=======
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Õ‹Õ¶Õ»Õ¥ÕžÕ¬ Õ°Õ«Õ¶ Õ¶Õ¡ÕÕ¨Õ¶Õ¿Ö€Õ¡Õ¶Ö„Õ¶Õ¥Ö€Õ¨"
+
+ #: modules/gui/macosx/intf.m:1922
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "We just found an older version of VLC's preferences files."
msgstr ""
"Õ„Õ¥Õ¶Ö„ ÕºÕ¡Ö€Õ¦Õ¡ÕºÕ¥Õ½ Õ£Õ¿Õ¥Õ¬ Õ¡Õ¾Õ¥Õ¬Õ« Õ°Õ«Õ¶ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯ Õ§ VLC Õ« Õ¶Õ¡ÕÕ¨Õ¶Õ¿Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« Ö†Õ¡ÕµÕ¬Õ¥Ö€."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1938
++=======
+ #: modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Move To Trash and Relaunch VLC"
msgstr "Ô¹Õ¡ÖƒÕ¸Õ¶ ÖƒÕ¸ÕÕ¡Õ¤Ö€Õ¥Õ¬ Õ¥Ö‚ Relaunch VLC"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC Debug Õ„Õ¸Ö‚Õ¿Ö„ (%s). Rtfd`"
@@@ -18967,7 -18967,7 +19379,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Õ–Õ«Ö„Õ½Õ¥Õ¬ Õ¹Õ¡ÖƒÕ¥Ö€Õ« Õ°Õ¡Ö€Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨"
@@@ -19108,7 -19108,7 +19524,11 @@@ msgstr "Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ VLCÕ¶
msgid "Hide Others"
msgstr "Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ Õ´ÕµÕ¸Ö‚Õ½Õ¶Õ¥Ö€Õ¨"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Õ‘Õ¸Ö‚ÕµÖ Õ¿Õ¡Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€Õ¨"
@@@ -19199,15 -19199,15 +19619,27 @@@ msgstr "&Õ€Õ¡Õ´Õ¡ÕªÕ¡Õ´Õ¡ÖÕ¸Ö‚Õ´
msgid "A→B Loop"
msgstr "A-> B Õ‘Õ«Õ¯Õ¬"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ Ô±Õ·ÕÕ¡Õ¿Õ¡ÖÕ¶Õ¥Õ¬Õ¸Ö‚Ö Õ°Õ¥Õ¿Õ¸"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Õ”Õ¡ÕµÕ¬ Ô±Õ¼Õ¡Õ»"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ Ô±Õ·ÕÕ¡Õ¿Õ¡ÖÕ¶Õ¥Õ¬Õ¸Ö‚Ö Õ°Õ¥Õ¿Õ¸"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Õ”Õ¡ÕµÕ¬ Ô±Õ¼Õ¡Õ»"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Õ”Õ¡ÕµÕ¬ ÔµÕ¿"
@@@ -19223,30 -19223,30 +19655,56 @@@ msgstr "Ô»Õ»Õ¡ÖÕ¶Õ¥Õ¬ ÕÕ¡ÕµÕ¶Õ¨
msgid "Audio Device"
msgstr "ÕÕ¡ÕµÕ¶Õ¡ÕµÕ«Õ¶ ÕÕ¡Ö€Ö„"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Ô¿Õ¥Õ½ Õ¹Õ¡Öƒ"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Õ†Õ¸Ö€Õ´Õ¡Õ¬ Õ‰Õ¡Öƒ"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Ô¿Ö€Õ¯Õ¶Õ¡Õ¯Õ« Õ‰Õ¡Öƒ"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "ÕÕ¥Õ²Õ¡Õ¾Õ¸Ö€Õ¥Õ¬ Ô·Õ¯Ö€Õ¡Õ¶Õ«Õ¶"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Ô¿Õ¥Õ½ Õ¹Õ¡Öƒ"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Õ†Õ¸Ö€Õ´Õ¡Õ¬ Õ‰Õ¡Öƒ"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Ô¿Ö€Õ¯Õ¶Õ¡Õ¯Õ« Õ‰Õ¡Öƒ"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "ÕÕ¥Õ²Õ¡Õ¾Õ¸Ö€Õ¥Õ¬ Ô·Õ¯Ö€Õ¡Õ¶Õ«Õ¶"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "float Õ´Õ¡Õ½Õ«Õ¶ ÕŽÕ¥Ö€Õ¥Ö‚"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "ÕˆÕ²Õ» Õ§Õ¯Ö€Õ¡Õ¶Õ¸Õ¾ Õ¼Õ¥ÕªÕ«Õ´Õ« ÕŽÕ«Õ¤Õ¥Õ¸ ÕÕ¡Ö€Ö„"
@@@ -19256,7 -19256,7 +19714,11 @@@
msgid "Post processing"
msgstr "Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¨ Õ´Õ·Õ¡Õ¯Õ´Õ¡Õ¶"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "ÔµÕ¶Õ©Õ¡Õ£Ö€Õ¥Ö€Õ¸Õ¾ Õ–Õ¡ÕµÕ¬"
@@@ -19501,7 -19501,7 +19963,11 @@@ msgid "Play another media synchronously
msgstr "Ô¶Õ¸Ö‚Õ£Õ¡Õ°Õ¥Õ¼ Õ¸Ö‚Ö€Õ«Õ· Ö†Õ¡ÕµÕ¬ Õ´Õ«Õ¡ÖÕ¶Õ¥Õ¬"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Ô¸Õ¶Õ¿Ö€Õ¥Ö„ ..."
@@@ -19705,7 -19705,7 +20171,11 @@@ msgstr " Ô¿Õ¡Õ¤Ö€/Õ¾
msgid "Subtitle encoding"
msgstr "ÔµÕ¶Õ©Õ¡Õ£Ö€Õ¥Ö€Õ« Õ¯Õ¸Õ¤Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "ÕÕ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯Õ« Õ¹Õ¡ÖƒÕ¨"
@@@ -19947,12 -19947,12 +20417,20 @@@ msgstr "ÕÕÕ¡Õ¬, Õ«Õ½Õ¯ ÕÕ¶Õ¡ÕµÕ¸Õ²Õ¸
msgid "VLC was unable to save the meta data."
msgstr "VLC Õ¹Õ¯Õ¡Ö€Õ¸Õ²Õ¡ÖÕ¡Õ¾ ÖƒÖ€Õ¯Õ¥Õ¬ meta Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ¨\"."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Õ†Õ¡ÕÕ¨Õ¶Õ¿Ö€Õ¡Õ¶Ö„Õ¶Õ¥Ö€"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "ÕŽÕ¥Ö€Õ¡Õ¯Õ¡Õ¶Õ£Õ¶Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€Õ¨"
@@@ -20145,136 -20145,131 +20623,244 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Ô´Õ¡Õ¤Õ¡Ö€Õ¥ÖÕ¶Õ¥Õ¬ Õ§ Õ¨Õ¶Õ©Õ¡ÖÖ„"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Õ€Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶ Ô¿Õ¸Õ¤Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´"
+
+#: modules/gui/macosx/simple_prefs.m:378
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Õ€Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶ Ô¿Õ¸Õ¤Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´"
+
+ #: modules/gui/macosx/simple_prefs.m:377
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Display Settings"
msgstr "Õ‘Õ¸Ö‚ÕµÖ Õ¿Õ¡Õ¬ Ô¿Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ¸Ö‚Õ´"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "ÕÕ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯Õ« Õ£Õ¸Ö‚ÕµÕ¶Õ¨"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "ÕÕ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "ÔµÕ¶Õ©Õ¡Õ£Ö€Õ¥Ö€ Õ¬Õ¥Õ¦Õ¸Ö‚Õ¶Õ¥Ö€Õ¸Õ¾,"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Õ†Õ¡ÕÕ¨Õ¶Õ¿Ö€Õ¡Õ® Õ¥Õ¶Õ©Õ¡Õ£Ö€Õ¥Ö€Õ« Õ¬Õ¥Õ¦Õ¸Ö‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬ OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬ OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Ô±Õ¶Õ©Õ¡ÖƒÕ¡Õ¶ÖÕ«Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Force bold"
msgstr "Force Õ´Õ¸Õ¶Õ¸ Õ¡Õ¸Ö‚Õ¤Õ«Õ¸"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "Õ‡Ö€Õ»Õ¡Õ¶Õ¡Õ¯"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Black screens in Fullscreen mode"
msgstr "ÕÕ¥Ö‚ Õ§Õ¯Ö€Õ¡Õ¶Õ¶Õ¥Ö€Õ« Õ§ ÕˆÕ²Õ» Õ§Õ¯Ö€Õ¡Õ¶Õ¸Õ¾ Õ¼Õ¥ÕªÕ«Õ´Õ¸Ö‚Õ´"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Ô·Õ¯Ö€Õ¡Õ¶"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "ÔµÕ¬Ö„Õ¡ÕµÕ«Õ¶ Õ´Õ¸Õ¤Õ¸Ö‚Õ¬"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "ÕŽÕ«Õ¤Õ¥Õ¸ÕµÕ«Ö Õ¶Õ¯Õ¡Ö€Õ¶Õ¥Ö€"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "ÕŠÕ¡Õ¶Õ¡Õ¯"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Õ–Õ¸Ö€Õ´Õ¡Õ¿"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Õ†Õ¡ÕÕ¡Õ®Õ¡Õ¶Ö"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Õ€Õ¡Õ»Õ¸Ö€Õ¤Õ¡Õ¯Õ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö€Õ¡Õ¯Õ¡Õ¬Õ¸Ö‚Õ´"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "ÕŽÕ¥Ö€Õ»Õ«Õ¶ Õ¡Õ¶Õ£Õ¡Õ´ Õ½Õ¿Õ¸Ö‚Õ£Õ¾Õ¥Õ¬ Õ§ %@ -Õ«Õ¾"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "ÕˆÕ¹ Õ´Õ« Õ½Õ¿Õ¸Ö‚Õ£Õ¸Ö‚Õ´ Õ§Ö€ Õ¯Õ¡Õ¿Õ¡Ö€Õ¾Õ¥Õ¬ Õ¤Õ¥Õ¼"
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "ÔµÕ¬Ö„Õ¡ÕµÕ«Õ¶ Õ´Õ¸Õ¤Õ¸Ö‚Õ¬"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "ÕŽÕ«Õ¤Õ¥Õ¸ÕµÕ«Ö Õ¶Õ¯Õ¡Ö€Õ¶Õ¥Ö€"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "ÕŠÕ¡Õ¶Õ¡Õ¯"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Õ–Õ¸Ö€Õ´Õ¡Õ¿"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Õ†Õ¡ÕÕ¡Õ®Õ¡Õ¶Ö"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Õ€Õ¡Õ»Õ¸Ö€Õ¤Õ¡Õ¯Õ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö€Õ¡Õ¯Õ¡Õ¬Õ¸Ö‚Õ´"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "ÕŽÕ¥Ö€Õ»Õ«Õ¶ Õ¡Õ¶Õ£Õ¡Õ´ Õ½Õ¿Õ¸Ö‚Õ£Õ¾Õ¥Õ¬ Õ§ %@ -Õ«Õ¾"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "ÕˆÕ¹ Õ´Õ« Õ½Õ¿Õ¸Ö‚Õ£Õ¸Ö‚Õ´ Õ§Ö€ Õ¯Õ¡Õ¿Õ¡Ö€Õ¾Õ¥Õ¬ Õ¤Õ¥Õ¼"
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Ô±Õ´Õ¥Õ¶Õ¡ÖƒÕ¸Ö„Ö€ Õ¸Ö‚Õ·Õ¡ÖÕ¸Ö‚Õ´"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Õ“Õ¸Ö„Ö€ Õ¸Ö‚Õ·Õ¡ÖÕ¸Ö‚Õ´"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Õ„Õ¥Õ® Õ¸Ö‚Õ·Õ¡ÖÕ¸Ö‚Õ´"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Ô±Õ¾Õ¥Õ¬Õ« Õ´Õ¥Õ® Õ¸Ö‚Õ·Õ¡ÖÕ¸Ö‚Õ´"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Ô¶Ö€Õ¸ÕµÕ¡ÖÕ¶Õ¥Õ¬ Õ†Õ¡ÕÕ¨Õ¶Õ¿Ö€Õ¡Õ¶Ö„Õ¶Õ¥Ö€Õ¨"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -20287,21 -20282,21 +20873,38 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Ô¸Õ¶Õ¿Ö€Õ¥Ö„ ÕºÕ¡Õ¶Õ¡Õ¯ Õ¾Õ«Õ¤Õ¥Õ¸ÕµÕ« Õ¶Õ¯Õ¡Ö€Õ¶Õ¥Ö€Õ¨ ÕºÕ¡Õ°Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€"
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Ô¸Õ¶Õ¿Ö€Õ¥Ö„"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Ô¸Õ¶Õ¿Ö€Õ¥Ö„ ÕºÕ¡Õ¶Õ¡Õ¯ Õ¾Õ«Õ¤Õ¥Õ¸ÕµÕ« Õ¶Õ¯Õ¡Ö€Õ¶Õ¥Ö€Õ¨ ÕºÕ¡Õ°Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€"
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Ô¸Õ¶Õ¿Ö€Õ¥Ö„"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the directory or filename where the records will be stored."
msgstr "ÕºÕ¡Õ¶Õ¡Õ¯ Õ¯Õ¡Õ´ Ö†Õ¡ÕµÕ¬Õ« Õ¡Õ¶Õ¾Õ¡Õ¶, Õ¸Ö€Õ¿Õ¥Õ² Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¯ÕºÕ¡Õ°Õ¾Õ¥Õ¶"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"Press new keys for\n"
@@@ -20310,18 -20305,18 +20913,31 @@@ msgstr "
"ÕŠÖ€Õ¥Õ½ Õ¶Õ¸Ö€ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€ \n"
" \"% @ \""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Invalid combination"
msgstr "Ô±Õ¶Õ¾Õ¡Õ¾Õ¥Ö€ Õ´Õ¥Õ¯Õ¿Õ¥Õ²Õ¸Ö‚Õ´Õ¨>>"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr "Õ‘Õ¡Õ¾Õ¸Ö„, Õ¡ÕµÕ¤ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö€Õ¨ Õ¹Õ¥Õ¶ Õ¯Õ¡Ö€Õ¸Õ² Õ¶Õ·Õ¡Õ¶Õ¡Õ¯Õ¾Õ¥Õ¬ Õ¯Õ¸Õ³Õ¡Õ¯ Õ¤ÕµÕ¸Ö‚Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨\"."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "This combination is already taken by \"%@\"."
msgstr "Ô±ÕµÕ½ Õ°Õ¡Õ´Õ¡Õ¤Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ§, Õ¡Ö€Õ¤Õ¥Õ¶ Õ±Õ¥Õ¼Õ¶Õ¡Ö€Õ¯Õ¾Õ¥Õ¬ Õ§ \"% @ \"."
@@@ -22604,20 -22599,20 +23220,36 @@@ msgstr "Õ‹Õ¶Õ»Õ¥Õ¬ Õ¨Õ¶Õ¿Ö€Õ¾Õ¡Õ® Õ¡Õ¶Õ
msgid "Create a new profile"
msgstr "ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¶Õ¸Ö€ Õ¡Õ¶Õ±Õ¶Õ¡Õ£Õ«Ö€"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Ô±Õ¶Õ±Õ¶Õ¡Õ£Õ«Ö€Õ« Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨ Ô²Õ¡ÖÕ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ´ Õ§"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Ô±Õ¶Õ±Õ¶Õ¡Õ£Õ«Ö€Õ« Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨ Ô²Õ¡ÖÕ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ´ Õ§"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Ô´Õ¸Ö‚Ö„ ÕºÕ¥Õ¿Ö„ Õ§ Õ¨Õ¶Õ¿Ö€Õ¥Ö„ Õ¡Õ¶Õ±Õ¶Õ¡Õ£Ö€Õ« Õ¡Õ¶Õ¸Ö‚Õ¶"
@@@ -26549,24 -26544,24 +27181,44 @@@ msgstr "Õ¿Ö€Õ¡Õ¶Õ½Õ¯Õ¸Õ¤Õ¡Õ¾Õ¸Ö€Õ¥Õ¬Õ¸Ö
msgid "Overlays/Subtitles"
msgstr "ÕŽÖ€Õ¡Õ¤Õ«Ö€Õ¶Õ¥Ö€ / ÔµÕ¶Õ©Õ¡Õ£Ö€Õ¥Ö€ "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Õ‘Õ¡Õ¶Õ¯Õ¡Õ¬Õ« Õ¿Õ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯Õ« Õ¨Õ¶Õ¿Õ¡Õ¶Õ«Ö„Õ¨"
+
+#: modules/text_renderer/freetype.c:159
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Õ‘Õ¡Õ¶Õ¯Õ¡Õ¬Õ« Õ¿Õ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯Õ« Õ¨Õ¶Õ¿Õ¡Õ¶Õ«Ö„Õ¨"
+
+ #: modules/text_renderer/freetype.c:158
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font file for the font you want to use"
msgstr "Õ‘Õ¡Õ¶Õ¯Õ¡Õ¬Õ« Õ¿Õ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯Õ« Ö†Õ¡ÕµÕ¬Õ¨"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "ÕÕ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯Õ« Õ¹Õ¡ÖƒÕ¨ ÕºÕ«Ö„Õ½Õ¥Õ¬Õ¶Õ¥Ö€Õ¸Õ¾"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "ÕÕ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯Õ« Õ¹Õ¡ÖƒÕ¨ ÕºÕ«Ö„Õ½Õ¥Õ¬Õ¶Õ¥Ö€Õ¸Õ¾"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
@@@ -26577,12 -26572,12 +27229,20 @@@ msgstr "
"Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¾Õ¡Õ® Õ§ Õ´Õ« Õ¢Õ¡Õ¶, Õ¿Õ¡Ö€Õ¢Õ¥Ö€, Ö„Õ¡Õ¶ 0 Õ¡ÕµÕ¤ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¨ Õ¯Õ¬Õ«Õ¶Õ« ÖƒÕ¸ÕÕ¡Ö€Õ«Õ¶Õ¸Ö‚Õ´ Õ°Õ¡Ö€Õ¡Õ¢Õ¥Ö€Õ¡Õ¯Õ¡Õ¶ "
"Õ¿Õ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯Õ« Õ¹Õ¡ÖƒÕ¨."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "Õ‡Ö€Õ»Õ¡Õ¶Õ¡Õ¯"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
@@@ -26591,12 -26586,12 +27251,20 @@@ msgstr "
"Õ€Õ€ Õ¡Õ¶Õ©Õ¡ÖƒÕ¡Õ¶ÖÕ«Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ (Õ°Õ¡Õ¯Õ¡Õ¤Õ¡Ö€Õ± Õ©Õ¡ÖƒÕ¡Õ¶ÖÕ«Õ¯Õ¸Ö‚Õ©ÕµÕ¡Õ¶) Õ¿Õ¥Ö„Õ½Õ¿Õ«, Õ¸Ö€ ÕºÕ¥Õ¿Ö„ Õ§ Õ´Õ¡Õ¿Õ¸Ö‚ÖÕ¾Õ¡Õ® "
"Õ¾Ö€Õ¡ Õ¾Õ«Õ¤Õ¥Õ¸. 0 = Õ©Õ¡ÖƒÕ¡Õ¶ÖÕ«Õ¯, 255 = Õ¡Õ´Õ¢Õ¸Õ²Õ»Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ Õ¡Õ¶Õ©Õ¡ÖƒÕ¡Õ¶\"."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "ÕÕ¥Ö„Õ½Õ¿Õ« Õ°Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶ Õ£Õ¸Ö‚ÕµÕ¶Õ¨"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
#, fuzzy
msgid ""
@@@ -26610,13 -26605,13 +27278,21 @@@ msgstr "
"Õ¯Õ¡Õ¶Õ¡Õ¹, Õ¡ÕºÕ¡ Õ¯Õ¡ÕºÕ¸Ö‚ÕµÕ¿. # 000000 = Õ½Õ¥Ö‚, # FF0000 = Õ¯Õ¡Ö€Õ´Õ«Ö€, # 00FF00 = Õ¯Õ¡Õ¶Õ¡Õ¹, # "
"FFFF00 = Õ¤Õ¥Õ²Õ«Õ¶ (Õ¯Õ¡Ö€Õ´Õ«Ö€ + Õ¯Õ¡Õ¶Õ¡Õ¹), # FFFFFF = Õ½ÕºÕ«Õ¿Õ¡Õ¯ "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
#, fuzzy
msgid "Relative font size"
msgstr "Õ€Õ¡Ö€Õ¡Õ¢Õ¥Ö€Õ¡Õ¯Õ¡Õ¶ Õ¹Õ¡ÖƒÕ½Õ¸Õ¾"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
#, fuzzy
msgid ""
@@@ -26626,67 -26621,67 +27302,119 @@@ msgstr "
"ÕÕ¡ Õ°Õ¡Ö€Õ¡Õ¢Õ¥Ö€Õ¡Õ¯Õ¡Õ¶ Õ¬Õ¼Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ Õ¹Õ¡ÖƒÕ¨ Õ¿Õ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯Õ¶Õ¥Ö€Õ«, Õ¸Ö€ ÕºÕ¥Õ¿Ö„ Õ§ Õ´Õ¡Õ¿Õ¸Ö‚ÖÕ¾Õ¡Õ® Õ¾Ö€Õ¡ Õ¾Õ«Õ¤Õ¥Õ¸. "
"ÔµÕ©Õ¥ Õ¢Õ¡ÖÕ¡Ö€Õ±Õ¡Õ¯ Õ¿Õ¡Õ¼Õ¡Õ¹Õ¡ÖƒÕ¨ Õ§ Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¥Õ¬, Õ°Õ¡Ö€Õ¡Õ¢Õ¥Ö€Õ¡Õ¯Õ¡Õ¶ Õ¹Õ¡ÖƒÕ¨ Õ¯Õ¬Õ«Õ¶Õ« overridden\"."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "Õ–Õ¸Õ¶"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "Õ–Õ¸Õ¶"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "Õ‡Ö€Õ»Õ¡Õ¶Õ¡Õ¯"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
++=======
+ #: modules/text_renderer/freetype.c:187
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow opacity"
msgstr "Õ½Õ¿Õ¾Õ¥Ö€Õ¸Ö‚Õ´ Õ·Õ¥Õ²Õ¸Ö‚Õ´"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "Õ½Õ¿Õ¾Õ¥Ö€Õ¨`"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
++=======
+ #: modules/text_renderer/freetype.c:189
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow angle"
msgstr "Õ½Õ¿Õ¾Õ¥Ö€Õ¨`"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:191
++=======
+ #: modules/text_renderer/freetype.c:190
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow distance"
msgstr "Õ½Õ¿Õ¾Õ¥Ö€Õ¸Ö‚Õ´ Õ·Õ¥Õ²Õ¸Ö‚Õ´"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Ô±Õ¾Õ¥Õ¬Õ« ÖƒÕ¸Ö„Ö€"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Õ“Õ¸Ö„Ö€"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Õ„Õ¥Õ®"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Ô±Õ¾Õ¥Õ¬Õ« Õ´Õ¥Õ®"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
++=======
+ #: modules/text_renderer/freetype.c:196
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Use YUVP renderer"
msgstr "Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ YUVP renderer"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
@@@ -26695,24 -26690,24 +27423,44 @@@ msgstr "
"Ô±ÕµÕ½ Õ¿Ö€Õ¡Õ´Õ¡Õ¤Ö€Õ¸Ö‚Õ´ Õ§ Õ¿Õ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯Õ¨, Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Õ¾ \" paletized YUV \". Ô±ÕµÕ½ "
"Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¨ Õ´Õ«Õ¡ÕµÕ¶ Õ¡Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ§, Õ¥Õ©Õ¥ ÖÕ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ®Õ¡Õ®Õ¯Õ¡Õ£Ö€Õ¥Õ¬ Õ´Õ¥Õ» DVB Õ¿Õ«Õ¿Ö€Õ¥Ö€Õ¸Õ¾"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text renderer"
msgstr "ÕÕ¥Ö„Õ½Õ¿ renderer"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 Ö†Õ¸Õ¶Õ¿Õ« ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ«Õ¹"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 Ö†Õ¸Õ¶Õ¿Õ« ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ«Õ¹"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"Please wait while your font cache is rebuilt.\n"
diff --combined po/ia.po
index 86a01c5,1a35f84..9f2502c
--- a/po/ia.po
+++ b/po/ia.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-05-04 07:53+0000\n"
"Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -133,7 -133,7 +137,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -440,10 -440,10 +448,17 @@@ msgid "&About
msgstr "Circ&a"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -482,17 -482,17 +497,29 @@@ msgid "Save...
msgstr ""
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr ""
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr ""
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -572,7 -572,7 +599,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Dishabilitar"
@@@ -1230,20 -1230,20 +1261,36 @@@ msgstr "Frequentia de photogramma
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1634,7 -1634,7 +1681,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1716,7 -1716,7 +1767,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Nulle"
@@@ -1740,7 -1740,7 +1795,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -1930,7 -1930,7 +1989,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr ""
@@@ -1981,7 -1981,7 +2044,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -1990,7 -1990,7 +2057,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2046,7 -2046,7 +2117,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2215,7 -2215,7 +2290,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2343,12 -2343,12 +2422,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2356,7 -2356,7 +2444,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2659,7 -2659,7 +2751,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3471,7 -3471,7 +3567,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3495,8 -3495,8 +3595,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3576,10 -3576,10 +3681,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3592,10 -3592,10 +3704,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Previe"
@@@ -3604,9 -3604,9 +3723,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3841,9 -3841,9 +3966,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4257,7 -4257,7 +4388,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4454,12 -4454,12 +4589,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr ""
@@@ -5215,7 -5215,7 +5359,11 @@@ msgstr "Taliar
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7511,7 -7511,7 +7659,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8243,7 -8243,7 +8395,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9354,7 -9354,7 +9510,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9385,7 -9385,7 +9545,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9393,30 -9393,30 +9557,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10582,46 -10582,46 +10770,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10629,61 -10629,61 +10845,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10813,7 -10813,7 +11065,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12602,10 -12602,10 +12858,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -12710,8 -12710,8 +12973,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13047,9 -13047,9 +13315,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -14928,7 -14928,7 +15202,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15107,7 -15107,7 +15385,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15195,9 -15195,9 +15477,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr ""
@@@ -15336,7 -15336,7 +15624,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15356,7 -15356,7 +15648,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15366,7 -15366,7 +15662,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15386,84 -15386,84 +15686,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15499,7 -15499,7 +15870,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15682,8 -15682,8 +16057,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -15776,36 -15776,36 +16156,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15957,7 -15957,7 +16369,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16086,7 -16086,7 +16502,11 @@@ msgstr "
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr ""
@@@ -16171,15 -16171,15 +16591,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16195,30 -16195,30 +16627,56 @@@ msgstr "
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16227,7 -16227,7 +16685,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16455,7 -16455,7 +16917,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -16626,7 -16626,7 +17092,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -16855,12 -16855,12 +17325,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17037,129 -17037,125 +17515,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17172,35 -17168,35 +17758,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19138,20 -19134,20 +19754,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22454,45 -22450,45 +23086,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22501,93 -22497,93 +23169,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/id.po
index d2be285,49b129d..2561c72
--- a/po/id.po
+++ b/po/id.po
@@@ -3,15 -3,14 +3,24 @@@
# This file is distributed under the same license as the VLC package.
#
# Translators:
++<<<<<<< HEAD
+# Firdaus Simbolon <dausbajing at hotmail.co.id>, 2013
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# Luqman Hakim <ovdl at rocketmail.com>, 2008,2010
msgid ""
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-09 14:25+0000\n"
+"Last-Translator: Firdaus Simbolon <dausbajing at hotmail.co.id>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-09-19 05:19+0000\n"
+ "Last-Translator: luqi <ovdl at rocketmail.com>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Indonesian (http://www.transifex.com/projects/p/vlc-trans/"
"language/id/)\n"
"Language: id\n"
@@@ -139,7 -138,7 +148,11 @@@ msgstr "Setting audio dan modul lain-la
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -484,10 -483,10 +497,17 @@@ msgid "&About
msgstr "Tent&ang"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -511,11 -510,11 +531,19 @@@ msgstr "Buat Folder...
#: include/vlc_intf_strings.h:70
msgid "Show Containing Directory..."
++<<<<<<< HEAD
+msgstr "Tunjukkan Dengan Isi Direktori..."
+
+#: include/vlc_intf_strings.h:71
+msgid "Show Containing Folder..."
+msgstr "Tunjukkan dengan Isi Berkas..."
++=======
+ msgstr ""
+
+ #: include/vlc_intf_strings.h:71
+ msgid "Show Containing Folder..."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:72
msgid "Stream..."
@@@ -526,17 -525,17 +554,29 @@@ msgid "Save...
msgstr "Simpan..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Ulang Semua"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Ulang Sekali"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -574,7 -573,7 +614,11 @@@ msgstr "Cari
#: include/vlc_intf_strings.h:97 modules/gui/macosx/VideoEffects.m:159
#: modules/gui/qt4/ui/video_effects.h:1399
msgid "Waves"
++<<<<<<< HEAD
+msgstr "Gelombang"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:98
msgid ""
@@@ -604,34 -603,6 +648,37 @@@
"code. You can also give funds and material to help us. And of course, you "
"can <b>promote</b> VLC media player.</p></body></html>"
msgstr ""
++<<<<<<< HEAD
+"<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; "
+"charset=utf-8\" /></head><body><h2>Selamat datang di Bantuan VLC Media "
+"Player</h2><h3>Dokumentasi</h3><p>Anda dapat menemukan dokumentasi VLC pada "
+"situs VideoLAN <a href=\"http://wiki.videolan.org\">wiki</a>.</p><p>Jika "
+"anda pengguna baru VLC Media Player, harap membaca<br><a href=\"http://wiki."
+"videolan.org/Documentation:VLC_for_dummies\"><em>Perkenalan pada VLC Media "
+"Player</em></a>.</p><p>Anda akan menemukan sejumlah informasi bagaimana "
+"menggunakan player ini pada dokumen <br>\"<a href=\"http://wiki.videolan.org/"
+"Documentation:Play_HowTo\"><em>Bagaimana memainkan berkas di VLC Media "
+"Player</em></a>\" .</p><p>Untuk menyimpan, mengkonversi, mentranskode, "
+"mengenkode, muxing dan melakukan tugas streaming, mungkin sebaiknya anda "
+"mencari informasi pada <a href=\"http://wiki.videolan.org/Documentation:"
+"Streaming_HowTo\">Dokumentasi Streaming</a>.</p><p>Jika anda tidak mengerti "
+"dengan istilah-istilah yang ada, konsultasikan pada <a href=\"http://wiki."
+"videolan.org/Knowledge_Base\">basis pengetahuan</a>.</p><p>untuk memahami "
+"tombol pintasan utama pada keyboard, baca halaman <a href=\"http://wiki."
+"videolan.org/Hotkeys\">pintasan</a>.</p><h3>Bantuan</h3><p>Sebelum "
+"menanyakan berbagai macam pertanyaan, tolong untuk melihat terlebih dahulu "
+"<a href=\"http://www.videolan.org/support/faq.html\">FAQ (Pertanyaan yang "
+"Sering Diajukan)</a>.</p><p>Anda mungkin akan mendapatkan (dan diberikan) "
+"bantuan dari <a href=\"http://forum.videolan.org\">Forums</a>, <a href="
+"\"http://www.videolan.org/vlc/lists.html\">mailing-lists</a> atau kanal IRC "
+"kami (<em>#videolan</em>pada irc.freenode.net).</p><h3>Kontribusi pada "
+"projek</h3><p>Anda dapat membantu proyek VideoLAN dengan memberikan sejumlah "
+"waktu anda untuk membantu komunitas kami, membuat skin, menerjemahkan "
+"dokumentasi, mencoba dan mengkoding. Anda juga dapat memberi kami bantuan "
+"dana dan materil. Dan tentu saja anda dapat <b>mempromosikan</b> VLC media "
+"player.</p></body></html>"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/audio_output/filters.c:247
msgid "Audio filtering failed"
@@@ -644,7 -615,7 +691,11 @@@ msgstr "Jumlah filter maksimum (%u) tel
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Dimatikan"
@@@ -890,43 -861,43 +941,83 @@@ msgstr "
#: src/config/keys.c:56
msgid "Backspace"
++<<<<<<< HEAD
+msgstr "Kembali"
+
+#: src/config/keys.c:57
+msgid "Brightness Down"
+msgstr "Turunkan Kecerahan"
+
+#: src/config/keys.c:58
+msgid "Brightness Up"
+msgstr "Tingkatkan Kecerahan"
+
+#: src/config/keys.c:59
+msgid "Browser Back"
+msgstr "Kembali pada Browser"
+
+#: src/config/keys.c:60
+msgid "Browser Favorites"
+msgstr "Favorit pada Browser"
+
+#: src/config/keys.c:61
+msgid "Browser Forward"
+msgstr "Maju pada Browser"
+
+#: src/config/keys.c:62
+msgid "Browser Home"
+msgstr "Beranda Browser"
+
+#: src/config/keys.c:63
+msgid "Browser Refresh"
+msgstr "Segarkan Browser"
+
+#: src/config/keys.c:64
+msgid "Browser Search"
+msgstr "Pencarian Browser"
+
+#: src/config/keys.c:65
+msgid "Browser Stop"
+msgstr "Hentikan Browser"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:57
+ msgid "Brightness Down"
+ msgstr ""
+
+ #: src/config/keys.c:58
+ msgid "Brightness Up"
+ msgstr ""
+
+ #: src/config/keys.c:59
+ msgid "Browser Back"
+ msgstr ""
+
+ #: src/config/keys.c:60
+ msgid "Browser Favorites"
+ msgstr ""
+
+ #: src/config/keys.c:61
+ msgid "Browser Forward"
+ msgstr ""
+
+ #: src/config/keys.c:62
+ msgid "Browser Home"
+ msgstr ""
+
+ #: src/config/keys.c:63
+ msgid "Browser Refresh"
+ msgstr ""
+
+ #: src/config/keys.c:64
+ msgid "Browser Search"
+ msgstr ""
+
+ #: src/config/keys.c:65
+ msgid "Browser Stop"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:66 modules/gui/macosx/playlist.m:518
#: modules/gui/qt4/dialogs/bookmarks.cpp:50
@@@ -937,15 -908,15 +1028,27 @@@ msgstr "Hapus
#: src/config/keys.c:67
msgid "Down"
++<<<<<<< HEAD
+msgstr "Bawah"
+
+#: src/config/keys.c:68 modules/control/rc.c:74
+msgid "End"
+msgstr "Akhir"
+
+#: src/config/keys.c:69
+msgid "Enter"
+msgstr "Masuk"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:68 modules/control/rc.c:74
+ msgid "End"
+ msgstr ""
+
+ #: src/config/keys.c:69
+ msgid "Enter"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:70
msgid "Esc"
@@@ -1001,11 -972,11 +1104,19 @@@ msgstr "F9
#: src/config/keys.c:83
msgid "Home"
++<<<<<<< HEAD
+msgstr "Beranda"
+
+#: src/config/keys.c:84
+msgid "Insert"
+msgstr "Masukkan"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:84
+ msgid "Insert"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:86
msgid "Media Angle"
@@@ -1343,21 -1314,21 +1454,37 @@@ msgstr "Kadar kerangka
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Input Anda tidak dapat dibuka"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Input Anda tidak dapat dibuka"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC tidak dapat membuka MRL '%s'. Periksa file catatan untuk perincian."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC gagal mengenali format input"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC gagal mengenali format input"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1790,7 -1761,7 +1917,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1876,7 -1847,7 +2007,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Tidak Ada"
@@@ -1906,7 -1877,7 +2041,11 @@@ msgstr "
"Ini adalah metode output video yang digunakan oleh VLC. Perilaku default "
"adalah memilih metode terbaik yang tersedia secara otomatis."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Hidupkan video"
@@@ -2113,7 -2084,7 +2252,11 @@@ msgstr "
"menggunakannya secara default."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Sentiasa di atas"
@@@ -2167,7 -2138,7 +2310,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2176,7 -2147,7 +2323,11 @@@ msgstr "Deinterlace
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Mode deinterlace"
@@@ -2232,7 -2203,7 +2383,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Dekorasi window"
@@@ -2426,7 -2397,7 +2581,11 @@@ msgstr "
"kotak (1:1). Jika Anda mempunyai screen 16:9, Anda mungkin perlu mengubah "
"ini menjadi 4:3 untuk menjaga proporsi."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Lewati frame"
@@@ -2571,12 -2542,12 +2730,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2584,7 -2555,7 +2752,11 @@@ msgid "Default
msgstr "Default"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2921,7 -2892,7 +3093,11 @@@ msgid "You can completely disable the s
msgstr "Anda dapat mematikan pemrosesan sub-gambar secara keseluruhan."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3844,7 -3815,7 +4020,11 @@@ msgid "These settings are the global VL
msgstr ""
"Setting ini adalah pengikat kunci VLC global, dikenal sebagai \"hotkey\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Abaikan"
@@@ -3868,8 -3839,8 +4048,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3949,10 -3920,10 +4134,17 @@@ msgid "Slower (fine)
msgstr "Lebih lambat (bagus)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3967,10 -3938,10 +4159,17 @@@ msgstr "
"playlist."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Sebelumnya"
@@@ -3980,9 -3951,9 +4179,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"Pilih hotkey yang digunakan untuk melompat ke item sebelumnya dalam playlist."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4218,9 -4189,9 +4423,15 @@@ msgid "Select the key to decrease audi
msgstr "Pilih kunci untuk mengurangi volume audio."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Bisu"
@@@ -4635,7 -4606,7 +4846,11 @@@ msgstr "Putar sesuai perangkat audio ya
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Snapshot"
@@@ -4841,12 -4812,12 +5056,21 @@@ msgstr "Mengunduh ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Batal"
@@@ -5611,7 -5582,7 +5835,11 @@@ msgstr "Potong
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Rasio aspek"
@@@ -8005,7 -7976,7 +8233,11 @@@ msgstr "Input Layar
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Layar"
@@@ -8741,7 -8712,7 +8973,11 @@@ msgstr "# Vol maks
msgid "Volume Set"
msgstr "Set Volume"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9894,7 -9865,7 +10130,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "Output audio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Output audio gagal"
@@@ -9925,7 -9896,7 +10165,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "Output audio Android AudioTrack"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "Output AudioUnit untuk iOS"
@@@ -9933,22 -9904,22 +10177,38 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Output AudioUnit HAL"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Output AudioUnit HAL"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Perangkat output audio dipilih sedang digunakan secara eksklusif oleh "
"program lain."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Perangkat audio tidak dikonfigurasikan"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Perangkat audio tidak dikonfigurasikan"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -9957,11 -9928,11 +10217,19 @@@ msgstr "
"Pemasang Audio Midi\" di dalam /Aplikasi/Utilitas. Mode stereo sekarang "
"sedang digunakan."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Perangkat Output Suara Sistem"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Perangkat Output Suara Sistem"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Output Terenkodekan)"
@@@ -11221,46 -11192,46 +11489,74 @@@ msgstr "Bayangan
msgid "Outline"
msgstr "Panduan"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Hitam"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Kelabu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Perak"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Putih"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Maroon"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Merah"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11268,61 -11239,61 +11564,97 @@@ msgid "Fuchsia
msgstr "Fuchsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Kuning"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Olive"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Hijau"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Teal"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lime"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Purple"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Navy"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Biru"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11466,7 -11437,7 +11798,11 @@@ msgstr "Subtitle (lanjutan)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Membangun cache font"
@@@ -13377,10 -13348,10 +13713,17 @@@ msgid "Fast
msgstr "Cepat"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -13488,8 -13459,8 +13831,13 @@@ msgid "D-Bus control interface
msgstr "Antarmuka kontrol D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13845,9 -13816,9 +14193,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Rehat"
@@@ -15767,7 -15738,7 +16121,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Demuxer Stream Pengangkut MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teleteks"
@@@ -15946,7 -15917,7 +16304,11 @@@ msgid "VLC media player Help
msgstr "Bantuan VLC media player"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Indeks"
@@@ -16034,9 -16005,9 +16396,15 @@@ msgstr "Masukkan nama untuk profil baru
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Simpan"
@@@ -16181,7 -16152,7 +16549,11 @@@ msgid "The stream must be playing or pa
msgstr ""
"Stream harus ditayangkan atau dihentikan seketika agar tanda buku berfungsi."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Lompat Ke Waktu"
@@@ -16201,7 -16172,7 +16573,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16211,7 -16182,7 +16587,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16231,84 -16202,84 +16611,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr "Klik untuk menghidupkan playback video layar penuh."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Klik untuk menghentikan playback."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Sembunyikan/Tampilkan Playlist"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Klik untuk menghentikan playback."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Sembunyikan/Tampilkan Playlist"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Volume Penuh"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Klik untuk memainkan audio pada volume maksimum."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Volume Penuh"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Klik untuk memainkan audio pada volume maksimum."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efek"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16344,7 -16315,7 +16795,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16529,8 -16500,8 +16984,13 @@@ msgid "A SDP export is requested, but n
msgstr "Ekspor SDP dimintakan, namun tidak ada URL yang diberikan."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -16634,36 -16605,36 +17094,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Tidak ada CrashLog yang ditemukan"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Tidak ada CrashLog yang ditemukan"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Teruskan"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Tidak menemukan jejak crash sebelumnya."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Kami baru saja menemukan file preferensi VLC versi lama."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Buang ke Tempat Sampah dan Jalankan Ulang VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Tidak menemukan jejak crash sebelumnya."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Kami baru saja menemukan file preferensi VLC versi lama."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Buang ke Tempat Sampah dan Jalankan Ulang VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC Debug Log (%s).rtf"
@@@ -16828,7 -16799,7 +17320,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Kunci Rasio Aspek"
@@@ -16957,7 -16928,7 +17453,11 @@@ msgstr "Sembunyikan VLC
msgid "Hide Others"
msgstr "Sembunyikan Lain"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Tampilkan Semua"
@@@ -17042,15 -17013,15 +17542,27 @@@ msgstr "Sinkronisasi Trek
msgid "A→B Loop"
msgstr "Perulangan A->B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Keluar sesudah Playback"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Maju Langkah"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Keluar sesudah Playback"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Maju Langkah"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Undur Langkah"
@@@ -17066,30 -17037,30 +17578,56 @@@ msgstr "Turunkan Volume
msgid "Audio Device"
msgstr "Perangkat Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Setengah Ukuran"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Ukuran Normal"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Ukuran Ganda"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Sesuai Layar"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Setengah Ukuran"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Ukuran Normal"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Ukuran Ganda"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Sesuai Layar"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Apung di Atas"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Perangkat Video Layar Penuh"
@@@ -17098,7 -17069,7 +17636,11 @@@
msgid "Post processing"
msgstr "Pasca memproses"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Tambah File Subtitle..."
@@@ -17326,7 -17297,7 +17868,11 @@@ msgid "Play another media synchronously
msgstr "Jalankan media lain secara sinkron"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Pilih..."
@@@ -17499,7 -17470,7 +18045,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Pengenkodean subtitle"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Ukuran Font"
@@@ -17728,12 -17699,12 +18278,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr "VLC gagal menyimpan meta data."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Pilihan"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Reset Semua"
@@@ -17910,129 -17881,125 +18468,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Enkoding Default"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Setting Tampilan"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Enkoding Default"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Setting Tampilan"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Warna font"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Font"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Bahasa subtitle"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Bahasa subtitle"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Bahasa subtitle yang diinginkan"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Hidupkan OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Hidupkan OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Kelegapan"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Layar hitam pada mode Layar penuh"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Layar hitam pada mode Layar penuh"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Tampilan"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Modul output"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Snapshot video"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Folder"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Format"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefiks"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Penomoran sekuensial"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Pemeriksaan terakhir pada: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Tidak ada pemeriksaan yang dilakukan sebelumnya."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Modul output"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Snapshot video"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Folder"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Format"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefiks"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Penomoran sekuensial"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Pemeriksaan terakhir pada: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Tidak ada pemeriksaan yang dilakukan sebelumnya."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Latensi terendah"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Latensi rendah"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Latensi tinggi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Latensi lebih tinggi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Reset Pilihan"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18045,37 -18012,37 +18711,67 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Pilih folder untuk menyimpan snapshot video Anda."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Pilih"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Pilih direktori atau nama file di mana rekaman akan disimpan."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Pilih folder untuk menyimpan snapshot video Anda."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Pilih"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Pilih direktori atau nama file di mana rekaman akan disimpan."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Kombinasi tidak sah"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Kombinasi tidak sah"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"Sayangnya, kunci-kunci tersebut tidak dapat dijadikan sebagai shortcut "
"hotkey."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Kombinasi ini telah dipergunakan oleh \"%@\"."
@@@ -20140,20 -20107,20 +20836,36 @@@ msgstr "Hapus profil yang dipilih
msgid "Create a new profile"
msgstr "Buat sebuah profil baru"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Buat"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Anda harus menentukan nama untuk profil."
@@@ -20369,8 -20336,9 +21081,14 @@@ msgid "Network Access Policy
msgstr "Kebijakan Akses Jaringan"
#: modules/gui/qt4/dialogs/firstrun.cpp:98
++<<<<<<< HEAD
+msgid "Automatically retrieve media info"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Automatically retrieve media info"
+ msgstr "Ambil info media otomatis"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:103
msgid "Regularly check for VLC updates"
@@@ -23612,23 -23580,23 +24330,43 @@@ msgstr "Output stream tertranskodekan
msgid "Overlays/Subtitles"
msgstr "Overlays/Subtitles"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Font family dari font yang ingin Anda gunakan"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Nama file untuk font yang ingin Anda gunakan"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Ukuran font dalam piksel"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Font family dari font yang ingin Anda gunakan"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Nama file untuk font yang ingin Anda gunakan"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Ukuran font dalam piksel"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23638,11 -23606,11 +24376,19 @@@ msgstr "
"ditetapkan pada sesuatu yang lain dari 0 pilihan ini akan menindih ukuran "
"font relatif."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -23650,12 -23618,12 +24396,20 @@@ msgstr "
"Kelegapan (kebalikan dari transparansi) pada teks yang akan diberikan pada "
"video. 0 = tansparan, 255 = legap keseluruhannya."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Warna default teks"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23668,71 -23636,71 +24422,131 @@@ msgstr "
"kemudian biru. #000000 = hitam, #FF0000 = merah, #00FF00 = hijau, #FFFF00 = "
"kuning (merah + hijau), #FFFFFF = putih"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Ukuran font relatif"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Warna bayangan"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Sudut bayangan"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Jarak bayangan"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Warna bayangan"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Sudut bayangan"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Jarak bayangan"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Lebih kecil"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Kecil"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Besar"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Lebih besar"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Gunakan renderer YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Gunakan renderer YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -23740,23 -23708,23 +24554,43 @@@ msgstr "
"Ini merender font menggunakan \"YUV terpalet\". Pilihan ini hanya dibutuhkan "
"jika Anda ingin mengenkodenya ke dalam subtiltle DVB"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Tipis"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Tebal"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Perender teks"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Perender Font Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Tipis"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Tebal"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Perender teks"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Perender Font Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -28556,6 -28524,9 +29390,12 @@@ msgstr "
msgid "Media Manager List"
msgstr "Daftar Media Manager"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Tampilkan Detail"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -30497,10 -30468,6 +31337,13 @@@
#~ msgstr "kiri"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Detail Kodek"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Add a subtitle file"
#~ msgstr "Gunakan file sub&title"
@@@ -31113,7 -31080,7 +31956,11 @@@
#, fuzzy
#~ msgid "Automatically add new medias to ML"
++<<<<<<< HEAD
+#~ msgstr "Tambah/hapus input stream secara otomatis"
++=======
+ #~ msgstr "Ambil info media otomatis"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "OSD configuration importer"
diff --combined po/is.po
index dfb0e21,bb44dbd..7dfca80
--- a/po/is.po
+++ b/po/is.po
@@@ -10,9 -10,9 +10,15 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-12-06 23:40+0000\n"
+"Last-Translator: Sveinn à Felli <sv1 at fellsnet.is>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-11-11 09:36+0000\n"
+ "Last-Translator: Sveinn à Felli <sveinki at nett.is>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Icelandic (http://www.transifex.com/projects/p/vlc-trans/"
"language/is/)\n"
"Language: is\n"
@@@ -140,7 -140,7 +146,11 @@@ msgstr "Ãmsar hljóðstillingar og ein
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -471,10 -471,10 +481,17 @@@ msgid "&About
msgstr "&Um forritið"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -513,17 -513,17 +530,29 @@@ msgid "Save...
msgstr "Vista..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Endurtaka allt"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Endurtaka einu sinni"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -630,7 -630,7 +659,11 @@@ msgstr "Hámarksfjölda sÃa náð (%u)
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Gera óvirkt"
@@@ -1294,21 -1294,21 +1327,37 @@@ msgstr "Rammahraði
msgid "Decoded format"
msgstr "Afkóðað snið"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Ekki hægt að opna inntak"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Ekki hægt að opna inntak"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC gat ekki opnað MRL '%s'. Athugaðu annálinn fyrir frekari upplýsingar."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC þekkir ekki inntakssniðið"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC þekkir ekki inntakssniðið"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1636,7 -1636,7 +1685,11 @@@ msgstr "
#: src/libvlc-module.c:142
msgid "Audio output volume step"
++<<<<<<< HEAD
+msgstr "Þrep hljóðstyrks"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:144
msgid "The step size of the volume is adjustable using this option."
@@@ -1644,7 -1644,7 +1697,11 @@@ msgstr "
#: src/libvlc-module.c:147
msgid "Remember the audio volume"
++<<<<<<< HEAD
+msgstr "Muna hljóðstyrk"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:149
msgid ""
@@@ -1688,7 -1688,7 +1745,11 @@@ msgstr "
#: src/libvlc-module.c:171 modules/gui/macosx/simple_prefs.m:308
msgid "Force detection of Dolby Surround"
++<<<<<<< HEAD
+msgstr "Þvinga að finna Dolby Surround"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:173
msgid ""
@@@ -1702,7 -1702,7 +1763,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1722,7 -1722,7 +1787,11 @@@ msgstr "Slökkt
#: src/libvlc-module.c:182
msgid "Stereo audio output mode"
++<<<<<<< HEAD
+msgstr "VÃðóma úttakshamur"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:194
msgid "This adds audio post processing filters, to modify the sound rendering."
@@@ -1742,7 -1742,7 +1811,11 @@@ msgstr "
#: src/libvlc-module.c:207
msgid "Replay preamp"
++<<<<<<< HEAD
+msgstr "Formögnun endurspilunar"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:209
msgid ""
@@@ -1784,7 -1784,7 +1857,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Ekkert"
@@@ -1808,7 -1808,7 +1885,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Virkja myndband"
@@@ -1998,7 -1998,7 +2079,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Alltaf efst"
@@@ -2049,7 -2049,7 +2134,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2058,7 -2058,7 +2147,11 @@@ msgstr "Afflétta
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Affléttuhamur"
@@@ -2114,7 -2114,7 +2207,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Skreyta glugga"
@@@ -2283,7 -2283,7 +2380,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Sleppa römmum"
@@@ -2411,12 -2411,12 +2512,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2424,7 -2424,7 +2534,11 @@@ msgid "Default
msgstr "Sjálfgefið"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2727,7 -2727,7 +2841,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3539,7 -3539,7 +3657,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Hunsa"
@@@ -3563,8 -3563,8 +3685,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3644,10 -3644,10 +3771,17 @@@ msgid "Slower (fine)
msgstr "Hægar (fÃnt)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3660,10 -3660,10 +3794,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Afturábak"
@@@ -3672,9 -3672,9 +3813,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3909,9 -3909,9 +4056,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Hljóð af"
@@@ -4325,7 -4325,7 +4478,11 @@@ msgstr "Skipta milli titæka hljóðtæ
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Skjámynd"
@@@ -4524,12 -4524,12 +4681,21 @@@ msgstr "Hleð Niður...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Hætta við"
@@@ -5287,7 -5287,7 +5453,11 @@@ msgstr "UtansnÃða
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Stærðarhlutföll"
@@@ -7592,7 -7592,7 +7762,11 @@@ msgstr "Skjáinntak
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Skjár"
@@@ -8326,7 -8326,7 +8500,11 @@@ msgstr "Hljóð hámark #
msgid "Volume Set"
msgstr "Stilla hljóðstyrk"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9437,7 -9437,7 +9615,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "ALSA hljóðúttak"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Hljóðúttaksvilla"
@@@ -9470,7 -9470,7 +9652,11 @@@ msgstr "AudioQueue (iOS / Mac OS) hljó
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9478,30 -9478,30 +9664,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit úttak"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit úttak"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Hljóðtæki er ekki stillt"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Hljóðtæki er ekki stillt"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (kóðað úttak)"
@@@ -10673,46 -10673,46 +10883,74 @@@ msgstr "Skuggi
msgid "Outline"
msgstr "ÚtlÃnur"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Svart"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Grátt"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Silfur"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "HvÃtt"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Ljósbrúnt"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Rautt"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10720,61 -10720,61 +10958,97 @@@ msgid "Fuchsia
msgstr "Dökkbleikt"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Gult"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "ÓlÃfu"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Grænt"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Blágrænt"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "LÃmónu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Purpurablátt"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Flotablátt"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Blátt"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10904,7 -10904,7 +11178,11 @@@ msgstr "Skjátextar (Ãtarlegt)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12691,10 -12691,10 +12969,17 @@@ msgid "Fast
msgstr "Hratt"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Venulegt"
@@@ -12799,8 -12799,8 +13084,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus stýriviðmjót"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -12961,7 -12961,7 +13251,11 @@@ msgstr "
#: modules/control/hotkeys.c:769
#, c-format
msgid "Aspect ratio: %s"
++<<<<<<< HEAD
+msgstr "Stærðarhlutföll: %s"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:799
#, c-format
@@@ -13010,7 -13010,7 +13304,11 @@@ msgstr "
#: modules/control/hotkeys.c:1173
#, c-format
msgid "Speed: %.2fx"
++<<<<<<< HEAD
+msgstr "Hraði: %.2fx"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/lirc.c:46
msgid "Change the lirc configuration file"
@@@ -13136,9 -13136,9 +13434,15 @@@ msgstr "Frumstilli
msgid "Opening"
msgstr "Opnar"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Hlé"
@@@ -14252,7 -14252,7 +14556,11 @@@ msgstr "
#: modules/demux/mp4/id3genres.h:131
msgid "Acoustic"
++<<<<<<< HEAD
+msgstr "Órafmagnað"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:132
msgid "Humour"
@@@ -14260,27 -14260,27 +14568,51 @@@ msgstr "
#: modules/demux/mp4/id3genres.h:133
msgid "Speech"
++<<<<<<< HEAD
+msgstr "Tal"
+
+#: modules/demux/mp4/id3genres.h:134
+msgid "Chanson"
+msgstr "Sönglög"
+
+#: modules/demux/mp4/id3genres.h:135
+msgid "Opera"
+msgstr "Ópera"
+
+#: modules/demux/mp4/id3genres.h:136
+msgid "Chamber Music"
+msgstr "KammermúsÃk"
+
+#: modules/demux/mp4/id3genres.h:137
+msgid "Sonata"
+msgstr "Sónata"
+
+#: modules/demux/mp4/id3genres.h:138
+msgid "Symphony"
+msgstr "SinfónÃskt"
++=======
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:134
+ msgid "Chanson"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:135
+ msgid "Opera"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:136
+ msgid "Chamber Music"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:137
+ msgid "Sonata"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:138
+ msgid "Symphony"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:139
msgid "Booty Bass"
@@@ -14304,11 -14304,11 +14636,19 @@@ msgstr "
#: modules/demux/mp4/id3genres.h:145
msgid "Tango"
++<<<<<<< HEAD
+msgstr "Tangó"
+
+#: modules/demux/mp4/id3genres.h:146
+msgid "Samba"
+msgstr "Samba"
++=======
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:146
+ msgid "Samba"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:147
msgid "Folklore"
@@@ -14316,7 -14316,7 +14656,11 @@@ msgstr "
#: modules/demux/mp4/id3genres.h:148
msgid "Ballad"
++<<<<<<< HEAD
+msgstr "Ballöður"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:149
msgid "Power Ballad"
@@@ -14332,7 -14332,7 +14676,11 @@@ msgstr "
#: modules/demux/mp4/id3genres.h:152
msgid "Duet"
++<<<<<<< HEAD
+msgstr "Dúett"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:153
msgid "Punk Rock"
@@@ -14340,7 -14340,7 +14688,11 @@@ msgstr "
#: modules/demux/mp4/id3genres.h:154
msgid "Drum Solo"
++<<<<<<< HEAD
+msgstr "Trommusóló"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:155
msgid "Acapella"
@@@ -15017,7 -15017,7 +15369,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Textavarp"
@@@ -15196,7 -15196,7 +15552,11 @@@ msgid "VLC media player Help
msgstr "VLC spilara hjálp"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "VÃsir"
@@@ -15284,9 -15284,9 +15644,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Vista"
@@@ -15427,7 -15427,7 +15793,11 @@@ msgstr "Ekkert Inntak Fundið
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Straumurinn verður að vera à spilun eða à bið svo að bókamerkin virki."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Hoppa að TÃma"
@@@ -15447,7 -15447,7 +15817,11 @@@ msgstr "
msgid "Backward"
msgstr "Afturábak"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15457,7 -15457,7 +15831,11 @@@ msgstr "
msgid "Forward"
msgstr "Ãfram"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15477,84 -15477,84 +15855,155 @@@ msgstr "VÃxla heilskjásham
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Sýna/fela spilunarlista"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Sýna/fela spilunarlista"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Endurtaka"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Stokka"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Stokka"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Fullur hljóðstyrkur"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Fullur hljóðstyrkur"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Brellur"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15590,7 -15590,7 +16039,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15775,8 -15775,8 +16228,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Sérsnið"
@@@ -15869,36 -15869,36 +16327,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Halda Ãfram"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16050,7 -16050,7 +16540,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Læsa stærðarhlutföllum"
@@@ -16179,7 -16179,7 +16673,11 @@@ msgstr "Fela VLC
msgid "Hide Others"
msgstr "Fela annað"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Sýna allt"
@@@ -16264,15 -16264,15 +16762,27 @@@ msgstr "Samstilling spora
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Hætta eftir spilun"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Skref áfram"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Hætta eftir spilun"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Skref áfram"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Skref aftur á bak"
@@@ -16288,30 -16288,30 +16798,56 @@@ msgstr "Minnka hljóðstyrk
msgid "Audio Device"
msgstr "Hljóðtæki"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Hálf stærð"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Venjuleg stærð"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Tvöföld stærð"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Laga að skjá"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Hálf stærð"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Venjuleg stærð"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Tvöföld stærð"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Laga að skjá"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Fljóta efst"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Heilskjástæki"
@@@ -16320,7 -16320,7 +16856,11 @@@
msgid "Post processing"
msgstr "Eftirvinnsla"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16548,7 -16548,7 +17088,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Velja..."
@@@ -16719,7 -16719,7 +17263,11 @@@ msgstr "Rammar á sek
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Leturstærð"
@@@ -16948,12 -16948,12 +17496,20 @@@ msgstr "Villa við að vista lýsigögn
msgid "VLC was unable to save the meta data."
msgstr "VLC tókst ekki að vista lýsigögnin."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Kjörstillingar"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Endurstilla allt"
@@@ -17130,129 -17130,125 +17686,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Sjálfgefin stafatafla"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Stillingar skjás"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Sjálfgefin stafatafla"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Stillingar skjás"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Litur á letri"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Letur"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Virkja texta á skjá (OSD)"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Virkja texta á skjá (OSD)"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Ógagnsæi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Þvinga feitletrað"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Þvinga feitletrað"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Litur útlÃna"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Breidd útlÃna"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Sýna"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Úttakseining"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Skjámyndir úr myndskeiðum"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Mappa"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Snið"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Forskeyti"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Númeraröð"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Úttakseining"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Skjámyndir úr myndskeiðum"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Mappa"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Snið"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Forskeyti"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Númeraröð"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Minnsti biðtÃmi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "LÃtill biðtÃmi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Mikill biðtÃmi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Mesti biðtÃmi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Frumstilla kjörstillingar"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17265,35 -17261,35 +17929,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Velja"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Velja"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Ógild samsetning"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Ógild samsetning"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19233,20 -19229,20 +19927,36 @@@ msgstr "Eyða völdu sniði
msgid "Create a new profile"
msgstr "Búa til nýtt snið"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Búa til"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22559,45 -22555,45 +23269,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Leturstærð à punktum"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Leturstærð à punktum"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Gegnsæi texta"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Gegnsæi texta"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Sjálfgefinn litur á texta"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22606,93 -22602,93 +23352,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Hlutfallsleg leturstærð"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Ógegnsæi bakgrunns"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Bakgrunnslitur"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Ógagnsæi útlÃna"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Ógagnsæi skugga"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Litur skugga"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Horn skugga"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Fjarlægð skugga"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Ógegnsæi bakgrunns"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Bakgrunnslitur"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Ógagnsæi útlÃna"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Ógagnsæi skugga"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Litur skugga"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Horn skugga"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Fjarlægð skugga"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Minni"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "LÃtil"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Stór"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Stærri"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Nota YUVP myndgerð"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Nota YUVP myndgerð"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Mjóar"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Þykkar"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Textamyndgerð"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Mjóar"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Þykkar"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Textamyndgerð"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/it.po
index ee8be64,1ef2886..7600932
--- a/po/it.po
+++ b/po/it.po
@@@ -5,13 -5,10 +5,20 @@@
# Translators:
# Bruno Vella 2002-2003
# Carlo Calabrò 2003-2004
++<<<<<<< HEAD
+# prangel <prangel85 at gmail.com>, 2013
# FranzMari <franzmari at chakra-project.it>, 2013
# ghina90 <ghina8 at gmail.com>, 2013
+# Lorenzo Facca <lorenzo.facca at ovi.com>, 2013
# Lorenzo Porta, 2013
# Vindex17 <vindex17 at outlook.it>, 2013
+# Stiffmaister88 <antani125 at yahoo.it>, 2013
++=======
++# FranzMari <franzmari at chakra-project.it>, 2013
++# ghina90 <ghina8 at gmail.com>, 2013
++# Lorenzo Porta, 2013
++# Vindex17 <vindex17 at outlook.it>, 2013
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# Marco91, 2013
# polxmod <paolo.velati at gmail.com>, 2013
# verodigiorgio <verodigiorgio at gmail.com>, 2013
@@@ -20,9 -17,9 +27,15 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-12-02 14:05+0000\n"
+"Last-Translator: Lorenzo Facca <lorenzo.facca at ovi.com>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-09-28 10:03+0000\n"
+ "Last-Translator: Vindex17 <vindex17 at outlook.it>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Italian (http://www.transifex.com/projects/p/vlc-trans/"
"language/it/)\n"
"Language: it\n"
@@@ -150,7 -147,7 +163,11 @@@ msgstr "Impostazioni audio e moduli var
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -505,10 -502,10 +522,17 @@@ msgid "&About
msgstr "Inform&azioni"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -547,17 -544,17 +571,29 @@@ msgid "Save...
msgstr "Salva..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Ripeti tutto"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Ripeti un elemento"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -666,7 -663,7 +702,11 @@@ msgstr "Il numero massimo di filtri (%u
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Disabilita"
@@@ -1372,22 -1369,22 +1412,38 @@@ msgstr "Immagini al secondo
msgid "Decoded format"
msgstr "Formato decodificato"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "L'ingresso non può essere aperto"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "L'ingresso non può essere aperto"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC non è in grado di aprire il MRL '%s'. Controlla il registro per i "
"dettagli."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC non può riconoscere il formato d'ingresso"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC non può riconoscere il formato d'ingresso"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1825,7 -1822,7 +1881,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1914,7 -1911,7 +1974,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Nessuno"
@@@ -1945,7 -1942,7 +2009,11 @@@ msgstr "
"È il metodo di uscita video utilizzato da VLC. Il comportamento predefinito "
"è di selezionare automaticamente il miglior metodo disponibile."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Abilita video"
@@@ -2157,7 -2154,7 +2225,11 @@@ msgstr "
"modo predefinito."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Sempre in primo piano"
@@@ -2214,7 -2211,7 +2286,11 @@@ msgstr "Nascondi puntatore e controllo
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2223,7 -2220,7 +2299,11 @@@ msgstr "Deinterlacciamento
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Modalità deinterlacciata"
@@@ -2283,7 -2280,7 +2363,11 @@@ msgstr "
"qualsiasi riproduzione, per evitare che il computer vada in sospensione per "
"inattività ."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Decorazioni della finestra"
@@@ -2493,7 -2490,7 +2577,11 @@@ msgstr "
"quadrati (1:1). Se hai uno schermo 16:9, potresti voler cambiare in 4:3 per "
"mantenere le proporzioni."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Salta fotogrammi"
@@@ -2642,12 -2639,12 +2730,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2655,7 -2652,7 +2752,11 @@@ msgid "Default
msgstr "Predefinito"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -3007,7 -3004,7 +3108,11 @@@ msgid "You can completely disable the s
msgstr "Puoi disabilitare completamente l'elaborazione dei sottotitoli."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3979,7 -3976,7 +4084,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "Parametri di controllo via tastiera, conosciuti come \"hotkeys\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignora"
@@@ -4005,8 -4002,8 +4114,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4089,10 -4086,10 +4203,17 @@@ msgid "Slower (fine)
msgstr "Più lento (fine)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4105,10 -4102,10 +4226,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Scelta del tasto per passare all'elemento successivo della scaletta."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Precedente"
@@@ -4117,9 -4114,9 +4245,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "Scelta del tasto per passare all'elemento precedente della scaletta."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4359,9 -4356,9 +4493,15 @@@ msgid "Select the key to decrease audi
msgstr "Seleziona il tasto per ridurre il volume audio."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Silenzio"
@@@ -4793,7 -4790,7 +4933,11 @@@ msgstr "Scelta a rotazione tra i dispos
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Schermata"
@@@ -4998,12 -4995,12 +5142,21 @@@ msgstr "Scaricamento in corso...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Annulla"
@@@ -5770,7 -5767,7 +5923,11 @@@ msgstr "Ritaglio
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Proporzioni"
@@@ -8294,7 -8291,7 +8451,11 @@@ msgstr "Input schermo
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Schermo"
@@@ -8803,8 -8800,8 +8964,13 @@@ msgid "
"Enable the color killer, i.e. switch to black & white picture whenever the "
"signal is weak."
msgstr ""
++<<<<<<< HEAD
+"Abilita il soppressore di colore, ad esempio cambia un'immagine in bianco e "
+"nero ogni volta che il segnale è debole."
++=======
+ "Abilità il color killer, ad esempio cambia un'immagine in bianco e nero ogni "
+ "volta che il segnale è debole"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:156
msgid "Color effect"
@@@ -8890,11 -8887,11 +9056,19 @@@ msgstr "Silenzia l'audio.
#: modules/access/v4l2/v4l2.c:184
msgid "Loudness mode"
++<<<<<<< HEAD
+msgstr "Modalità Loudness"
+
+#: modules/access/v4l2/v4l2.c:186
+msgid "Loudness mode a.k.a. bass boost."
+msgstr "Modalità Loudness, conosciuta anche come aumento del basso."
++=======
+ msgstr "modalità Loudness"
+
+ #: modules/access/v4l2/v4l2.c:186
+ msgid "Loudness mode a.k.a. bass boost."
+ msgstr "Modalità rumorosa, conosciuta anche come aumento del basso."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:188
msgid "v4l2 driver controls"
@@@ -9051,7 -9048,7 +9225,11 @@@ msgstr "Vol max #
msgid "Volume Set"
msgstr "Volume"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9217,7 -9214,7 +9395,11 @@@ msgstr "Autorità di certificazione X.5
#: modules/access/vnc.c:49
msgid "Certificate of the Authority to verify server's against"
++<<<<<<< HEAD
+msgstr "Certificato dell'Autorità per la verifica contro il server"
++=======
+ msgstr "Certificato dell'Autorità per la verifica contro il server."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:50
msgid "X.509 Certificate Revocation List"
@@@ -10250,7 -10247,7 +10432,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "Uscita audio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Uscita audio non riuscita"
@@@ -10283,7 -10280,7 +10469,11 @@@ msgstr "Uscita audio AudioQueue (iOS /
msgid "Android AudioTrack audio output"
msgstr "Uscita audio AudioTrack Android"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "Uscita AudioUnit per iOS"
@@@ -10291,32 -10288,32 +10481,56 @@@
msgid "Last audio device"
msgstr "Ultimo dispositivo audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Uscita HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Uscita HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Il dispositivo di uscita audio selezionato è utilizzato in modo esclusivo da "
"un altro programma."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Il dispositivo audio non è configurato"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Il dispositivo audio non è configurato"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Dispositivo di uscita audio di sistema"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Dispositivo di uscita audio di sistema"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Uscita codificata)"
@@@ -11550,7 -11547,7 +11764,11 @@@ msgstr "Coro
#: modules/codec/fluidsynth.c:51
msgid "Synthesis gain"
++<<<<<<< HEAD
+msgstr "Guadagno di sintesi"
++=======
+ msgstr "Aumento di sintesi"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fluidsynth.c:52
msgid ""
@@@ -11629,46 -11626,46 +11847,74 @@@ msgstr "Ombra
msgid "Outline"
msgstr "Bordatura"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Nero"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Grigio"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Argento"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Bianco"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Marrone"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Rosso"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11676,61 -11673,61 +11922,97 @@@ msgid "Fuchsia
msgstr "Fucsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Giallo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Oliva"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Verde"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Teal"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lime"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Viola"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Navy"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Blu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11887,7 -11884,7 +12169,11 @@@ msgstr "Sottotitoli (avanzato)
msgid "Subtitle renderers using libass"
msgstr "Esegue il rendering dei sottotitoli usando libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Creazione della cache dei caratteri"
@@@ -13613,7 -13610,7 +13899,11 @@@ msgstr "
#: modules/codec/x264.c:327
msgid "Decide references on a per partition basis"
++<<<<<<< HEAD
+msgstr "Decide le referenze in base alla partizione"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:328
msgid ""
@@@ -13841,10 -13838,10 +14131,17 @@@ msgid "Fast
msgstr "Veloce"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normale"
@@@ -13954,8 -13951,8 +14251,13 @@@ msgid "D-Bus control interface
msgstr "Interfaccia di controllo D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14310,9 -14307,9 +14612,15 @@@ msgstr "Inizializzazione
msgid "Opening"
msgstr "Apertura"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pausa"
@@@ -16188,7 -16185,7 +16496,11 @@@ msgstr "MTU per modalità out
#: modules/demux/ts.c:109
msgid "MTU for out mode."
++<<<<<<< HEAD
+msgstr "MTU per modalità out"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/ts.c:111 modules/mux/mpeg/ts.c:159
msgid "CSA Key"
@@@ -16242,7 -16239,7 +16554,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Demultiplatore MPEG Transport Stream"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Televideo"
@@@ -16430,7 -16427,7 +16746,11 @@@ msgid "VLC media player Help
msgstr "Guida al lettore multimediale VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Indice"
@@@ -16518,9 -16515,9 +16838,15 @@@ msgstr "Digita un nome per il nuovo pro
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Salva"
@@@ -16666,7 -16663,7 +16992,11 @@@ msgstr "
"Il flusso deve essere in riproduzione o in pausa per far funzionare i "
"segnalibri."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Salta a"
@@@ -16686,7 -16683,7 +17016,11 @@@ msgstr "Clic per riprodurre o sospender
msgid "Backward"
msgstr "Indietro"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16696,7 -16693,7 +17030,11 @@@ msgstr "
msgid "Forward"
msgstr "Avanti"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16716,34 -16713,26 +17054,54 @@@ msgstr "Commuta modalità a schermo int
msgid "Click to enable fullscreen video playback."
msgstr "Clic per abilitare la riproduzione video a schermo intero."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Clic per fermare la riproduzione."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Mostra/nascondi scaletta"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Clic per fermare la riproduzione."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Mostra/nascondi scaletta"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Ripeti"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -16751,15 -16740,15 +17109,27 @@@ msgstr "
"Clic per cambiare la modalità di ripetizione. Ci sono 3 stati: ripeti uno, "
"ripeti tutto e spento."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Mescola"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "Clic per abilitare o disabilitare la riproduzione casuale."
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Mescola"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "Clic per abilitare o disabilitare la riproduzione casuale."
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -16767,37 -16756,45 +17137,76 @@@ msgstr "
"Fai clic e sposta il mouse mentre tieni il pulsante premuto per usare questo "
"cursore e cambiare il volume."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Clic per silenziare o ripristinare l'audio."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Volume pieno"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Clic per riprodurre l'audio a volume massimo."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Clic per silenziare o ripristinare l'audio."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Volume pieno"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Clic per riprodurre l'audio a volume massimo."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Effetti"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Clic per spostarti sull'elemento precedente della scaletta."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Clic per spostarti sull'elemento successivo della scaletta."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Clic per spostarti sull'elemento precedente della scaletta."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Clic per spostarti sull'elemento successivo della scaletta."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Converti e trasmetti"
@@@ -16833,7 -16830,7 +17242,11 @@@ msgstr "Scegli una posizione di destina
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17018,8 -17015,8 +17431,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Personalizzato"
@@@ -17115,37 -17112,37 +17533,69 @@@ msgstr "
msgid "Don't ask again"
msgstr "Non chiedere ancora"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "Riproduzione media di VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Nessun rapporto d'errore trovato"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "Riproduzione media di VLC"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Nessun rapporto d'errore trovato"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Prosegui"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Impossibile trovare traccia di un precedente crash."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Rimuovere le vecchie preferenze?"
+
+#: modules/gui/macosx/intf.m:1937
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Impossibile trovare traccia di un precedente crash."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Rimuovere le vecchie preferenze?"
+
+ #: modules/gui/macosx/intf.m:1922
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "We just found an older version of VLC's preferences files."
msgstr ""
"Abbiamo rilevato una versione precedente dei file delle preferenze di VLC."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Sposta nel cestino e riavvia VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Sposta nel cestino e riavvia VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC Debug Log (%s).rtf"
@@@ -17327,7 -17324,7 +17777,11 @@@ msgstr "
"Questa opzione consente di cambiare le icone delle interfacce in diverse "
"situazioni."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Blocca proporzioni"
@@@ -17461,7 -17458,7 +17915,11 @@@ msgstr "Nascondi VLC
msgid "Hide Others"
msgstr "Nascondi Altre"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Mostra Tutte"
@@@ -17546,15 -17543,15 +18004,27 @@@ msgstr "Sincronizzazione traccia
msgid "A→B Loop"
msgstr "Ciclo A→B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Esci dopo la riproduzione"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Vai Avanti"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Esci dopo la riproduzione"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Vai Avanti"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Vai indietro"
@@@ -17570,30 -17567,30 +18040,56 @@@ msgstr "Riduci volume
msgid "Audio Device"
msgstr "Periferica audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Dimensione dimezzata"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Dimensione normale"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dimensione doppia"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Dimensione Schermo"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Dimensione dimezzata"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Dimensione normale"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dimensione doppia"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Dimensione Schermo"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Sempre in primo piano"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Dispositivo video a schermo intero"
@@@ -17602,7 -17599,7 +18098,11 @@@
msgid "Post processing"
msgstr "Post-elaborazione"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Aggiungi file dei sottotitoli..."
@@@ -17842,7 -17839,7 +18342,11 @@@ msgid "Play another media synchronously
msgstr "Riproduci contemporaneamente un altro media"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Sfoglia..."
@@@ -18031,7 -18028,7 +18535,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Codifica dei sottotitoli"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Dimensione carattere"
@@@ -18138,7 -18135,7 +18646,11 @@@ msgstr "Scarica metadati
#: modules/gui/macosx/playlist.m:524 modules/gui/macosx/playlist.m:525
msgid "Reveal in Finder"
++<<<<<<< HEAD
+msgstr "Mostra in Finder"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/playlist.m:527
msgid "Sort Node by Name"
@@@ -18260,12 -18257,12 +18772,20 @@@ msgstr "Errore durante il salvataggio d
msgid "VLC was unable to save the meta data."
msgstr "VLC non è stato in grado di salvare i metadati."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Preferenze"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Azzera tutto"
@@@ -18445,130 -18442,125 +18965,238 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP Lua"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Sospendi iTunes durante la riproduzione di VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Codifica predefinita"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Impostazioni schermo"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Codifica predefinita"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Impostazioni schermo"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Colore del carattere"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Carattere"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Lingua dei sottotitoli"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Lingua dei sottotitoli"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Lingua preferita dei sottotitoli"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Abilita OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Abilita OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Opacità "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Forza grassetto"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Forza grassetto"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Colore della bordatura"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Spessore della bordatura"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Schermi neri in modalità Schermo Intero"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Schermi neri in modalità Schermo Intero"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Schermo"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Modulo d'uscita"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Schermate video"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Cartella"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Formato"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefisso"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Numerazione sequenziale"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Ultimo controllo il: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Non è stato eseguito ancora alcun controllo."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Modulo d'uscita"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Schermate video"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Cartella"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Formato"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefisso"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Numerazione sequenziale"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Ultimo controllo il: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Non è stato eseguito ancora alcun controllo."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Latenza minore"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Bassa latenza"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Alta latenza"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Latenza maggiore"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Ripristina preferenze"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18590,21 -18582,21 +19218,38 @@@ msgstr "
"\n"
"Sei sicuro di voler continuare?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Scegli la cartella in cui salvare le istantanee video."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Scegli"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Scegli la cartella in cui salvare le istantanee video."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Scegli"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Choose the directory or filename where the records will be stored."
msgstr ""
"Scegli la cartella o il nome del file di destinazione delle registrazioni."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18612,17 -18604,17 +19257,30 @@@ msgstr "
"Premi i nuovi tasti per\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Combinazione non valida"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Combinazione non valida"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"Sfortunatamente, questi tasti non possono essere assegnati a scorciatoie."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "La combinazione è già utilizzata da \"%@\"."
@@@ -20176,7 -20168,7 +20834,11 @@@ msgstr "
msgid ""
"Makeup\n"
"gain"
++<<<<<<< HEAD
+msgstr "Guadagno di compensazione"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1440
msgid "(Hastened)"
@@@ -20718,20 -20710,20 +21380,36 @@@ msgstr "Elimina il profilo selezionato
msgid "Create a new profile"
msgstr "Crea un nuovo profilo"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Crea"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "Questo muxer non è fornito direttamente da VLC: potrebbe essere perso."
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Nome del profilo mancante"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr "Questo muxer non è fornito direttamente da VLC: potrebbe essere perso."
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Nome del profilo mancante"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Devi selezionare un nome per il profilo."
@@@ -20957,7 -20949,7 +21635,11 @@@ msgstr "Criteri di accesso alla rete
#: modules/gui/qt4/dialogs/firstrun.cpp:98
msgid "Automatically retrieve media info"
++<<<<<<< HEAD
+msgstr "Recupera automaticamente informazioni media"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:103
msgid "Regularly check for VLC updates"
@@@ -23246,7 -23238,7 +23928,11 @@@ msgstr "Filtro di trasmissione Http Liv
#: modules/stream_filter/record.c:49
msgid "Internal stream record"
++<<<<<<< HEAD
+msgstr "Registrazione interna dei flussi"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/smooth/smooth.c:61
msgid "Smooth Streaming"
@@@ -24277,23 -24269,23 +24963,43 @@@ msgstr "Trasmissione in uscita con tran
msgid "Overlays/Subtitles"
msgstr "Sovraimpressioni/Sottotitoli"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Carattere a larghezza fissa"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Famiglia del carattere che si desidera utilizzare"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "File del carattere che si desidera utilizzare"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Dimensione carattere (px)"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Carattere a larghezza fissa"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Famiglia del carattere che si desidera utilizzare"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "File del carattere che si desidera utilizzare"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Dimensione carattere (px)"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24303,11 -24295,11 +25009,19 @@@ msgstr "
"ad un valore diverso da 0, questa opzione ignorerà la dimensione relativa "
"del carattere."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Opacità del testo"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Opacità del testo"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24315,12 -24307,12 +25029,20 @@@ msgstr "
"Opacità (contrario di trasparenza) del testo mostrato a video. 0 = "
"trasparente, 255 = completamente opaco.T"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Colore predefinito del testo"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24329,93 -24321,93 +25051,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Dimensione relativa del carattere"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Opacità dello sfondo"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Colore di sfondo"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Opacità della bordatura"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Opacità dell'ombra"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Colore dell'ombra"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Angolo dell'ombra"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Distanza dell'ombra"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Opacità dello sfondo"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Colore di sfondo"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Opacità della bordatura"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Opacità dell'ombra"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Colore dell'ombra"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Angolo dell'ombra"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Distanza dell'ombra"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Più piccolo"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Piccolo"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Grande"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Più grande"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Usa rendering YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Usa rendering YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Sottile"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Spesso"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Rendering del testo"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Generatore di caratteri Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Sottile"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Spesso"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Rendering del testo"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Generatore di caratteri Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -24706,11 -24698,11 +25508,19 @@@ msgstr "Scrivi in una cartella ogni 128
#: modules/video_filter/atmo/atmo.cpp:186
msgid "Debug Frame Folder"
++<<<<<<< HEAD
+msgstr "Cartella dei fotogrammi di debug"
+
+#: modules/video_filter/atmo/atmo.cpp:187
+msgid "The path where the debugframes should be saved"
+msgstr "Il percorso dove i fotogrammi di debug dovrebbero essere salvati"
++=======
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:187
+ msgid "The path where the debugframes should be saved"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:191
msgid "Extracted Image Width"
@@@ -25251,7 -25243,7 +26061,11 @@@ msgstr "
#: modules/video_filter/audiobargraph_v.c:89
msgid "Audio Bar Graph Video"
++<<<<<<< HEAD
+msgstr "Video Audiobar Graph"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/ball.c:98
msgid "Ball color"
@@@ -25711,7 -25703,7 +26525,11 @@@ msgstr "
#: modules/video_filter/dynamicoverlay/dynamicoverlay.c:67
msgid "Dynamic video overlay"
++<<<<<<< HEAD
+msgstr "Sovrapposizione video dinamica"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/dynamicoverlay/dynamicoverlay.c:68
#: share/lua/http/dialogs/create_stream.html:245
@@@ -25865,7 -25857,7 +26683,11 @@@ msgstr "GranulositÃ
#: modules/video_filter/grain.c:66
msgid "Adds filtered gaussian noise"
++<<<<<<< HEAD
+msgstr "Aggiunge rumore gaussiano filtrato"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/hqdn3d.c:53
msgid "Spatial luma strength (0-254)"
@@@ -25944,7 -25936,7 +26766,11 @@@ msgstr "Coordinata X del logo. Puoi spo
#: modules/video_filter/logo.c:62
msgid "Y coordinate of the logo. You can move the logo by left-clicking it."
++<<<<<<< HEAD
+msgstr "Coordinata Y del logo. Puoi spostarlo con un clic sinistro del mouse."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/logo.c:64
msgid "Opacity of the logo"
@@@ -28162,7 -28154,7 +28988,11 @@@ msgstr "Opzioni MUX
#: share/lua/http/dialogs/create_stream.html:303
msgid "Video scale"
++<<<<<<< HEAD
+msgstr "Scala video"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:330
#: share/lua/http/dialogs/create_stream.html:374
@@@ -29160,6 -29152,9 +29990,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Elenco gestore multimediale"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Mostra dettagli"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -33216,10 -33211,6 +34052,13 @@@
#~ "dall'utilizzo di certificati revocati in sessioni TLS."
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Dettagli codificatore"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Toggle Normal/Repeat/Loop playlist modes"
#~ msgstr "Alterna le modalità Normale/Ciclica/Ripetuta della scaletta"
@@@ -34709,7 -34700,7 +35548,11 @@@
#, fuzzy
#~ msgid "Automatically add new medias to ML"
++<<<<<<< HEAD
+#~ msgstr "Recupera automaticamente informazioni media"
++=======
+ #~ msgstr "Aggiungi/elimina automaticamente i flussi in ingresso"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "X Screensaver disabler"
@@@ -34966,7 -34957,7 +35809,11 @@@
#, fuzzy
#~ msgid "Video Scale"
++<<<<<<< HEAD
+#~ msgstr "Scala video"
++=======
+ #~ msgstr "Acquisizione video"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Output Port"
diff --combined po/ja.po
index 9b80d71,edb78dd..32e16b3
--- a/po/ja.po
+++ b/po/ja.po
@@@ -9,7 -9,7 +9,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-10-07 13:45+0000\n"
"Last-Translator: Fumio Nakayama <fumio.n6a at gmail.com>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -139,7 -139,7 +143,11 @@@ msgstr "オーディオã¨ãƒ¢ã‚¸ãƒ¥ãƒ¼ã
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -491,10 -491,10 +499,17 @@@ msgid "&About
msgstr "VideoLANã«ã¤ã„㦠(&A)"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -533,17 -533,17 +548,29 @@@ msgid "Save...
msgstr "ä¿å˜..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "ã™ã¹ã¦ãƒªãƒ”ート"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "1曲リピート"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -650,7 -650,7 +677,11 @@@ msgstr "フィルターã®æœ€å¤§æ•°(%u)
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "無効"
@@@ -1349,20 -1349,20 +1380,36 @@@ msgstr "フレームレート
msgid "Decoded format"
msgstr "デコードフォーマット"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "入力を開ãã“ã¨ãŒã§ãã¾ã›ã‚“"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "入力を開ãã“ã¨ãŒã§ãã¾ã›ã‚“"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLCã¯MRL '%s'ã‚’é–‹ã‘ã¾ã›ã‚“。詳細ã¯ãƒã‚°ã‚’確èªã—ã¦ãã ã•ã„。"
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLCã¯å…¥åŠ›å½¢å¼ã‚’èªè˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLCã¯å…¥åŠ›å½¢å¼ã‚’èªè˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1794,7 -1794,7 +1841,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1881,7 -1881,7 +1932,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "ãªã—"
@@@ -1912,7 -1912,7 +1967,11 @@@ msgstr "
"VLCãŒä½¿ç”¨ã™ã‚‹ãƒ“デオ出力ã®æ–¹æ³•ã‚’è¨å®šã—ã¾ã™ã€‚デフォルトã§ä½¿ç”¨å¯èƒ½ãªæœ€é©ãªæ–¹æ³•ã‚’"
"自動的ã«é¸æŠžã—ã¾ã™ã€‚"
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "ビデオã®æœ‰åŠ¹åŒ–"
@@@ -2116,7 -2116,7 +2175,11 @@@ msgstr "
"ç”»ã™ã‚‹)を有効ã«ã—ã¾ã™ã€‚VLCã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã“ã®æ©Ÿèƒ½ã®ä½¿ç”¨ã‚’試ã¿ã¾ã™ã€‚"
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "常ã«æœ€å‰é¢"
@@@ -2169,7 -2169,7 +2232,11 @@@ msgstr "マウスカーソルã¨å…¨ç”»é
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2178,7 -2178,7 +2245,11 @@@ msgstr "デインターレース
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "デインターレースモード"
@@@ -2236,7 -2236,7 +2307,11 @@@ msgstr "
"å†ç”Ÿä¸ã«ãƒ‘ワーマãƒãƒ¼ã‚¸ãƒ¡ãƒ³ãƒˆãƒ‡ãƒ¼ãƒ¢ãƒ³ã«ã‚ˆã‚Šã€ã‚³ãƒ³ãƒ”ューターãŒã‚µã‚¹ãƒšãƒ³ãƒ‰çŠ¶æ…‹ã«"
"移行ã™ã‚‹ã“ã¨ã‚’抑制ã—ã¾ã™ã€‚"
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "ウィンドウã®è£…飾"
@@@ -2434,7 -2434,7 +2509,11 @@@ msgstr "
"横比ãŒç‰ã—ã„)ã§ã™ã€‚ã‚‚ã—ã€16:9ã®ã‚¹ã‚¯ãƒªãƒ¼ãƒ³ã‚’使用ã™ã‚‹å ´åˆã€æ¯”率をä¿æŒã™ã‚‹ãŸã‚ã«"
"ã“ã®å€¤ã‚’4:3ã«ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚知れã¾ã›ã‚“。"
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "コマè½ã¡ã‚’許å¯"
@@@ -2575,12 -2575,12 +2654,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2588,7 -2588,7 +2676,11 @@@ msgid "Default
msgstr "デフォルト"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2939,7 -2939,7 +3031,11 @@@ msgid "You can completely disable the s
msgstr "サブピクãƒãƒ£ãƒ¼ã®å‡¦ç†ã‚’完全ã«ç„¡åŠ¹ã«ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚"
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3870,7 -3870,7 +3966,11 @@@ msgid "These settings are the global VL
msgstr ""
"ã“れらã¯\"ホットã‚ー\"ã¨ã—ã¦çŸ¥ã‚‰ã‚Œã‚‹ã€ã‚°ãƒãƒ¼ãƒãƒ«ãªVLCã®ã‚ー割り当ã¦ã§ã™ã€‚"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "無視"
@@@ -3896,8 -3896,8 +3996,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3977,10 -3977,10 +4082,17 @@@ msgid "Slower (fine)
msgstr "å°‘ã—ã ã‘ゆã£ãã‚Š"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3993,10 -3993,10 +4105,17 @@@ msgid "Select the hotkey to use to ski
msgstr "プレイリストã®æ¬¡ã®é …ç›®ã«ç§»å‹•ã™ã‚‹ãƒ›ãƒƒãƒˆã‚ーをé¸æŠžã—ã¾ã™ã€‚"
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "å‰ã¸"
@@@ -4005,9 -4005,9 +4124,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "プレイリストã®å‰ã®é …ç›®ã«ç§»å‹•ã™ã‚‹ãƒ›ãƒƒãƒˆã‚ーをé¸æŠžã—ã¾ã™ã€‚"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4242,9 -4242,9 +4367,15 @@@ msgid "Select the key to decrease audi
msgstr "音é‡ã‚’下ã’ã‚‹ã‚ーをè¨å®šã—ã¾ã™ã€‚"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "ミュート"
@@@ -4662,7 -4662,7 +4793,11 @@@ msgstr "使用å¯èƒ½ãªã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "スナップショット"
@@@ -4865,12 -4865,12 +5000,21 @@@ msgstr "ダウンãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "ã‚ャンセル"
@@@ -5636,7 -5636,7 +5780,11 @@@ msgstr "クãƒãƒƒãƒ”ング
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "アスペクト比"
@@@ -8120,7 -8120,7 +8268,11 @@@ msgstr "ç”»é¢å…¥åŠ›
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "スクリーン"
@@@ -8873,7 -8873,7 +9025,11 @@@ msgstr "æœ€å¤§éŸ³é‡ #
msgid "Volume Set"
msgstr "音é‡è¨å®š"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10055,7 -10055,7 +10211,11 @@@ msgstr "7.1サラウンド
msgid "ALSA audio output"
msgstr "ALSAオーディオ出力"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "オーディオ出力ã«å¤±æ•—ã—ã¾ã—ãŸ"
@@@ -10088,7 -10088,7 +10248,11 @@@ msgstr "Audio Queue (iOS / Mac OS) オã
msgid "Android AudioTrack audio output"
msgstr "Android AudioTrackオーディオ出力"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "iOS用ã®AudioUnit出力"
@@@ -10096,22 -10096,22 +10260,38 @@@
msgid "Last audio device"
msgstr "ç›´å‰ã®ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªãƒ‡ãƒã‚¤ã‚¹"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit出力"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit出力"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"é¸æŠžã•ã‚ŒãŸã‚ªãƒ¼ãƒ‡ã‚£ã‚ªå‡ºåŠ›ãƒ‡ãƒã‚¤ã‚¹ã¯ã€ä»–ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã§æŽ’ä»–çš„ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã¾"
"ã™ã€‚"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "オーディオデãƒã‚¤ã‚¹ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "オーディオデãƒã‚¤ã‚¹ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10119,11 -10119,11 +10299,19 @@@ msgstr "
"アプリケーション/ユーティリティã®\"オーディオ MIDI è¨å®š\"ユーティリティã§ã‚¹"
"ピーカーレイアウトをè¨å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚VLCã¯ã‚¹ãƒ†ãƒ¬ã‚ªå‡ºåŠ›ã®ã¿è¡Œã„ã¾ã™ã€‚"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "システムサウンド出力デãƒã‚¤ã‚¹"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "システムサウンド出力デãƒã‚¤ã‚¹"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (エンコード済ã¿å‡ºåŠ›)"
@@@ -11404,46 -11404,46 +11592,74 @@@ msgstr "å½±
msgid "Outline"
msgstr "アウトラインフォント"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "é»’"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "グレー"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "シルãƒãƒ¼"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "白"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "æ —è‰²"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "赤"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11451,61 -11451,61 +11667,97 @@@ msgid "Fuchsia
msgstr "明るã„赤紫"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "黄"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "オリーブ"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "ç·‘"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "æš—ã„ç°è‰²ãŒã‹ã£ãŸé’"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "ライム"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "ç´«"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "ãƒã‚¤ãƒ“ー"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "é’"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11659,7 -11659,7 +11911,11 @@@ msgstr "å—幕(æ‹¡å¼µ)
msgid "Subtitle renderers using libass"
msgstr "å—幕レンダラーãŒlibassを使用"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "フォントã‚ャッシュã®æ§‹ç¯‰ä¸"
@@@ -13654,10 -13654,10 +13910,17 @@@ msgid "Fast
msgstr "高速"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "通常"
@@@ -13766,8 -13766,8 +14029,13 @@@ msgid "D-Bus control interface
msgstr "D-Busコントãƒãƒ¼ãƒ«ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14121,9 -14121,9 +14389,15 @@@ msgstr "åˆæœŸåŒ–ã—ã¦ã„ã¾ã™
msgid "Opening"
msgstr "é–‹ã„ã¦ã„ã¾ã™"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "一時åœæ¢"
@@@ -16062,7 -16062,7 +16336,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEGトランスãƒãƒ¼ãƒˆã‚¹ãƒˆãƒªãƒ¼ãƒ デマルãƒãƒ—レクサー"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "テレテã‚スト"
@@@ -16251,7 -16251,7 +16529,11 @@@ msgid "VLC media player Help
msgstr "VLCメディアプレイヤーã®ãƒ˜ãƒ«ãƒ—"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "インデックス"
@@@ -16339,9 -16339,9 +16621,15 @@@ msgstr "æ–°ã—ã„プãƒãƒ•ã‚¡ã‚¤ãƒ«ã®å
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "ä¿å˜"
@@@ -16486,7 -16486,7 +16774,11 @@@ msgstr "
"ブックマークを動作ã™ã‚‹ãŸã‚ã«ã€ãã®ã‚¹ãƒˆãƒªãƒ¼ãƒ ã¯å†ç”Ÿã‹ä¸€æ™‚åœæ¢ã•ã‚Œã¦ã„ãªã‘ã‚Œã°"
"ãªã‚Šã¾ã›ã‚“。"
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "指定時間ã¸ã‚¸ãƒ£ãƒ³ãƒ—"
@@@ -16506,7 -16506,7 +16798,11 @@@ msgstr "クリックã—ã¦ç¾åœ¨ã®ãƒ¡ã
msgid "Backward"
msgstr "戻る"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16518,7 -16518,7 +16814,11 @@@ msgstr "
msgid "Forward"
msgstr "進む"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16542,23 -16542,15 +16842,35 @@@ msgstr "全画é¢è¡¨ç¤ºæ™‚モードã®å
msgid "Click to enable fullscreen video playback."
msgstr "クリックã™ã‚‹ã¨å…¨ç”»é¢è¡¨ç¤ºã§ãƒ“デオをå†ç”Ÿã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "クリックã™ã‚‹ã¨ç¾åœ¨ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã®å‰ã®é …ç›®ã«ã€æŠ¼ä¸‹ã—続ã‘ã‚‹ã¨æˆ»ã‚Šã¾ã™ã€‚"
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "クリックã™ã‚‹ã¨ç¾åœ¨ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã®æ¬¡ã®é …ç›®ã«ã€æŠ¼ä¸‹ã—続ã‘ã‚‹ã¨é€²ã¿ã¾ã™ã€‚"
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "クリックã™ã‚‹ã¨å†ç”Ÿã‚’åœæ¢ã€‚"
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "プレイリストã®è¡¨ç¤º/éžè¡¨ç¤º"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "クリックã™ã‚‹ã¨å†ç”Ÿã‚’åœæ¢ã€‚"
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "プレイリストã®è¡¨ç¤º/éžè¡¨ç¤º"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -16566,12 -16558,12 +16878,20 @@@ msgstr "
"クリックã™ã‚‹ã¨ãƒ“デオ出力ã¨ãƒ—レイリストを切り替ãˆã¾ã™ã€‚メインウィンドウã«ãƒ“デ"
"オãŒè¡¨ç¤ºã•ã‚Œã¦ã„ãªã„å ´åˆã¯ã€ãƒ—レイリストをéžè¡¨ç¤ºã«ã—ã¾ã™ã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "リピート"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -16579,15 -16571,15 +16899,27 @@@ msgstr "
"クリックã™ã‚‹ã¨ãƒªãƒ”ートモードを変更ã§ãã¾ã™ã€‚1ã¤ã‚’ç¹°ã‚Šè¿”ã—ã€ã™ã¹ã¦ã‚’ç¹°ã‚Šè¿”ã—ã¾"
"ãŸã¯ã€ã‚ªãƒ•ã®3ã¤ã®ãƒ¢ãƒ¼ãƒ‰ãŒã‚ã‚Šã¾ã™ã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "シャッフル"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "クリックã™ã‚‹ã¨ãƒ©ãƒ³ãƒ€ãƒ å†ç”Ÿã‚’切り替ãˆã€‚"
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "シャッフル"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "クリックã™ã‚‹ã¨ãƒ©ãƒ³ãƒ€ãƒ å†ç”Ÿã‚’切り替ãˆã€‚"
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -16595,24 -16587,24 +16927,44 @@@ msgstr "
"ã“ã®ã‚¹ãƒ©ã‚¤ãƒ€ãƒ¼ã‚’マウスボタンを押ã—ãªãŒã‚‰ã‚¯ãƒªãƒƒã‚¯ã™ã‚‹ã‹ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã¨éŸ³é‡ãŒå¤‰"
"æ›´ã§ãã¾ã™ã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "クリックã§éŸ³å£°ã‚’ミュートã¾ãŸã¯ã€ãƒŸãƒ¥ãƒ¼ãƒˆè§£é™¤ã—ã¾ã™ã€‚"
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "最大音é‡"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "最大音é‡ã§ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã‚’å†ç”Ÿ"
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "クリックã§éŸ³å£°ã‚’ミュートã¾ãŸã¯ã€ãƒŸãƒ¥ãƒ¼ãƒˆè§£é™¤ã—ã¾ã™ã€‚"
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "最大音é‡"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "最大音é‡ã§ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã‚’å†ç”Ÿ"
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "エフェクト"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -16620,14 -16612,22 +16972,33 @@@ msgstr "
"クリックã™ã‚‹ã¨ã‚¤ã‚³ãƒ©ã‚¤ã‚¶ãƒ¼ã¨ãã®ä»–ã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ãªã©ã®ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã‚¨ãƒ•ã‚§ã‚¯ãƒˆãƒ‘ãƒ"
"ルを表示ã—ã¾ã™ã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "クリックã§ãƒ—レイリストã®å‰ã®é …ç›®ã¸ç§»å‹•ã€‚"
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "クリックã§ãƒ—レイリストã®æ¬¡ã®é …ç›®ã¸ç§»å‹•ã€‚"
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "クリックã§ãƒ—レイリストã®å‰ã®é …ç›®ã¸ç§»å‹•ã€‚"
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "クリックã§ãƒ—レイリストã®æ¬¡ã®é …ç›®ã¸ç§»å‹•ã€‚"
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "クリックã™ã‚‹ã¨ç¾åœ¨ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã®å‰ã®é …ç›®ã«ã€æŠ¼ä¸‹ã—続ã‘ã‚‹ã¨æˆ»ã‚Šã¾ã™ã€‚"
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "クリックã™ã‚‹ã¨ç¾åœ¨ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã®æ¬¡ã®é …ç›®ã«ã€æŠ¼ä¸‹ã—続ã‘ã‚‹ã¨é€²ã¿ã¾ã™ã€‚"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "変æ›ã¨ã‚¹ãƒˆãƒªãƒ¼ãƒŸãƒ³ã‚°"
@@@ -16663,7 -16663,7 +17034,11 @@@ msgstr "出力先ã®ãƒã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16852,8 -16852,8 +17227,13 @@@ msgid "A SDP export is requested, but n
msgstr "SDPエクスãƒãƒ¼ãƒˆãŒå¿…è¦ã§ã™ãŒURLãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "カスタム"
@@@ -16955,36 -16955,36 +17335,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "今後ã€å•ã„åˆã‚ã›ã—ãªã„"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "VLCメディアå†ç”Ÿ"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "クラッシュã®è¨˜éŒ²ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "VLCメディアå†ç”Ÿ"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "クラッシュã®è¨˜éŒ²ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "続ã‘ã‚‹"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "以å‰ã®ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã®ãƒˆãƒ¬ãƒ¼ã‚¹ã‚’見ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ"
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "å¤ã„è¨å®šã‚’削除ã—ã¾ã™ã‹?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "å¤ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®VLCã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’検出ã—ã¾ã—ãŸ"
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "ゴミ箱ã«ç§»å‹•ã—ã¦VLCã®å†èµ·å‹•"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "以å‰ã®ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã®ãƒˆãƒ¬ãƒ¼ã‚¹ã‚’見ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ"
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "å¤ã„è¨å®šã‚’削除ã—ã¾ã™ã‹?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "å¤ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®VLCã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’検出ã—ã¾ã—ãŸ"
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "ゴミ箱ã«ç§»å‹•ã—ã¦VLCã®å†èµ·å‹•"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLCデãƒãƒƒã‚°ãƒã‚°(%s).rtf"
@@@ -17162,7 -17162,7 +17574,11 @@@ msgstr "
"ã“ã®ã‚ªãƒ—ションã¯æ§˜ã€…ãªã‚¿ã‚¤ãƒŸãƒ³ã‚°ã§ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã®ã‚¢ã‚¤ã‚³ãƒ³ã‚’変更ã™ã‚‹ã“ã¨ã‚’"
"許å¯ã—ã¾ã™ã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "アスペクト比を固定"
@@@ -17293,7 -17293,7 +17709,11 @@@ msgstr "VLCã‚’éš ã™
msgid "Hide Others"
msgstr "ã»ã‹ã‚’éš ã™"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "ã™ã¹ã¦ã‚’表示"
@@@ -17378,15 -17378,15 +17798,27 @@@ msgstr "トラックã®åŒæœŸåŒ–
msgid "A→B Loop"
msgstr "2点間(A-B)ループ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "å†ç”Ÿå¾Œã«çµ‚了"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "å°‘ã—進む"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "å†ç”Ÿå¾Œã«çµ‚了"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "å°‘ã—進む"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "å°‘ã—戻る"
@@@ -17402,30 -17402,30 +17834,56 @@@ msgstr "音é‡ã‚’下ã’ã‚‹
msgid "Audio Device"
msgstr "オーディオデãƒã‚¤ã‚¹"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "1/2サイズ"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "通常サイズ"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "2å€ã‚µã‚¤ã‚º"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "ç”»é¢ã«ã‚ã‚ã›ã‚‹"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "1/2サイズ"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "通常サイズ"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "2å€ã‚µã‚¤ã‚º"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "ç”»é¢ã«ã‚ã‚ã›ã‚‹"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "常ã«å‰é¢ã«è¡¨ç¤º"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "出力ã™ã‚‹ãƒ“デオデãƒã‚¤ã‚¹"
@@@ -17434,7 -17434,7 +17892,11 @@@
msgid "Post processing"
msgstr "後処ç†"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "å—幕ファイルã®è¿½åŠ ..."
@@@ -17672,7 -17672,7 +18134,11 @@@ msgid "Play another media synchronously
msgstr "別ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã¨åŒæœŸå†ç”Ÿã™ã‚‹"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "é¸æŠž..."
@@@ -17860,7 -17860,7 +18326,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "å—幕ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "フォントサイズ"
@@@ -18089,12 -18089,12 +18559,20 @@@ msgstr "メタデータä¿å˜ä¸ã«ã‚¨ã
msgid "VLC was unable to save the meta data."
msgstr "VLCã¯ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿ã‚’ä¿å˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "è¨å®š"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "ã™ã¹ã¦ãƒªã‚»ãƒƒãƒˆ"
@@@ -18273,130 -18273,125 +18751,238 @@@ msgstr "Glowl通知ã®æœ‰åŠ¹åŒ–(プレã
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "VLCã®å†ç”Ÿä¸ã¯iTunesを一時åœæ¢"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "デフォルトエンコーディング"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "表示è¨å®š"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "デフォルトエンコーディング"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "表示è¨å®š"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "フォントã®è‰²"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "フォント"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "å—幕ã®è¨€èªž"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "å—幕ã®è¨€èªž"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "優先ã™ã‚‹å—幕ã®è¨€èªž"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OSDã®æœ‰åŠ¹åŒ–"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OSDã®æœ‰åŠ¹åŒ–"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "ä¸é€æ˜Žåº¦"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "ボールドを強制使用"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "ボールドを強制使用"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "アウトラインã®è‰²"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "アウトラインã®å¤ªã•"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "全画é¢è¡¨ç¤ºæ™‚ã®ãƒ–ラックスクリーン表示"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "全画é¢è¡¨ç¤ºæ™‚ã®ãƒ–ラックスクリーン表示"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "ディスプレイ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "出力モジュール"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "ビデオスナップショット"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "フォルダー"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "フォーマット"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "プレフィックス"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "連番付ã‘"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "最後ã®ãƒã‚§ãƒƒã‚¯: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "ã¾ã 何もãƒã‚§ãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "出力モジュール"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "ビデオスナップショット"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "フォルダー"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "フォーマット"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "プレフィックス"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "連番付ã‘"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "最後ã®ãƒã‚§ãƒƒã‚¯: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "ã¾ã 何もãƒã‚§ãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "よりé…延ãŒå°‘ãªã„"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "é…延ãŒå°‘ãªã„"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "é…延ãŒå¤§ãã„"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "よりé…延ãŒå¤§ãã„"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "è¨å®šã‚’リセットã™ã‚‹"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18417,20 -18412,20 +19003,37 @@@ msgstr "
"\n"
"ã“ã®å‡¦ç†ã‚’続行ã—ã¦ã‚‚ã„ã„ã§ã™ã‹?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "撮影ã—ãŸãƒ“デオスナップショットをä¿å˜ã™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’é¸ã³ã¾ã™ã€‚"
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "é¸æŠž"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "記録ãŒä¿æŒã•ã‚Œã‚‹ãƒ•ã‚¡ã‚¤ãƒ«åã€ã¾ãŸã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’é¸æŠžã—ã¾ã™ã€‚"
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "撮影ã—ãŸãƒ“デオスナップショットをä¿å˜ã™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’é¸ã³ã¾ã™ã€‚"
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "é¸æŠž"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "記録ãŒä¿æŒã•ã‚Œã‚‹ãƒ•ã‚¡ã‚¤ãƒ«åã€ã¾ãŸã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’é¸æŠžã—ã¾ã™ã€‚"
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18438,16 -18433,16 +19041,29 @@@ msgstr "
"æ–°ã—ã„ã‚ーを入力ã—ã¦ãã ã•ã„\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "無効ãªçµ„ã¿åˆã‚ã›"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "残念ãªãŒã‚‰ã€ã“れらã®ã‚ーã¯ãƒ›ãƒƒãƒˆã‚ーã¨ã—ã¦ä½¿ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。"
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "無効ãªçµ„ã¿åˆã‚ã›"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "残念ãªãŒã‚‰ã€ã“れらã®ã‚ーã¯ãƒ›ãƒƒãƒˆã‚ーã¨ã—ã¦ä½¿ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。"
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "\"%@\"ãŒã™ã§ã«ã“ã®çµ„ã¿åˆã‚ã›ã‚’使用ã—ã¦ã„ã¾ã™ã€‚"
@@@ -20528,20 -20523,20 +21144,36 @@@ msgstr "é¸æŠžã•ã‚ŒãŸãƒ—ãƒãƒ•ã‚¡ã‚¤ã
msgid "Create a new profile"
msgstr "æ–°ã—ã„プãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æˆ"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "作æˆ"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "ã“ã®ãƒžãƒ«ãƒãƒ—レクサã¯VLCã‹ã‚‰æä¾›ã•ã‚Œã¦ã„ã¾ã›ã‚“: 見ã¤ã‹ã‚Šã¾ã›ã‚“。"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«åãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr "ã“ã®ãƒžãƒ«ãƒãƒ—レクサã¯VLCã‹ã‚‰æä¾›ã•ã‚Œã¦ã„ã¾ã›ã‚“: 見ã¤ã‹ã‚Šã¾ã›ã‚“。"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«åãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«åを指定ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
@@@ -24099,23 -24094,23 +24731,43 @@@ msgstr "トランスコーディングã
msgid "Overlays/Subtitles"
msgstr "オーãƒãƒ¼ãƒ¬ã‚¤/å—幕"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "モノスペースフォント"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "使用ã—ãŸã„フォントã®ãƒ•ã‚©ãƒ³ãƒˆãƒ•ã‚¡ãƒŸãƒªãƒ¼"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "使用ã—ãŸã„フォントã®ãƒ•ã‚©ãƒ³ãƒˆãƒ•ã‚¡ã‚¤ãƒ«"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "フォントサイズ(å˜ä½: ピクセル)"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "モノスペースフォント"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "使用ã—ãŸã„フォントã®ãƒ•ã‚©ãƒ³ãƒˆãƒ•ã‚¡ãƒŸãƒªãƒ¼"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "使用ã—ãŸã„フォントã®ãƒ•ã‚©ãƒ³ãƒˆãƒ•ã‚¡ã‚¤ãƒ«"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "フォントサイズ(å˜ä½: ピクセル)"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24124,11 -24119,11 +24776,19 @@@ msgstr "
"ビデオ上ã«ãƒ¬ãƒ³ãƒ€ãƒªãƒ³ã‚°ã•ã‚Œã‚‹ãƒ•ã‚©ãƒ³ãƒˆã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚µã‚¤ã‚ºã‚’指定ã—ã¾ã™ã€‚ã‚‚ã—ã€0以"
"外ã®å€¤ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ç›¸å¯¾ãƒ•ã‚©ãƒ³ãƒˆã‚µã‚¤ã‚ºã‚’上書ãã—ã¾ã™ã€‚"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "テã‚ストã®ä¸é€æ˜Žåº¦"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "テã‚ストã®ä¸é€æ˜Žåº¦"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24136,12 -24131,12 +24796,20 @@@ msgstr "
"ビデオ上ã«ãƒ¬ãƒ³ãƒ€ãƒªãƒ³ã‚°ã•ã‚Œã‚‹ãƒ†ã‚ストã®ä¸é€æ˜Žåº¦(é€æ˜Žåº¦ã®é€†)を指定ã—ã¾ã™ã€‚0: é€"
"明, 255: 完全ã«ä¸é€æ˜Ž"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "デフォルトã®ãƒ†ã‚スト色"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24153,12 -24148,12 +24821,20 @@@ msgstr "
"ã¾ã™ã€‚å…ˆé ã‹ã‚‰2æ¡ãšã¤èµ¤ã€ç·‘ã€é’ã§æŒ‡å®šã—ã¾ã™ã€‚#000000 = é»’, #FF0000 = 赤, "
"#00FF00 = 緑, #FFFF00 = 黄 (赤 + 緑), #FFFFFF = 白"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "相対的ãªãƒ•ã‚©ãƒ³ãƒˆã‚µã‚¤ã‚º"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24167,59 -24162,59 +24843,111 @@@ msgstr "
"ã“ã‚Œã¯ãƒ“デオ上ã«è¡¨ç¤ºã•ã‚Œã‚‹ãƒ•ã‚©ãƒ³ãƒˆã®ç›¸å¯¾çš„ãªãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚µã‚¤ã‚ºã§ã™ã€‚絶対値ã§"
"フォントサイズãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ç›¸å¯¾ã‚µã‚¤ã‚ºã¯ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "背景ã®ä¸é€æ˜Žåº¦"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "背景ã®è‰²"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "アウトラインã®ä¸é€æ˜Žåº¦"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "å½±ã®ä¸é€æ˜Žåº¦"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "å½±ã®è‰²"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "å½±ã®è§’度"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "å½±ã®é–“éš”"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "背景ã®ä¸é€æ˜Žåº¦"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "背景ã®è‰²"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "アウトラインã®ä¸é€æ˜Žåº¦"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "å½±ã®ä¸é€æ˜Žåº¦"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "å½±ã®è‰²"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "å½±ã®è§’度"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "å½±ã®é–“éš”"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "最å°"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "å°"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "大"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "最大"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "YUVPレンダラーã®ä½¿ç”¨"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "YUVPレンダラーã®ä½¿ç”¨"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24227,23 -24222,23 +24955,43 @@@ msgstr "
"\"パレッタイズYUV\"を使用ã—ã¦ãƒ¬ãƒ³ãƒ€ãƒªãƒ³ã‚°ã‚’è¡Œã†ã€‚ã“ã®ã‚ªãƒ—ションã¯DVBå—幕ã«ã‚¨"
"ンコードを行ã†å ´åˆã®ã¿å¿…è¦ã§ã™ã€‚"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "ç´°ã„"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "太ã„"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "æ–‡å—レンダリング"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2フォントレンダラー"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "ç´°ã„"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "太ã„"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "æ–‡å—レンダリング"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2フォントレンダラー"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/ka.po
index 476e34f,c62540a..96e2041
--- a/po/ka.po
+++ b/po/ka.po
@@@ -9,7 -9,7 +9,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2008-08-23 18:31+0200\n"
"Last-Translator: Alexander Didebulidze <didebuli at in.tum.de>\n"
"Language-Team: Georgian <geognome at googlegroups.com>\n"
@@@ -137,7 -137,7 +141,11 @@@ msgstr "სხვáƒáƒ“áƒáƒ¡áƒ®áƒ•áƒ
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -464,10 -464,10 +472,17 @@@ msgid "&About
msgstr "შესáƒáƒ®áƒ”ბ"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -513,19 -513,19 +528,31 @@@ msgid "Save...
msgstr "შეინáƒáƒ®áƒ” ფáƒáƒ˜áƒšáƒ˜..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Repeat All"
msgstr "გáƒáƒ›áƒ”áƒáƒ ებრყველáƒ"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Repeat One"
msgstr "გáƒáƒ›áƒ”áƒáƒ ებრერთი"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -612,7 -612,7 +639,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "გáƒáƒ›áƒáƒ თე"
@@@ -1325,20 -1325,20 +1356,36 @@@ msgstr "კáƒáƒ“რი წáƒáƒ›áƒ¨áƒ˜
msgid "Decoded format"
msgstr "დეკáƒáƒ“ერები"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1741,7 -1741,7 +1788,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1828,7 -1828,7 +1879,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
#, fuzzy
msgid "None"
@@@ -1853,7 -1853,7 +1908,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "ჩáƒáƒ თე ვიდეáƒ"
@@@ -2045,7 -2045,7 +2104,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "მუდმივáƒáƒ“ წინრპლáƒáƒœáƒ–ე"
@@@ -2101,7 -2101,7 +2164,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2110,7 -2110,7 +2177,11 @@@ msgstr "დეინტერლáƒáƒªá
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
#, fuzzy
msgid "Deinterlace mode"
@@@ -2170,7 -2170,7 +2241,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr "ეკრáƒáƒœáƒ“áƒáƒ›áƒªáƒáƒ•áƒ˜áƒ¡ გáƒáƒ›áƒáƒ თვრვიდეáƒáƒ¡ დáƒáƒ™áƒ•áƒ ის დრáƒáƒ¡."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "ფáƒáƒœáƒ¯áƒ ის დეკáƒáƒ áƒáƒªáƒ˜áƒ"
@@@ -2344,7 -2344,7 +2419,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "გáƒáƒ›áƒáƒ¢áƒáƒ•áƒ” კáƒáƒ“რები"
@@@ -2480,12 -2480,12 +2559,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2494,7 -2494,7 +2582,11 @@@ msgid "Default
msgstr "ნáƒáƒ’ულისხმევი"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2809,7 -2809,7 +2901,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
#, fuzzy
@@@ -3641,7 -3641,7 +3737,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Ignore"
msgstr "áƒáƒ áƒ"
@@@ -3669,8 -3669,8 +3769,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3754,10 -3754,10 +3859,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3770,10 -3770,10 +3882,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "წინáƒ"
@@@ -3782,9 -3782,9 +3901,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4026,9 -4026,9 +4151,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "გáƒáƒáƒ©áƒ£áƒ›áƒ”"
@@@ -4469,7 -4469,7 +4600,11 @@@ msgstr "ყველáƒ
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "სურáƒáƒ—ის გáƒáƒ“áƒáƒ¦áƒ”ბáƒ"
@@@ -4669,12 -4669,12 +4804,21 @@@ msgstr "áƒáƒ®áƒšáƒáƒ•áƒ” გáƒáƒ“მ
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ"
@@@ -5481,7 -5481,7 +5625,11 @@@ msgstr "ჩáƒáƒ›áƒáƒáƒ áƒ
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "გვერდების შეფáƒáƒ დებáƒ"
@@@ -7987,7 -7987,7 +8135,11 @@@ msgstr "ეკრáƒáƒœáƒ˜
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "ეკრáƒáƒœáƒ˜"
@@@ -8809,7 -8809,7 +8961,11 @@@ msgstr "
msgid "Volume Set"
msgstr "ხმის რეგულáƒáƒªáƒ˜áƒ"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
#, fuzzy
@@@ -10012,7 -10012,7 +10168,11 @@@ msgstr "Dolby Surround
msgid "ALSA audio output"
msgstr "ALSA áƒáƒ£áƒ“ირგáƒáƒ¡áƒáƒ•áƒáƒšáƒ˜"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "áƒáƒ£áƒ“ირგáƒáƒ¡áƒáƒ•áƒáƒšáƒ˜áƒ¡ მáƒáƒ“ული"
@@@ -10048,7 -10048,7 +10208,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "შáƒáƒ•-თეთრი ვიდერგáƒáƒ¡áƒáƒ•áƒáƒšáƒ˜"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "ALSA áƒáƒ£áƒ“ირგáƒáƒ¡áƒáƒ•áƒáƒšáƒ˜"
@@@ -10058,33 -10058,33 +10222,57 @@@
msgid "Last audio device"
msgstr "áƒáƒ£áƒ“ირმáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
++=======
+ #: modules/audio_output/auhal.c:166
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "HAL AudioUnit output"
msgstr "ALSA áƒáƒ£áƒ“ირგáƒáƒ¡áƒáƒ•áƒáƒšáƒ˜"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
++=======
+ #: modules/audio_output/auhal.c:578
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio device is not configured"
msgstr "áƒáƒ£áƒ“ირმáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის სáƒáƒ®áƒ”ლი"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "áƒáƒ›áƒáƒ˜áƒ ჩიეთ áƒáƒ£áƒ“ირმáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -11360,33 -11360,33 +11548,53 @@@ msgstr "შემთხვევითá
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "შáƒáƒ•áƒ˜"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
#, fuzzy
msgid "Gray"
msgstr "გერმáƒáƒœáƒ£áƒšáƒ˜"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "ვერცხლისფერი"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "თეთრი"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
#, fuzzy
@@@ -11394,14 -11394,14 +11602,22 @@@ msgid "Maroon
msgstr "ბრეტáƒáƒœáƒ£áƒšáƒ˜"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "წითელი"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11409,14 -11409,14 +11625,22 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "ყვითელი"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
#, fuzzy
@@@ -11424,21 -11424,21 +11648,33 @@@ msgid "Olive
msgstr "გáƒáƒ¬áƒ›áƒ”ნდáƒ"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "მწვáƒáƒœáƒ”"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
#, fuzzy
msgid "Teal"
msgstr "თáƒáƒ›áƒ˜áƒšáƒ£áƒ ი"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
@@@ -11446,14 -11446,14 +11682,22 @@@
msgid "Lime"
msgstr "Mime"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
#, fuzzy
msgid "Purple"
msgstr "წინáƒ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
#, fuzzy
@@@ -11461,14 -11461,14 +11705,22 @@@ msgid "Navy
msgstr "ნáƒáƒ•áƒáƒ®áƒ"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "ლურჯი"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11610,7 -11610,7 +11862,11 @@@ msgstr "ტიტრები
msgid "Subtitle renderers using libass"
msgstr "ტიტრების კáƒáƒ“ირებáƒ"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13521,10 -13521,10 +13777,17 @@@ msgid "Fast
msgstr "ჩáƒáƒ¡áƒ›áƒ"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "ნáƒáƒ მáƒáƒšáƒ£áƒ ი"
@@@ -13646,8 -13646,8 +13909,13 @@@ msgid "D-Bus control interface
msgstr "მáƒáƒ თვის ინტერფეისები"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14021,9 -14021,9 +14289,15 @@@ msgstr "იტáƒáƒšáƒ˜áƒ£áƒ ი
msgid "Opening"
msgstr "გáƒáƒ®áƒ¡áƒœáƒ"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "პáƒáƒ£áƒ–áƒ"
@@@ -16131,7 -16131,7 +16405,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "ტრáƒáƒœáƒ¡áƒžáƒáƒ ტი ნáƒáƒ™áƒáƒ“ი"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Teletext"
msgstr "ტიტრების ტექსტის დეკáƒáƒ“ერი"
@@@ -16331,7 -16331,7 +16609,11 @@@ msgid "VLC media player Help
msgstr "VLC მედირდáƒáƒ›áƒ™áƒ•áƒ ელი"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Index"
msgstr "ინდექსი"
@@@ -16432,9 -16432,9 +16714,15 @@@ msgstr "áƒáƒ ჩევრფáƒáƒ˜áƒš
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "შენáƒáƒ®áƒ•áƒ"
@@@ -16581,7 -16581,7 +16869,11 @@@ msgstr "áƒáƒ áƒ
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -16603,7 -16603,7 +16895,11 @@@ msgstr "
msgid "Backward"
msgstr "გáƒáƒ“áƒáƒ’ზáƒáƒ•áƒœáƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16614,7 -16614,7 +16910,11 @@@ msgstr "
msgid "Forward"
msgstr "გáƒáƒ“áƒáƒ’ზáƒáƒ•áƒœáƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16636,89 -16636,89 +16936,160 @@@ msgstr "Telnet ინტერფეი
msgid "Click to enable fullscreen video playback."
msgstr "ეკრáƒáƒœáƒ“áƒáƒ›áƒªáƒáƒ•áƒ˜áƒ¡ გáƒáƒ›áƒáƒ თვრვიდეáƒáƒ¡ დáƒáƒ™áƒ•áƒ ის დრáƒáƒ¡."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "ლáƒáƒ™áƒáƒšáƒ£áƒ ი დáƒáƒ™áƒ•áƒ áƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "დáƒáƒ¡áƒáƒ™áƒ áƒáƒ•áƒ˜ სიის შენáƒáƒ®áƒ•áƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "ყველáƒáƒ¡ გáƒáƒ›áƒ”áƒáƒ ებáƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "ნáƒáƒ’ულისხმევი áƒáƒ£áƒ“ირხმის სიმáƒáƒ¦áƒšáƒ”"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to play the audio at maximum volume."
msgstr "სიგáƒáƒœáƒ” დრსიმáƒáƒ¦áƒšáƒ”."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "ეფექტები"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -16759,7 -16759,7 +17130,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16962,8 -16962,8 +17337,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
#, fuzzy
msgid "Custom"
@@@ -17066,40 -17066,40 +17446,72 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "VLC მედირდáƒáƒ›áƒ™áƒ•áƒ ელი"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
++=======
+ #: modules/gui/macosx/intf.m:1877
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "No CrashLog found"
msgstr "გáƒáƒ®áƒ¡áƒ”ნი"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "გáƒáƒ’რძელებáƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
++=======
+ #: modules/gui/macosx/intf.m:1877
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Couldn't find any trace of a previous crash."
msgstr "პáƒáƒ•áƒœáƒ ის a."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1936
++=======
+ #: modules/gui/macosx/intf.m:1921
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Remove old preferences?"
msgstr "გáƒáƒœáƒ£áƒšáƒ”ბრპáƒáƒ áƒáƒ›áƒ”ტრები"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -17260,7 -17260,7 +17672,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Lock Aspect Ratio"
msgstr "სწáƒáƒ ირშეფáƒáƒ დებáƒ"
@@@ -17406,7 -17406,7 +17822,11 @@@ msgstr "VLC-ს დáƒáƒ›áƒáƒšáƒ•áƒ
msgid "Hide Others"
msgstr "დáƒáƒ›áƒáƒšáƒ•áƒ სხვები"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "ყველáƒáƒ¡ ჩვენებáƒ"
@@@ -17502,17 -17502,17 +17922,29 @@@ msgstr "სინქრáƒáƒœáƒ˜áƒ–áƒá
msgid "A→B Loop"
msgstr "ლáƒáƒ’áƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Quit after Playback"
msgstr "ლáƒáƒ™áƒáƒšáƒ£áƒ ი დáƒáƒ™áƒ•áƒ áƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
++=======
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Step Forward"
msgstr "გáƒáƒ“áƒáƒ’ზáƒáƒ•áƒœáƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Step Backward"
msgstr "გáƒáƒ“áƒáƒ’ზáƒáƒ•áƒœáƒ"
@@@ -17531,33 -17531,33 +17963,59 @@@ msgstr "ნáƒáƒ’ულისხმეá
msgid "Audio Device"
msgstr "áƒáƒ£áƒ“ირმáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "ნáƒáƒ®áƒ”ვáƒáƒ ი ზáƒáƒ›áƒ"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "ნáƒáƒ მáƒáƒšáƒ£áƒ ი ზáƒáƒ›áƒ"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "ნáƒáƒ®áƒ”ვáƒáƒ ი ზáƒáƒ›áƒ"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "ნáƒáƒ მáƒáƒšáƒ£áƒ ი ზáƒáƒ›áƒ"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Double Size"
msgstr "ზáƒáƒ›áƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
++=======
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Fit to Screen"
msgstr "ეკრáƒáƒœáƒ˜"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Float on Top"
msgstr "მცურáƒáƒ•áƒ˜ ზემáƒáƒ—"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Fullscreen Video Device"
msgstr "მთლიáƒáƒœ-ეკრáƒáƒœáƒ˜áƒáƒœáƒ˜ ვიდერგáƒáƒ¡áƒáƒ•áƒáƒšáƒ˜"
@@@ -17567,7 -17567,7 +18025,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "ტიტრების ფáƒáƒ˜áƒšáƒ˜"
@@@ -17821,7 -17821,7 +18283,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "áƒáƒ˜áƒ ჩიეთ..."
@@@ -18014,7 -18014,7 +18480,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "ტიტრების კáƒáƒ“ირებáƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "შრიფტის სიდიდე"
@@@ -18272,12 -18272,12 +18742,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "პáƒáƒ áƒáƒ›áƒ”ტრები"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Reset All"
msgstr "გáƒáƒœáƒ£áƒšáƒ”ბრყველáƒ"
@@@ -18471,141 -18471,136 +18949,249 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "ლáƒáƒ™áƒáƒšáƒ£áƒ ი დáƒáƒ™áƒ•áƒ áƒ"
+
+#: modules/gui/macosx/simple_prefs.m:377
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Default Encoding"
msgstr "დეკáƒáƒ“ირებáƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:378
++=======
+ #: modules/gui/macosx/simple_prefs.m:377
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Display Settings"
msgstr "ეკრáƒáƒœáƒ˜áƒ¡ გáƒáƒ ჩევáƒáƒ“áƒáƒ‘áƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
#, fuzzy
msgid "Font color"
msgstr "ფერი"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "შრიფტი"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "ტიტრების ენáƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "áƒáƒ£áƒ“იáƒáƒ¡ ენáƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OSD-ს ჩáƒáƒ თვáƒ"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OSD-ს ჩáƒáƒ თვáƒ"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Force bold"
msgstr "ძáƒáƒšáƒ“áƒáƒ¢áƒáƒœáƒ”ბით მáƒáƒœáƒ áƒáƒ£áƒ“იáƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "ვიდეáƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Black screens in Fullscreen mode"
msgstr "შáƒáƒ•áƒ˜ დუიმი"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "დისპლეი"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Output module"
msgstr "გáƒáƒ¡áƒáƒ•áƒáƒšáƒ˜áƒ¡ მáƒáƒ“ულები"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
++=======
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Video snapshots"
msgstr "გáƒáƒ“áƒáƒ¦áƒ”ბული სურáƒáƒ—ების ფáƒáƒ მáƒáƒ¢áƒ˜"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "ფáƒáƒ მáƒáƒ¢áƒ˜"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "პრეფიქსი"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "ფáƒáƒ მáƒáƒ¢áƒ˜"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "პრეფიქსი"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
#, fuzzy
msgid "Reset Preferences"
msgstr "გáƒáƒœáƒ£áƒšáƒ”ბრპáƒáƒ áƒáƒ›áƒ”ტრები"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18618,36 -18613,36 +19204,66 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "áƒáƒ ჩევáƒ"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "áƒáƒ ჩევáƒ"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Invalid combination"
msgstr "&áƒáƒ ჩეული"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -20800,21 -20795,21 +21416,37 @@@ msgstr "ტიტრების ფáƒ
msgid "Create a new profile"
msgstr "შექმნრსწრáƒáƒ¤áƒáƒ“ გáƒáƒ¨áƒ•áƒ”ბáƒ"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
#, fuzzy
msgid "Create"
msgstr "ცენტრში"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "You must set a name for the profile."
msgstr "áƒáƒ ჩევრფáƒáƒ˜áƒšáƒ˜ -სკენ შენáƒáƒ®áƒ•áƒ -სკენ"
@@@ -24560,23 -24555,23 +25192,43 @@@ msgstr "სტáƒáƒœáƒ“áƒáƒ ტულá
msgid "Overlays/Subtitles"
msgstr "ტიტრები"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "შრიფტის ზáƒáƒ›áƒ პიქსელებში"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "შრიფტის ზáƒáƒ›áƒ პიქსელებში"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
@@@ -24584,25 -24579,25 +25236,41 @@@
"font size."
msgstr "ნáƒáƒ’ულისხმევი სიდიდე ის ვიდერ-სკენ სიდიდე "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "ტექსტის áƒáƒ“გილმდებáƒáƒ ეáƒáƒ‘áƒ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr "ის გáƒáƒ›áƒáƒ˜áƒ ვáƒáƒšáƒáƒ‘რის ტექსტი "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
#, fuzzy
msgid "Text default color"
msgstr "ტექსტი ნáƒáƒ’ულისხმევი"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
#, fuzzy
msgid ""
@@@ -24614,12 -24609,12 +25282,20 @@@ msgstr "
"ფერი ის ტექსტი ვიდერHTML წითელი მწვáƒáƒœáƒ” ცისფერი შáƒáƒ•áƒ˜ წითელი მწვáƒáƒœáƒ” ყვითელი "
"წითელი მწვáƒáƒœáƒ” თეთრი"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
#, fuzzy
msgid ""
@@@ -24627,88 -24622,88 +25303,160 @@@
"video. If absolute font size is set, relative size will be overridden."
msgstr "ნáƒáƒ’ულისხმევი სიდიდე ის ვიდერ-სკენ სიდიდე "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "ფáƒáƒœáƒ˜"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "ფáƒáƒœáƒ˜"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
++=======
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow opacity"
msgstr "შემთხვევითი გáƒáƒ—იშ."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "შემთხვევითი გáƒáƒ—იშ."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
++=======
+ #: modules/text_renderer/freetype.c:189
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow angle"
msgstr "შემთხვევითი გáƒáƒ—იშ."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:191
++=======
+ #: modules/text_renderer/freetype.c:190
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow distance"
msgstr "შემთხვევითი გáƒáƒ—იშ."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "დáƒáƒžáƒáƒ¢áƒáƒ áƒáƒ•áƒ”ბáƒ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "პáƒáƒ¢áƒáƒ áƒ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "დიდი"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "გáƒáƒ“იდებáƒ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
++=======
+ #: modules/text_renderer/freetype.c:196
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Use YUVP renderer"
msgstr "ტექსტი"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/kk.po
index 9119318,874ffa1..1361131
--- a/po/kk.po
+++ b/po/kk.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-05-04 07:53+0000\n"
"Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
"Language-Team: Kazakh (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -133,7 -133,7 +137,11 @@@ msgstr "Әр түрлі дыбыÑÑ‚Ñ‹Ò
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -451,10 -451,10 +459,17 @@@ msgid "&About
msgstr "VLC туралы"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -493,17 -493,17 +508,29 @@@ msgid "Save...
msgstr "Сақтау..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Бәрін қайталау"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Бір қайталау"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -612,7 -612,7 +639,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Доғару"
@@@ -1271,20 -1271,20 +1302,36 @@@ msgstr "Кадр қарқыны
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Сіздің кіреÑініңіз ашылуы мүмкін емеÑ"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Сіздің кіреÑініңіз ашылуы мүмкін емеÑ"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "ШығаÑын пішімін VLC тани алмады"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "ШығаÑын пішімін VLC тани алмады"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1677,7 -1677,7 +1724,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1759,7 -1759,7 +1810,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Ештеңе"
@@@ -1783,7 -1783,7 +1838,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Бейнені қоÑу"
@@@ -1973,7 -1973,7 +2032,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Әрқашан ең Ò¯Ñтінде"
@@@ -2025,7 -2025,7 +2088,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2034,7 -2034,7 +2101,11 @@@ msgstr "ТізбектеÑтіру
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "ТізбектеÑтіру режімі"
@@@ -2090,7 -2090,7 +2161,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Терезені безендірулері"
@@@ -2259,7 -2259,7 +2334,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Кадрларды елемеу"
@@@ -2387,12 -2387,12 +2466,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2400,7 -2400,7 +2488,11 @@@ msgid "Default
msgstr "Әдепкі"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2703,7 -2703,7 +2795,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3518,7 -3518,7 +3614,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Елемеу"
@@@ -3542,8 -3542,8 +3642,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3625,10 -3625,10 +3730,17 @@@ msgid "Slower (fine)
msgstr "Ðқырынырақ (Ñәл)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3643,10 -3643,10 +3755,17 @@@ msgstr "
"бөлектеңіз."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Ðлдыңғы"
@@@ -3657,9 -3657,9 +3776,15 @@@ msgstr "
"Ойнату тізіміндегі алдыңғы бірлікке өту үшін қолданбақ тездету пернеÑін "
"бөлектеңіз."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3904,9 -3904,9 +4029,15 @@@ msgid "Select the key to decrease audi
msgstr "ДыбыÑÑ‚Ñ‹Ò› деңгейді төмендету үшін қолданбақ пернеÑін бөлектеңіз."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "ДыбыÑÑ‚Ñ‹ өшіру"
@@@ -4321,7 -4321,7 +4452,11 @@@ msgstr "Қатынаулы дыбыÑÑ‚
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Лездік Ñ‚Ò¯Ñірме"
@@@ -4520,12 -4520,12 +4655,21 @@@ msgstr "Қотаруда...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Болдырмау"
@@@ -5281,7 -5281,7 +5425,11 @@@ msgstr "Шұнтиту
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Пішімдік арақатынаÑÑ‹"
@@@ -7578,7 -7578,7 +7726,11 @@@ msgstr "Бейнебеттік кіре
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Бейнебет"
@@@ -8310,7 -8310,7 +8462,11 @@@ msgstr "Ең көп деңгейі
msgid "Volume Set"
msgstr "Деңгейді орнату"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9423,7 -9423,7 +9579,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "ALSA дыбыÑÑ‚Ñ‹Ò› шығаÑын"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "ДыбыÑÑ‚Ñ‹Ò› шығаÑыны ÑәтÑіз"
@@@ -9454,7 -9454,7 +9614,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9462,30 -9462,30 +9626,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit шығаÑыны"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit шығаÑыны"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "ДыбыÑÑ‚Ñ‹Ò› құрылғы ішқұрылымданбаған"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "ДыбыÑÑ‚Ñ‹Ò› құрылғы ішқұрылымданбаған"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (кодталған шығаÑын)"
@@@ -10651,46 -10651,46 +10839,74 @@@ msgstr "Көлеңкелі
msgid "Outline"
msgstr "Контур"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Сұрыптау"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Сұр"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "КүміÑ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "ÐÒ›"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Қоңыр"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Қызыл"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10698,61 -10698,61 +10914,97 @@@ msgid "Fuchsia
msgstr "Күлгін"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Сары"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Зәйтүн"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "ЖаÑыл"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "ЖаÑылкөк"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Ðшық жаÑыл"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Қызыл көк"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Қою көк"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Көк"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10882,7 -10882,7 +11134,11 @@@ msgstr "Субтирлер (қоÑымÑ
msgid "Subtitle renderers using libass"
msgstr "ibass қолданған Ñубтитр құрушылар"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Қаріп бүркемеÑін құру"
@@@ -12679,10 -12679,10 +12935,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Қалыпты"
@@@ -12787,8 -12787,8 +13050,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus баÑқару тілдеÑуі"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13124,9 -13124,9 +13392,15 @@@ msgstr "Баптандыруда
msgid "Opening"
msgstr "Ðшуда"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "ÐÑлдату"
@@@ -15004,7 -15004,7 +15278,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG I/II таÑымалдау ағындық демукÑері"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "ТелетекÑÑ‚"
@@@ -15183,7 -15183,7 +15461,11 @@@ msgid "VLC media player Help
msgstr "VLC таÑушы ойнатқышының анықтамаÑÑ‹"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Реттеуіш"
@@@ -15271,9 -15271,9 +15553,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Сақтау"
@@@ -15412,7 -15412,7 +15700,11 @@@ msgstr "Еш кіреÑін табылÐ
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Уақытқа ауыÑу"
@@@ -15432,7 -15432,7 +15724,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15442,7 -15442,7 +15738,11 @@@ msgstr "
msgid "Forward"
msgstr "Ðлға"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15462,84 -15462,84 +15762,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Ó˜Ñерлер"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15575,7 -15575,7 +15946,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15758,8 -15758,8 +16133,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Теңшелетін"
@@@ -15852,36 -15852,36 +16232,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Еш күйреу жұрналы табылмады"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Еш күйреу жұрналы табылмады"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "ЖалғаÑтыру"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "ЕÑкі теңшелімдерді жоÑмыз ба?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "VLC теңшелімдер файлдарының еÑкі нобайы табылды."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Бұны Ñебетке жылжытып VLC қайта Ñ–Ñке қоÑу"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "ЕÑкі теңшелімдерді жоÑмыз ба?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "VLC теңшелімдер файлдарының еÑкі нобайы табылды."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Бұны Ñебетке жылжытып VLC қайта Ñ–Ñке қоÑу"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16033,7 -16033,7 +16445,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Пішімдік арақатынаÑын бұғаттау"
@@@ -16162,7 -16162,7 +16578,11 @@@ msgstr "VLC жаÑыру
msgid "Hide Others"
msgstr "БаÑқаÑын жаÑыру"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Бәрін көрÑету"
@@@ -16247,15 -16247,15 +16667,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Ойнатудан Ñоң шығу"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Ðлға аттау"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Ойнатудан Ñоң шығу"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Ðлға аттау"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Ðртқа аттау"
@@@ -16271,30 -16271,30 +16703,56 @@@ msgstr "Деңгейді төменде
msgid "Audio Device"
msgstr "ДыбыÑÑ‚Ñ‹Ò› құрылғы"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Жарты мөлшері"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Орташа мөлшер"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Екі еÑе мөлшер"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Бейнебетке шақтау"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Жарты мөлшері"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Орташа мөлшер"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Екі еÑе мөлшер"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Бейнебетке шақтау"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Ò®Ñтіне қалқу"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Толық бейнебеттің бейнелік құрылғыÑÑ‹"
@@@ -16303,7 -16303,7 +16761,11 @@@
msgid "Post processing"
msgstr "Кейіңгі өңдету"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16531,7 -16531,7 +16993,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Таңдау..."
@@@ -16702,7 -16702,7 +17168,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Қаріп мөлшері"
@@@ -16931,12 -16931,12 +17401,20 @@@ msgstr "Мета-деректерді Ñ
msgid "VLC was unable to save the meta data."
msgstr "Мета-деректерді VLC Ñақтай алмады."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Теңшеу"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Бәрін Ñ‹Ñыру"
@@@ -17113,129 -17113,125 +17591,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Әдепкі кодтау"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Бейнелеу теңшелімдері"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Әдепкі кодтау"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Бейнелеу теңшелімдері"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Қаріп Ñ‚Ò¯ÑÑ–"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Қаріп"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Бейнебеттік мәзірді коÑу"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Бейнебеттік мәзірді коÑу"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "ЛайÑаңдық"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Қара бейнебеттер толық бейнебет режімінде"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Қара бейнебеттер толық бейнебет режімінде"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Бейнелеу"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "ШығаÑын модулі"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Бейненің лездік Ñ‚Ò¯Ñірмелері"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Қалта"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Пішім"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "ПрефикÑÑ–"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "ТізбектеÑкен нөмірлеу"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "ШығаÑын модулі"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Бейненің лездік Ñ‚Ò¯Ñірмелері"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Қалта"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Пішім"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "ПрефикÑÑ–"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "ТізбектеÑкен нөмірлеу"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Ең төмен кешігу"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Төмен кешігу"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Жоғары кешігу"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Ең жоғары кешігу"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Теңшелімдерді Ñ‹Ñыру"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17248,20 -17244,20 +17834,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Таңдау"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Таңдау"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -17269,16 -17265,16 +17872,29 @@@ msgstr "
"Жаңа пернелер теріңіз:\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "ЖарамÑыз қиыÑтыру"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "ЖарамÑыз қиыÑтыру"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19234,20 -19230,20 +19850,36 @@@ msgstr "Бөлектелген бейі
msgid "Create a new profile"
msgstr "Жаңа бейін жаÑау "
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "ЖаÑау"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Бейін атауы айырлған"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Бейін атауы айырлған"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Бейінге атау беруіңіз жөн."
@@@ -22552,45 -22548,45 +23184,81 @@@ msgstr "Ðғындық шығаÑыны
msgid "Overlays/Subtitles"
msgstr "Жабындылар/Субтитрлер"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Қаріп мөлшері, нүкте"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Қаріп мөлшері, нүкте"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Мәтіннің әдепкі Ñ‚Ò¯ÑÑ–"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22599,93 -22595,93 +23267,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "СалыÑтырмалы қаріп мөлшер"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Ең Ò±Ñақ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Шағын"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Ірілеу"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Ең ірі"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "YUVP құрушыÑын қолданып"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "YUVP құрушыÑын қолданып"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Мәтін құрушы"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 қаріп құрушыÑÑ‹"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Мәтін құрушы"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 қаріп құрушыÑÑ‹"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/km.po
index b7d149b,6d2a51f..dd4ff51
--- a/po/km.po
+++ b/po/km.po
@@@ -10,9 -10,9 +10,15 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-22 08:13+0000\n"
+"Last-Translator: soksophea <sophea at open.org.kh>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-09-17 09:32+0000\n"
+ "Last-Translator: khoemsokhem <sokhem at open.org.kh>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Khmer (http://www.transifex.com/projects/p/vlc-trans/language/"
"km/)\n"
"Language: km\n"
@@@ -139,7 -139,7 +145,11 @@@ msgstr "ម៉ូឌុល និង​
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -473,10 -473,10 +483,17 @@@ msgid "&About
msgstr "អំពី"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -515,17 -515,17 +532,29 @@@ msgid "Save...
msgstr "រក្សាទុក..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "ចាក់​ឡើងវិញ​ទាំងអស់"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "ចាក់​ឡើងវិញ​ážáŸ‚​មួយ​បទ"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -628,7 -628,7 +657,11 @@@ msgstr "បាន​ដល់​​ចá
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "បិទ"
@@@ -965,7 -965,7 +998,11 @@@ msgstr "F5
#: src/config/keys.c:79
msgid "F6"
++<<<<<<< HEAD
+msgstr "F6"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:80
msgid "F7"
@@@ -1323,20 -1323,20 +1360,36 @@@ msgstr "អážáŸ’រា​ស៊ុម
msgid "Decoded format"
msgstr "បាន​ឌិកូដ​ទ្រង់ទ្រាយ"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "មិន​អាច​បើក​ពáŸážáŸŒáž˜áž¶áž“​បញ្ចូល​របស់​អ្នក​បានទáŸ"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "មិន​អាច​បើក​ពáŸážáŸŒáž˜áž¶áž“​បញ្ចូល​របស់​អ្នក​បានទáŸ"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC មិន​អាច​បើក MRL '%s' បាន​ទ០។ áž–áž·áž“áž·ážáŸ’យ​មើល​កំណážáŸ‹áž áŸážáž»â€‹ážŸáž˜áŸ’រាប់​សáŸáž…ក្ដី​លម្អិហ។"
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC មិន​អាច​ស្គាល់​ទ្រង់ទ្រាយ​ពáŸážáŸŒáž˜áž¶áž“​បញ្ចូល​បាន​ទáŸ"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC មិន​អាច​ស្គាល់​ទ្រង់ទ្រាយ​ពáŸážáŸŒáž˜áž¶áž“​បញ្ចូល​បាន​ទáŸ"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1757,7 -1757,7 +1810,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1840,7 -1840,7 +1897,11 @@@ msgstr "វា​អនុញ្ញាá
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "គ្មាន"
@@@ -1869,7 -1869,7 +1930,11 @@@ msgstr "
"áž“áŸáŸ‡â€‹áž‡áž¶â€‹ážœáž·áž’ីសាស្ážáŸ’រ​បង្ហាញ​វីដáŸáž¢áž¼â€‹ážŠáŸ‚ល​បាន​ប្រើ​ដោយ VLC ។ ឥរិយាបážâ€‹áž›áŸ†áž“ាំដើម​គឺ​ážáŸ’រូវ​ជ្រើស​វិធីសាស្ážáŸ’រ​ល្អ​បំផុážâ€‹ážŠáŸ‚ល​"
"មាន​ដោយ​ស្វáŸáž™áž”្រវážáŸ’ážáž· ។"
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "បើក​វីដáŸáž¢áž¼"
@@@ -2067,7 -2067,7 +2132,11 @@@ msgstr "
"ផ្ទាល់) ។ VLC នឹង​សាកល្បង​ប្រើ​វា​ជា​លំនាំដើម ។"
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "នៅលើ​គáŸâ€‹áž‡áž¶áž“ិច្ច"
@@@ -2118,7 -2118,7 +2187,11 @@@ msgstr "លាក់​ទស្សនá
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2127,7 -2127,7 +2200,11 @@@ msgstr "មិន​ážáŸ’របាញá
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "របៀប​មិន​ážáŸ’របាញ់"
@@@ -2184,7 -2184,7 +2261,11 @@@ msgid "
msgstr ""
"រារាំង​ដáŸáž˜áž·áž“​គ្រប់គ្រង​ážáž¶áž˜áž–ល​នៅ​អំឡុង​ពáŸáž›â€‹áž…ាក់​ឡើងវិញ ដើម្បី​កុំឲ្យ​កុំព្យូទáŸážšâ€‹áž•áŸ’អាក​ដោយសារ​ážáŸ‚​ភាព​មិន​សកម្ម ។"
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "ការ​ážáž»áž”ážáŸ‚ង​បង្អួច"
@@@ -2375,7 -2375,7 +2456,11 @@@ msgstr "
"វា​បង្ážáŸ†â€‹áž€áž¶ážšâ€‹ážáŸ’ážšáž½ážáž–áž·áž“áž·ážáŸ’យ​សមាមាážáŸ’ážš ។ ម៉ូនីទáŸážšâ€‹áž—ាគច្រើន​មាន​ភីកសែល​ការ៉០(1:1) ។ ប្រសិន​បើ​អ្នក​មាន​អáŸáž€áŸ’រង់ "
"16:9 អ្នក​អាច​ážáŸ’រូវការ​ផ្លាស់ប្ដូរ​វា​ទៅកាន់ 4:3 ដើម្បី​រក្សា​នូវ​សមាមាážáŸ’ážš ។"
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "រំលង​ស៊ុម"
@@@ -2513,12 -2513,12 +2598,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2526,7 -2526,7 +2620,11 @@@ msgid "Default
msgstr "លំនាំដើម"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2861,7 -2861,7 +2959,11 @@@ msgid "You can completely disable the s
msgstr "អ្នក​អាច​បិទ​ដំណើរការ​រូបភាព​រង​ទាំងស្រុង​បាន ។"
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3125,7 -3125,6 +3227,10 @@@ msgid "
"This file contains an optional CRL to prevent remote clients from using "
"revoked certificates in TLS sessions."
msgstr ""
++<<<<<<< HEAD
+"ឯកសារ​នáŸáŸ‡â€‹áž˜áž¶áž“ CRL ជា​ជម្រើស​ដើម្បី​ការពារ​ម៉ាស៊ីន​កូន​ពី​ការ​ប្រើ​វិញ្ញាបនបážáŸ’រ​ដក​ហូážâ€‹áž“ៅ​ក្នុង​សមáŸáž™ TLS ។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:845
msgid "SOCKS server"
@@@ -3584,7 -3583,7 +3689,11 @@@ msgstr "VLC ​ážáŸ’រូវ​បា
#: src/libvlc-module.c:1085 modules/gui/qt4/ui/sprefs_interface.h:538
msgid "Use only one instance when started from file manager"
++<<<<<<< HEAD
+msgstr "ប្រើ​ážáŸ‚​ធាážáž»â€‹áž˜áž½áž™â€‹áž”៉ុណ្ណោះ​ពáŸáž›â€‹áž…ាប់ផ្ដើម​ពី​កម្មវិធី​គ្រប់គ្រង​ឯកសារ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1087
msgid "Increase the priority of the process"
@@@ -3606,7 -3605,7 +3715,11 @@@ msgstr "
#: src/libvlc-module.c:1097 modules/gui/qt4/ui/sprefs_interface.h:534
msgid "Enqueue items into playlist in one instance mode"
++<<<<<<< HEAD
+msgstr "ដាក់​ធាážáž»â€‹áž‡áž¶â€‹áž‡áž½ážšâ€‹áž€áŸ’នុង​បញ្ជី​ចាក់​នៃ​របៀប​ធាážáž»â€‹áž˜áž½áž™"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1099
msgid ""
@@@ -3763,7 -3762,7 +3876,11 @@@ msgstr "បញ្ជី​ចាក់â
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "ការ​កំណážáŸ‹â€‹áž‘ាំងនáŸáŸ‡â€‹áž‚ឺ​ជា​ការ​ចង​សោ VLC សកល ដែល​គáŸâ€‹ážŸáŸ’គាល់​ážáž¶ \"គ្រាប់ចុច​រហáŸážŸ\" ។"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "មិន​អើពើ"
@@@ -3789,8 -3788,8 +3906,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3870,10 -3869,10 +3992,17 @@@ msgid "Slower (fine)
msgstr "យឺážâ€‹áž‡áž¶áž„ (ល្អ)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3886,10 -3885,10 +4015,17 @@@ msgid "Select the hotkey to use to ski
msgstr "ជ្រើស​គ្រាប់ចុច​រហáŸážŸâ€‹ážŠáŸ‚ល​ážáŸ’រូវ​ប្រើ​ដើម្បី​រំលង​ទៅកាន់​ធាážáž»â€‹áž”ន្ទាប់​នៅ​ក្នុង​បញ្ជី​ចាក់ ។"
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "មុន"
@@@ -3898,9 -3897,9 +4034,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "ជ្រើស​គ្រាប់ចុច​រហáŸážŸâ€‹ážŠáŸ‚ល​ážáŸ’រូវ​ប្រើ​ដើម្បី​រំលង​ទៅកាន់​ធាážáž»â€‹áž˜áž»áž“​នៅ​ក្នុង​បញ្ជី​ចាក់ ។"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4135,9 -4134,9 +4277,15 @@@ msgid "Select the key to decrease audi
msgstr "ជ្រើស​គ្រាប់ចុច​ដើម្បី​បន្ážáž™â€‹áž€áž˜áŸ’ážšáž·ážâ€‹ážŸáŸ†áž¡áŸáž„ ។"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "បិទ​សំឡáŸáž„"
@@@ -4487,11 -4486,11 +4635,19 @@@ msgstr "ចាប់ផ្ដើម​/
#: src/libvlc-module.c:1395
msgid "Normal/Loop/Repeat"
++<<<<<<< HEAD
+msgstr "ធម្មážáž¶/វិល​ជុំ/ចាក់​ឡើងវិញ"
+
+#: src/libvlc-module.c:1396
+msgid "Toggle Normal/Loop/Repeat playlist modes"
+msgstr "បិទ-បើក​របៀប​បញ្ជី​ចាក់​ធម្មážáž¶/វិល​ជុំ/ចាក់​ឡើងវិញ"
++=======
+ msgstr ""
+
+ #: src/libvlc-module.c:1396
+ msgid "Toggle Normal/Loop/Repeat playlist modes"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1399
msgid "Toggle random playlist playback"
@@@ -4551,7 -4550,7 +4707,11 @@@ msgstr "បង្វិល​ážáž¶áž˜â
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "រូបážáž"
@@@ -4753,12 -4752,12 +4913,21 @@@ msgstr "កំពុង​ទាញ​á
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "បោះបង់"
@@@ -5521,7 -5520,7 +5690,11 @@@ msgstr "ច្រឹប
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "សមាមាážáŸ’ážš"
@@@ -5619,34 -5618,34 +5792,62 @@@ msgstr "BD
#: modules/access/bd/bd.c:55
msgid "Blu-ray Disc Input"
++<<<<<<< HEAD
+msgstr "ការ​បញ្ចូល​ážáž¶ážŸ Blu-ray"
+
+#: modules/access/bluray.c:60
+msgid "Blu-ray menus"
+msgstr "ម៉ឺនុយ Blu-ray"
+
+#: modules/access/bluray.c:61
+msgid "Use Blu-ray menus. If disabled, the movie will start directly"
+msgstr "ប្រើ​ម៉ឺនុយ Blu-ray ។ បើ​បិទ ភាពយន្ážâ€‹áž“ឹង​ចាប់ផ្ដើម​ដោយ​ផ្ទាល់"
++=======
+ msgstr ""
+
+ #: modules/access/bluray.c:60
+ msgid "Blu-ray menus"
+ msgstr ""
+
+ #: modules/access/bluray.c:61
+ msgid "Use Blu-ray menus. If disabled, the movie will start directly"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:69 modules/services_discovery/udev.c:596
#: modules/gui/qt4/ui/open_disk.h:299
msgid "Blu-ray"
++<<<<<<< HEAD
+msgstr "Blu-ray"
+
+#: modules/access/bluray.c:70
+msgid "Blu-ray Disc support (libbluray)"
+msgstr "គាំទ្រ​ážáž¶ážŸ Blu-ray (libbluray)"
++=======
+ msgstr ""
+
+ #: modules/access/bluray.c:70
+ msgid "Blu-ray Disc support (libbluray)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:263
msgid ""
"This Blu-ray Disc needs a library for AACS decoding, and your system does "
"not have it."
++<<<<<<< HEAD
+msgstr "ážáž¶ážŸ Blu-ray áž“áŸáŸ‡â€‹ážáŸ’រូវការ​បណ្ណាលáŸáž™â€‹ážŸáž˜áŸ’រាប់​ការ​ដោះ​លáŸážâ€‹áž€áž¼ážŠ AACS ហើយ​ប្រពáŸáž“្ធ​របស់​អ្នក​មិន​មាន។"
+
+#: modules/access/bluray.c:272
+msgid "Blu-ray Disc is corrupted."
+msgstr "ážáž¶ážŸ Blu-ray បាន​ážáž¼áž…។"
++=======
+ msgstr ""
+
+ #: modules/access/bluray.c:272
+ msgid "Blu-ray Disc is corrupted."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:275
msgid "Missing AACS configuration file!"
@@@ -5676,7 -5675,7 +5877,11 @@@ msgstr "ការ​ឌិកូដ​á
msgid ""
"This Blu-ray Disc needs a library for BD+ decoding, and your system does not "
"have it."
++<<<<<<< HEAD
+msgstr "ážáž¶ážŸ Blu-ray áž“áŸáŸ‡â€‹ážáŸ’រូវការ​បណ្ណាលáŸáž™â€‹ážŸáž˜áŸ’រាប់​ការ​ដោះ​លáŸážâ€‹áž€áž¼ážŠ BD+ ហើយ​ប្រពáŸáž“្ធ​របស់​អ្នក​មិន​មាន។"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:308
msgid "Your system BD+ decoding library does not work. Missing configuration?"
@@@ -5684,7 -5683,7 +5889,11 @@@ msgstr "បណ្ណាលáŸáž™ BD+ áž
#: modules/access/bluray.c:370
msgid "Blu-ray error"
++<<<<<<< HEAD
+msgstr "Blu-ray មាន​បញ្ហា"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/cdda.c:62 modules/gui/macosx/open.m:162
#: modules/gui/qt4/ui/open_disk.h:300
@@@ -6686,11 -6685,11 +6895,19 @@@ msgstr "
#: modules/access/fs.c:42
msgid "Collapse"
++<<<<<<< HEAD
+msgstr "ážœáŸáž‰"
+
+#: modules/access/fs.c:42
+msgid "Expand"
+msgstr "ពង្រីក"
++=======
+ msgstr ""
+
+ #: modules/access/fs.c:42
+ msgid "Expand"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/fs.c:44
msgid "Ignored extensions"
@@@ -7937,7 -7936,7 +8154,11 @@@ msgstr "áž–áŸážáŸŒáž˜áž¶áž“​បញá
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "អáŸáž€áŸ’រង់"
@@@ -8133,7 -8132,7 +8354,11 @@@ msgstr "áž›áŸážâ€‹áž€áž¼ážŠâ€‹áž–áŸá
#: modules/access/timecode.c:44
msgid "Time code subpicture elementary stream generator"
++<<<<<<< HEAD
+msgstr "áž›áŸážâ€‹áž€áž¼ážŠâ€‹áž–áŸáž›ážœáŸáž›áž¶â€‹áž€áž˜áŸ’មវិធី​បង្កើážâ€‹ážŸáŸ’ទ្រីម​រូបភាព​រង​ដំបូង"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/udp.c:53
msgid "UDP"
@@@ -8678,7 -8677,7 +8903,11 @@@ msgstr "កម្រិážâ€‹ážŸáŸ†áž¡á
msgid "Volume Set"
msgstr "កំណážáŸ‹â€‹áž€áž˜áŸ’ážšáž·ážâ€‹ážŸáŸ†áž¡áŸáž„"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -8869,31 -8868,31 +9098,59 @@@ msgstr "កូនសោ​ឯកជនâ
#: modules/access/vnc.c:58
msgid "RGB chroma (RV32, RV24, RV16, RGB2)"
++<<<<<<< HEAD
+msgstr "ក្រូម៉ា RGB (RV32, RV24, RV16, RGB2)"
+
+#: modules/access/vnc.c:61
+msgid "Compression level"
+msgstr "កម្រិážâ€‹áž”ង្ហាប់"
+
+#: modules/access/vnc.c:62
+msgid "Transfer compression level from 0 (none) to 9 (max)"
+msgstr "កម្រិážâ€‹áž”ង្ហាប់​ការ​ផ្ទáŸážšâ€‹áž–ី 0 (គ្មាន) ទៅ 9 (អážáž·.)"
+
+#: modules/access/vnc.c:63
+msgid "Image quality"
+msgstr "គុណភាព​រូបភាព"
+
+#: modules/access/vnc.c:64
+msgid "Image quality 1 to 9 (max)"
+msgstr "គុណភាព​រូបភាព ១ ដល់ ៩ (អážáž·.)"
+
+#: modules/access/vnc.c:78
+msgid "VNC"
+msgstr "VNC"
+
+#: modules/access/vnc.c:82
+msgid "VNC client access"
+msgstr "ការ​ចូល​ដំណើរការ​ម៉ាស៊ីន​កូន VNC"
++=======
+ msgstr ""
+
+ #: modules/access/vnc.c:61
+ msgid "Compression level"
+ msgstr ""
+
+ #: modules/access/vnc.c:62
+ msgid "Transfer compression level from 0 (none) to 9 (max)"
+ msgstr ""
+
+ #: modules/access/vnc.c:63
+ msgid "Image quality"
+ msgstr ""
+
+ #: modules/access/vnc.c:64
+ msgid "Image quality 1 to 9 (max)"
+ msgstr ""
+
+ #: modules/access/vnc.c:78
+ msgid "VNC"
+ msgstr ""
+
+ #: modules/access/vnc.c:82
+ msgid "VNC client access"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/zip/zipstream.c:38
msgid "Media in Zip"
@@@ -8917,43 -8916,39 +9174,73 @@@ msgstr "ការ​បម្លែងâ
#: modules/arm_neon/simple_channel_mixer.c:47
msgid "Audio filter for simple channel mixing using NEON assembly"
++<<<<<<< HEAD
+msgstr "ážáž˜áŸ’រង​អូឌីយ៉ូ​សម្រាប់​ការ​លាយ​ឆានែល​ដោយ​ប្រើការ​ផ្គុំ NEON"
+
+#: modules/arm_neon/volume.c:38
+msgid "ARM NEON audio volume"
+msgstr "កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„ ARM NEON"
+
+#: modules/arm_neon/yuv_rgb.c:35
+msgid "ARM NEON video chroma YUV->RGBA"
+msgstr "ក្រូម៉ា​វិដáŸáž¢áž¼ ARM NEON YUV->RGBA"
+
+#: modules/audio_filter/audiobargraph_a.c:40
+msgid "TCP address to use"
+msgstr "អាសយដ្ឋាន TCP ដែល​ážáŸ’រូវ​ប្រើ"
++=======
+ msgstr ""
+
+ #: modules/arm_neon/volume.c:38
+ msgid "ARM NEON audio volume"
+ msgstr ""
+
+ #: modules/arm_neon/yuv_rgb.c:35
+ msgid "ARM NEON video chroma YUV->RGBA"
+ msgstr ""
+
+ #: modules/audio_filter/audiobargraph_a.c:40
+ msgid "TCP address to use"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/audiobargraph_a.c:41
msgid ""
"TCP address to use to communicate with the video part of the Bar Graph "
"(default localhost). In the case of bargraph incrustation, use localhost."
msgstr ""
++<<<<<<< HEAD
+"អាសយដ្ឋាន TCP ដែល​ážáŸ’រូវ​ប្រើ​ដើម្បី​ទាក់ទង​ជាមួយ​ផ្នែក​វីដáŸáž¢áž¼â€‹áž“ៃ​របារ​ក្រាហ្វិក (លំនាំដើម localhost)។ "
+"ក្នុង​ករណី​ដែល​របារ​ក្រាហ្វិក​ជាប់​ស្អិហសូម​ប្រើ localhost ។"
+
+#: modules/audio_filter/audiobargraph_a.c:44
+msgid "TCP port to use"
+msgstr "ច្រក TCP ដែល​ážáŸ’រូវ​ប្រើ"
++=======
+
+ #: modules/audio_filter/audiobargraph_a.c:44
+ msgid "TCP port to use"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/audiobargraph_a.c:45
msgid ""
"TCP port to use to communicate with the video part of the Bar Graph (default "
"12345). Use the same port as the one used in the rc interface."
msgstr ""
++<<<<<<< HEAD
+"ច្រក​ TCP ដែល​ážáŸ’រូវ​ប្រើ​ដើម្បី​ទាក់ទង​ជាមួយ​ផ្នែក​វីដáŸáž¢áž¼â€‹áž“ៃ​របារ​ក្រាហ្វិក (លំនាំដើម 12345) ។ ប្រើ​ដូចគ្នា​"
+"ជាមួយ​ច្រក​ដែល​បាន​ប្រើ​នៅ​ក្នុង​ចំណុច​ប្រទាក់ rc ។"
+
+#: modules/audio_filter/audiobargraph_a.c:48
+msgid "Defines if BarGraph information should be sent"
+msgstr "កំណážáŸ‹â€‹ážáž¶â€‹ážáž¾â€‹áž–áŸážáŸŒáž˜áž¶áž“​ក្រាហ្វិក​របារ​គួរážáŸ’រូវ​បាន​ផ្ញើ ឬ​អážáŸ‹"
++=======
+
+ #: modules/audio_filter/audiobargraph_a.c:48
+ msgid "Defines if BarGraph information should be sent"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/audiobargraph_a.c:49
msgid ""
@@@ -8965,7 -8960,7 +9252,11 @@@ msgstr "
#: modules/audio_filter/audiobargraph_a.c:51
msgid "Sends the barGraph information every n audio packets"
++<<<<<<< HEAD
+msgstr "ផ្ញើ​ពáŸážáŸŒáž˜áž¶áž“​ក្រាហ្វិក​របារ​នៅ​រៀងរាល់ n កញ្ចប់​អូឌីយ៉ូ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/audiobargraph_a.c:52
msgid ""
@@@ -8977,7 -8972,7 +9268,11 @@@ msgstr "
#: modules/audio_filter/audiobargraph_a.c:54
msgid "Defines if silence alarm information should be sent"
++<<<<<<< HEAD
+msgstr "កំណážáŸ‹â€‹ážáž¶â€‹ážáž¾â€‹áž–áŸážáŸŒáž˜áž¶áž“​ជូនដំណឹង​ស្ងាážáŸ‹â€‹áž‚ួរ​ážáŸ’រូវ​បាន​ផ្ញើ ឬ​អážáŸ‹"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/audiobargraph_a.c:55
msgid ""
@@@ -8989,7 -8984,7 +9284,11 @@@ msgstr "
#: modules/audio_filter/audiobargraph_a.c:57
msgid "Time window to use in ms"
++<<<<<<< HEAD
+msgstr "បង្អួច​ពáŸáž›ážœáŸáž›áž¶â€‹ážŠáŸ‚ល​ážáŸ’រូវ​ប្រើ​គិážáž‡áž¶â€‹ មិ.វិ."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/audiobargraph_a.c:58
msgid ""
@@@ -9002,7 -8997,7 +9301,11 @@@ msgstr "
#: modules/audio_filter/audiobargraph_a.c:61
msgid "Minimum Audio level to raise the alarm"
++<<<<<<< HEAD
+msgstr "កម្រិážâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼â€‹áž¢áž”្បបរមា​ដែល​ážáŸ’រូវ​ឲ្យ​កើážâ€‹áž˜áž¶áž“​ការ​ជូនដំណឹង"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/audiobargraph_a.c:62
msgid ""
@@@ -9014,7 -9009,7 +9317,11 @@@ msgstr "
#: modules/audio_filter/audiobargraph_a.c:65
msgid "Time between two alarm messages in ms"
++<<<<<<< HEAD
+msgstr "រយៈពáŸáž›â€‹ážšážœáž¶áž„​សារ​ជូនដំណឹង​ពីរ​គិážáž‡áž¶ មិ.វិ."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/audiobargraph_a.c:66
msgid ""
@@@ -9026,7 -9021,7 +9333,11 @@@ msgstr "
#: modules/audio_filter/audiobargraph_a.c:68
msgid "Force connection reset regularly"
++<<<<<<< HEAD
+msgstr "ážáž˜áŸ’រូវ​ឲ្យ​​កំណážáŸ‹â€‹áž€áž¶ážšâ€‹ážáž—្ជាប់​ឡើងវិញ​យ៉ាង​ទៀងទាážáŸ‹"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/audiobargraph_a.c:69
msgid ""
@@@ -9163,7 -9158,7 +9474,11 @@@ msgstr "ážáž˜áŸ’រង​អូឌីá
#: modules/audio_filter/channel_mixer/remap.c:74
msgid "Audio channel remapper"
++<<<<<<< HEAD
+msgstr "ឆានែល​អូឌីយ៉ូ​របស់ remapper"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/channel_mixer/simple.c:45
msgid "Audio filter for simple channel mixing"
@@@ -9219,7 -9214,7 +9534,11 @@@ msgstr "អážáŸ’រា​ផ្លាá
#: modules/audio_filter/chorus_flanger.c:89
#: modules/audio_filter/stereo_widen.c:62
msgid "Feedback gain"
++<<<<<<< HEAD
+msgstr "ការ​ទទួល​យក​មážáž·â€‹áž¢áŸ’នកប្រើ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/chorus_flanger.c:89
msgid "Gain on Feedback loop"
@@@ -9383,12 -9378,12 +9702,20 @@@ msgstr "
#: modules/audio_filter/equalizer.c:67
msgid "Use VLC frequency bands"
++<<<<<<< HEAD
+msgstr "ប្រើ​បន្ទះ​ប្រកង់ VLC"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/equalizer.c:69
msgid ""
"Use the VLC frequency bands. Otherwise, use the ISO Standard frequency bands."
++<<<<<<< HEAD
+msgstr "ប្រើ​បន្ទះ​ប្រáŸáž€áž„់ VLC ។ បើមិនដូច្នáŸáŸ‡áž‘០ប្រើ​បន្ទះ​ប្រáŸáž€áž„់​ស្ážáž„់ដារ ISO ។"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/equalizer.c:72
msgid "Two pass"
@@@ -9492,15 -9487,15 +9819,27 @@@ msgstr "ážáž·áž…ណូ
#: modules/audio_filter/gain.c:58
msgid "Gain multiplier"
++<<<<<<< HEAD
+msgstr "ទទួល​បាន​ការ​បង្កើន"
+
+#: modules/audio_filter/gain.c:59
+msgid "Increase or decrease the gain (default 1.0)"
+msgstr "បង្កើន ឬ​បន្ážáž™â€‹áž€áž¶ážšâ€‹áž‘ទួល​បាន (លំនាំដើម 1.0)"
+
+#: modules/audio_filter/gain.c:63
+msgid "Gain control filter"
+msgstr "ទទួល​បាន​ážáž˜áŸ’រង​បញ្ជា"
++=======
+ msgstr ""
+
+ #: modules/audio_filter/gain.c:59
+ msgid "Increase or decrease the gain (default 1.0)"
+ msgstr ""
+
+ #: modules/audio_filter/gain.c:63
+ msgid "Gain control filter"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/karaoke.c:35 modules/demux/xiph_metadata.h:49
#: modules/gui/macosx/AudioEffects.m:140
@@@ -9628,23 -9623,23 +9967,43 @@@ msgstr "ក្បួន​ដោះសá
#: modules/audio_filter/resampler/src.c:49
msgid "Sinc function (best quality)"
++<<<<<<< HEAD
+msgstr "អនុគមនáŸâ€‹ážŸáŸŠáž¸áž“ុស (គុណភាព​ល្អ​ផ្ដាច់)"
+
+#: modules/audio_filter/resampler/src.c:49
+msgid "Sinc function (medium quality)"
+msgstr "អនុគមនáŸâ€‹ážŸáŸŠáž¸áž“ុស (គុណភាព​មធ្យម)"
+
+#: modules/audio_filter/resampler/src.c:50
+msgid "Sinc function (fast)"
+msgstr "អនុគមនáŸâ€‹ážŸáŸŠáž¸áž“ុស (លឿន)"
+
+#: modules/audio_filter/resampler/src.c:50
+msgid "Zero Order Hold (fastest)"
+msgstr "កាន់​លំដាប់​សូន្យ (លឿន​បំផុáž)"
+
+#: modules/audio_filter/resampler/src.c:50
+msgid "Linear (fastest)"
+msgstr "លីនáŸáž¢áŸŠáŸ‚ážš (លឿន​បំផុáž)"
++=======
+ msgstr ""
+
+ #: modules/audio_filter/resampler/src.c:49
+ msgid "Sinc function (medium quality)"
+ msgstr ""
+
+ #: modules/audio_filter/resampler/src.c:50
+ msgid "Sinc function (fast)"
+ msgstr ""
+
+ #: modules/audio_filter/resampler/src.c:50
+ msgid "Zero Order Hold (fastest)"
+ msgstr ""
+
+ #: modules/audio_filter/resampler/src.c:50
+ msgid "Linear (fastest)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/resampler/src.c:58
msgid "SRC resampler"
@@@ -9740,12 -9735,10 +10099,19 @@@ msgid "
"both channels) and by delaying the signal of left into right and vice versa, "
"thereby widening the stereo effect."
msgstr ""
++<<<<<<< HEAD
+"ážáž˜áŸ’រង​នáŸáŸ‡â€‹áž’្វើឲ្យ​បែបផែន​ស្ážáŸážšáŸ‰áŸáž¢áž¼â€‹áž”្រសើរ​ឡើង​ដោយ​បន្ážáž™â€‹áž”ែបផែន​ម៉ូណូ (សញ្ញា​ទូទៅ​សម្រាប់​ឆានែល) និង​ដោយ​ការ​"
+"ពន្យារ​សញ្ញា​ពី​ឆ្វáŸáž„​ទៅ​ស្ដាំ និង​ច្រាស​មកវិញ ដែល​ធ្វើឲ្យ​បែបផែន​ស្ážáŸážšáŸ‰áŸáž¢áž¼â€‹ážáŸ’លាំង​ជាង។"
+
+#: modules/audio_filter/stereo_widen.c:60
+msgid "Time in ms of the delay of left signal into right and vice versa."
+msgstr "រយៈពáŸáž›â€‹áž‚áž·ážáž‡áž¶â€‹áž˜áž·áž›áŸ’លីវិនាទី​នៃ​ការ​ពន្យារ​សញ្ញា​ពី​ឆ្វáŸáž„​ទៅ​ស្ដាំ និង​ច្រាស​មកវិញ។"
++=======
+
+ #: modules/audio_filter/stereo_widen.c:60
+ msgid "Time in ms of the delay of left signal into right and vice versa."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/stereo_widen.c:63
msgid ""
@@@ -9753,12 -9746,10 +10119,19 @@@
"delay effect of left signal in right output and vice versa which gives "
"widening effect."
msgstr ""
++<<<<<<< HEAD
+"ចំនួន​ការ​ទទួល​ពន្យារ​សញ្ញា​ពី​ឆ្វáŸáž„​ទៅ​ស្ដាំ និង​ច្រាស​មកវិញ។ ផ្ដល់​បែបផែន​ពន្យារ​សញ្ញា​ážáž¶áž„​ឆ្វáŸáž„​ក្នុង​លទ្ធផល​"
+"ážáž¶áž„ស្ដាំ និង​ច្រាស​មកវិញ ដែល​ផ្ដល់​នូវ​បែបផែន​ážáŸ’លាំង​ជាង។"
+
+#: modules/audio_filter/stereo_widen.c:66
+msgid "Crossfeed"
+msgstr "ការ​បញ្ចáŸáž‰â€‹ážáŸ’វែង"
++=======
+
+ #: modules/audio_filter/stereo_widen.c:66
+ msgid "Crossfeed"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/stereo_widen.c:67
msgid ""
@@@ -9766,32 -9757,30 +10139,59 @@@
"the mono. If the value is 1 it will cancel all the signal common to both "
"channels."
msgstr ""
++<<<<<<< HEAD
+"ការ​បញ្ចáŸáž‰â€‹ážáŸ’វែង​ពី​ឆ្វáŸáž„​ទៅ​ស្ដាំ​ជាមួយ​​ដំណាក់កាល​បម្លែង។ វា​ជួយ​បន្ážáž™â€‹ážŸáŸ†áž¡áŸáž„​ម៉ូណូ។ បើ​ážáž˜áŸ’លៃ ១ វា​នឹង​បោះបង់​"
+"សញ្ញា​ទៅ​ទាំងអស់​ចំពោះ​ឆានែល​ទាំង​ពីរ។"
+
+#: modules/audio_filter/stereo_widen.c:70
+msgid "Dry mix"
+msgstr "ការ​លាយ​ស្ងួáž"
+
+#: modules/audio_filter/stereo_widen.c:71
+msgid "Level of input signal of original channel."
+msgstr "កម្រិážâ€‹ážŸáž‰áŸ’ញា​បញ្ចូល​របស់​ឆានែល​ដើម។"
+
+#: modules/audio_filter/stereo_widen.c:77
+msgid "Stereo Enhancer"
+msgstr "ការ​ធ្វើឲ្យ​ស្ážáŸážšáŸ‰áŸáž¢áž¼â€‹áž”្រសើរ​ឡើង"
+
+#: modules/audio_filter/stereo_widen.c:78
+msgid "Simple stereo widening effect"
+msgstr "បែបផែន​ពង្រីក​ស្ážáŸážšáŸ‰áŸáž¢áž¼â€‹áž’ម្មážáž¶"
+
+#: modules/audio_mixer/float.c:49
+msgid "Single precision audio volume"
+msgstr "កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„​អូឌីយ៉ូ​ជាក់លាក់​ážáŸ‚មួយ"
+
+#: modules/audio_mixer/integer.c:38
+msgid "Integer audio volume"
+msgstr "កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„​អូឌីយ៉ូ​ចំនួន​គážáŸ‹"
++=======
+
+ #: modules/audio_filter/stereo_widen.c:70
+ msgid "Dry mix"
+ msgstr ""
+
+ #: modules/audio_filter/stereo_widen.c:71
+ msgid "Level of input signal of original channel."
+ msgstr ""
+
+ #: modules/audio_filter/stereo_widen.c:77
+ msgid "Stereo Enhancer"
+ msgstr ""
+
+ #: modules/audio_filter/stereo_widen.c:78
+ msgid "Simple stereo widening effect"
+ msgstr ""
+
+ #: modules/audio_mixer/float.c:49
+ msgid "Single precision audio volume"
+ msgstr ""
+
+ #: modules/audio_mixer/integer.c:38
+ msgid "Integer audio volume"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/adummy.c:37
msgid "Dummy audio output"
@@@ -9815,8 -9804,6 +10215,11 @@@ msgid "
"output, it will be down-mixed. This parameter is ignored when digital pass-"
"through is active."
msgstr ""
++<<<<<<< HEAD
+"ឆានែល​ដែល​អាច​ប្រើ​បាន​សម្រាប់​លទ្ធផល​អូឌីយ៉ូ។ បើ​ការ​បញ្ចូល​មាន​ច្រើន​ឆានែល​ជាង​ការ​បញ្ចáŸáž‰ នោះ​វា​នឹង​លាយ​"
+"បន្ទាប។ ប៉ារ៉ាម៉ែážáŸ’រ​នáŸáŸ‡â€‹áž˜áž·áž“​ážáŸ’រូវ​បាន​អើពើ នៅ​ពáŸáž›â€‹ážŠáŸ‚ល​ការ​ឆ្លងកាážáŸ‹â€‹ážŒáž¸áž‡áž¸ážáž›â€‹ážŸáž€áž˜áŸ’ម។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/alsa.c:76
msgid "Surround 4.0"
@@@ -9836,13 -9823,13 +10239,21 @@@ msgstr "Surround 5.1
#: modules/audio_output/alsa.c:77
msgid "Surround 7.1"
++<<<<<<< HEAD
+msgstr "សឺរោន 7.1"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/alsa.c:82
msgid "ALSA audio output"
msgstr "លទ្ធផល​អូឌីយ៉ូ ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "បរាជáŸáž™â€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼â€‹áž…áŸáž‰"
@@@ -9873,42 -9860,40 +10284,77 @@@ msgstr "AudioQueue (iOS / Mac OS) អáž
#: modules/audio_output/audiotrack.c:137
msgid "Android AudioTrack audio output"
++<<<<<<< HEAD
+msgstr "លទ្ធផល​អូឌីយ៉ូ​របស់ Android AudioTrack"
+
+#: modules/audio_output/audiounit_ios.c:93
+msgid "AudioUnit output for iOS"
+msgstr "លទ្ធផល​ឯកážáž¶â€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼â€‹ážŸáž˜áŸ’រាប់ iOS"
+
+#: modules/audio_output/auhal.c:69
+msgid "Last audio device"
+msgstr "ឧបករណáŸâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼â€‹áž…ុងក្រោយ"
+
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "លទ្ធផល HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ msgstr ""
+
+ #: modules/audio_output/audiounit_ios.c:89
+ msgid "AudioUnit output for iOS"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:69
+ msgid "Last audio device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "លទ្ធផល HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr "ឧបករណáŸâ€‹áž›áž‘្ធផល​អូឌីយ៉ូ​ដែល​បាន​ជ្រើស គឺ​ážáŸ’រូវបាន​ប្រើ​ទាំងស្រុង​ដោយ​កម្មវិធី​ផ្សáŸáž„ ។"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "ឧបករណáŸâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼â€‹áž‚ឺ​មិនážáŸ’រូវបាន​កំណážáŸ‹ážšáž…នា​សម្ពáŸáž“្ធ​ទáŸ"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "ឧបករណáŸâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼â€‹áž‚ឺ​មិនážáŸ’រូវបាន​កំណážáŸ‹ážšáž…នា​សម្ពáŸáž“្ធ​ទáŸ"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+"អ្នក​គួរážáŸ‚​កំណážáŸ‹â€‹ážšáž…នា​សម្ពáŸáž“្ធ​ប្លង់​ធុងបាស​របស់​អ្នក​ជាមួយ​នឹង \"ការ​រៀបចំ​មីឌី​អូឌីយ៉ូ\" នៅក្នុង /Applications/"
+"Utilities ។ VLC នឹង​បញ្ចáŸáž‰â€‹ážáŸ‚​ស្ážáŸážšáŸ‰áŸáž¢áž¼â€‹áž”៉ុណណ្ណោះ។"
+
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "ឧបករណáŸâ€‹áž”ញ្ចáŸáž‰â€‹ážŸáŸ†áž¡áŸáž„​ប្រពáŸáž“្ធ"
+
+#: modules/audio_output/auhal.c:1224
++=======
+
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (លទ្ធផល​អ៊ិនកូដ)"
@@@ -9935,7 -9920,7 +10381,11 @@@ msgstr "
#: modules/audio_output/directx.c:116
msgid "Audio volume in hundredths of decibels (dB)."
++<<<<<<< HEAD
+msgstr "កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„​អូឌីយ៉ូ​ក្នុង​ážáž˜áŸ’លៃ​រាប់​រយ decibels (dB) ។"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/directx.c:119
msgid "DirectX audio output"
@@@ -10037,11 -10022,11 +10487,19 @@@ msgstr "OpenSLES
#: modules/audio_output/oss.c:68
msgid "OSS device node path."
++<<<<<<< HEAD
+msgstr "ផ្លូវ​ážáŸ’នាំង​ឧបករណ០OSS ។"
+
+#: modules/audio_output/oss.c:72
+msgid "Open Sound System audio output"
+msgstr "លទ្ធផល​អូឌីយ៉ូ​ប្រពáŸáž“្ធ​សំឡáŸáž„​បើក​ចំហ"
++=======
+ msgstr ""
+
+ #: modules/audio_output/oss.c:72
+ msgid "Open Sound System audio output"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/pulse.c:45
msgid "Pulseaudio audio output"
@@@ -10049,15 -10034,15 +10507,27 @@@ msgstr "លទ្ធផល​អូឌá
#: modules/audio_output/sndio.c:39
msgid "OpenBSD sndio audio output"
++<<<<<<< HEAD
+msgstr "លទ្ធផល​អូឌីយ៉ូ OpenBSD sndio"
+
+#: modules/audio_output/volume.h:30
+msgid "Software gain"
+msgstr "ការ​ទទួល​យក​កម្មវិធី"
+
+#: modules/audio_output/volume.h:31
+msgid "This linear gain will be applied in software."
+msgstr "ការ​ទទួល​យក​លីនáŸáž¢áŸŠáŸ‚​នáŸáŸ‡â€‹áž“ឹង​ážáŸ’រូវ​បាន​អនុវážáŸ’ážâ€‹áž“ៅ​ក្នុង​កម្មវិធី។"
++=======
+ msgstr ""
+
+ #: modules/audio_output/volume.h:30
+ msgid "Software gain"
+ msgstr ""
+
+ #: modules/audio_output/volume.h:31
+ msgid "This linear gain will be applied in software."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/waveout.c:136
msgid "Select Audio Device"
@@@ -10073,7 -10058,7 +10543,11 @@@ msgstr "
#: modules/audio_output/waveout.c:150
msgid "WaveOut audio output"
++<<<<<<< HEAD
+msgstr "លទ្ធផល​អូឌីយ៉ូ WaveOut"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/waveout.c:706
msgid "Microsoft Soundmapper"
@@@ -10185,10 -10170,6 +10659,13 @@@ msgid "
"can produce a lot of errors.\n"
"Valid values range from 0 to 4 (0 disables all errors resilience)."
msgstr ""
++<<<<<<< HEAD
+"libavcodec អា​មាន​កំហុស​បន្ážáž·áž…បន្ážáž½áž…។\n"
+"ទោះជាយ៉ាងណា ជាមួយ​កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž€áŸ†áž ុស (មាន​ដូចជា​កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠ ISO MPEG-4 ពី M$) វា​អាច​"
+"មាន​កំហុស​ជាច្រើន។\n"
+"ជួរ​ážáž˜áŸ’លៃ​ážáŸ’រឹមážáŸ’រូវ​គឺ​ចាប់ពី 0 ទៅ 4 (0 គឺ​បិទ​កំហុស​បន្ážáž·áž…បន្ážáž½áž…​ទាំងអស់)។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:79
msgid "Workaround bugs"
@@@ -10261,16 -10242,14 +10738,27 @@@ msgid "
"Force skipping of idct to speed up decoding for frame types (-1=None, "
"0=Default, 1=B-frames, 2=P-frames, 3=B+P frames, 4=all frames)."
msgstr ""
++<<<<<<< HEAD
+"ážáž˜áŸ’រូវ​ឲ្យ​រំលង idct ដើម្បី​បង្កើន​ល្បឿន​ការ​ដោះ​លáŸážâ€‹áž€áž¼ážŠâ€‹ážŸáž˜áŸ’រាប់​ប្រភáŸáž‘​ស៊ុម(-១=គ្មាន ០=លំនាំដើម ១=B-"
+"frames ២=P-frames ៣=B+P frames ៤=ស៊ុម​ទាំងអស់)។"
+
+#: modules/codec/avcodec/avcodec.h:112
+msgid "Discard cropping information"
+msgstr "បោះបង់​ពáŸážáŸŒáž˜áž¶áž“​ច្រឹប"
+
+#: modules/codec/avcodec/avcodec.h:113
+msgid "Discard internal cropping parameters (e.g. from H.264 SPS)."
+msgstr "បោះបង់​ប៉ារ៉ាម៉ែážáŸ’រ​ច្រឹប​ážáž¶áž„ក្នុង (ឧ. ពី H.264 SPS)។"
++=======
+
+ #: modules/codec/avcodec/avcodec.h:112
+ msgid "Discard cropping information"
+ msgstr ""
+
+ #: modules/codec/avcodec/avcodec.h:113
+ msgid "Discard internal cropping parameters (e.g. from H.264 SPS)."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:115
msgid "Debug mask"
@@@ -10330,11 -10309,11 +10818,19 @@@ msgstr "វា​នឹង​អនុá
#: modules/codec/avcodec/avcodec.h:139
msgid "VDA output pixel format"
++<<<<<<< HEAD
+msgstr "ទ្រង់ទ្រាយ​ភីកសែល​លទ្ធផល VDA"
+
+#: modules/codec/avcodec/avcodec.h:140
+msgid "The pixel format for output image buffers."
+msgstr "ទ្រង់ទ្រាយ​ភីកសែល​សម្រាប់​អង្គ​ចងចាំ​បណ្ដោះអាសន្ន​រូបភាព​លទ្ធផល។"
++=======
+ msgstr ""
+
+ #: modules/codec/avcodec/avcodec.h:140
+ msgid "The pixel format for output image buffers."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:142
msgid "Threads"
@@@ -10588,13 -10567,10 +11084,20 @@@ msgid "
"(default: low). hev1 and hev2 are currently supported only with libfdk-aac "
"enabled libavcodec"
msgstr ""
++<<<<<<< HEAD
+"បញ្ជាក់​ទម្រង់​អូឌីយ៉ូ AAC ដែល​ážáŸ’រូវ​ប្រើ​សម្រាប់​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹ážŸáŸ’ទ្រីម​ប៊ីážâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼áŸ” វា​មាន​ជម្រើស​ដូច​ážáž¶áž„ក្រោម៖ "
+"ចម្បង, ទាប, ssr (មិន​គាំទ្រ), ltp, hev1, hev2 (លំនាំដើម៖ ទាប) hev1 ហើយ hev2 គឺ​បច្ចុប្បន្ន​"
+"ážáŸ’រូវ​បាន​គាំទ្រ​ážáŸ‚​ជាមួយ libfdk-aac បាន​បើក libavcodec ប៉ុណ្ណោះ"
+
+#: modules/codec/avcodec/dxva2.c:58
+msgid "DirectX Video Acceleration (DXVA) 2.0"
+msgstr "DirectX Video Acceleration (DXVA) 2.0"
++=======
+
+ #: modules/codec/avcodec/dxva2.c:58
+ msgid "DirectX Video Acceleration (DXVA) 2.0"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/encoder.c:256
#, c-format
@@@ -10617,12 -10593,6 +11120,15 @@@ msgid "
"This is not an error inside VLC media player.\n"
"Do not contact the VideoLAN project about this issue.\n"
msgstr ""
++<<<<<<< HEAD
+"វា​ហាក់​ដូចជា​ការ​ដំឡើង Libav/FFmpeg (libavcodec) របស់​អ្នក​ážáŸ’វះ​កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹ážŠáž¼áž…​ážáž¶áž„ក្រោម៖\n"
+"%s​។\n"
+"បើ​អ្នក​មិន​ដឹង​អំពី​របៀប​កែ​វា​ទ០អ្នក​អាច​សួរ​រក​ជំនួយ​ពី​ការ​ចែកចាយ​របស់​អ្នក។\n"
+"\n"
+"áž“áŸáŸ‡â€‹áž˜áž·áž“មែន​ជា​កំហុស​ážáž¶áž„ក្នុង​កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC áž‘áŸáŸ”\n"
+"សូម​កុំ​ទាក់ទង​ម​ក​គម្រោង VideoLAN អំពី​បញ្ហា​នáŸáŸ‡áŸ”\n"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/encoder.c:770 modules/codec/avcodec/encoder.c:823
msgid "VLC could not open the encoder."
@@@ -10630,23 -10600,23 +11136,43 @@@ msgstr "VLC មិន​អាច​ប
#: modules/codec/avcodec/vaapi.c:53
msgid "Video Acceleration (VA) API"
++<<<<<<< HEAD
+msgstr "Video Acceleration (VA) API"
+
+#: modules/codec/avcodec/vda.c:47
+msgid "420YpCbCr8Planar"
+msgstr "420YpCbCr8Planar"
+
+#: modules/codec/avcodec/vda.c:47
+msgid "422YpCbCr8"
+msgstr "422YpCbCr8"
+
+#: modules/codec/avcodec/vda.c:50
+msgid "Video Decode Acceleration Framework (VDA)"
+msgstr "ក្របážážŽáŸ’ឌ​ការងារ Video Decode Acceleration (VDA)"
+
+#: modules/codec/avcodec/vdpau.c:47
+msgid "Video Decode and Presentation API for Unix (VDPAU)"
+msgstr "Video Decode and Presentation API for Unix (VDPAU)"
++=======
+ msgstr ""
+
+ #: modules/codec/avcodec/vda.c:47
+ msgid "420YpCbCr8Planar"
+ msgstr ""
+
+ #: modules/codec/avcodec/vda.c:47
+ msgid "422YpCbCr8"
+ msgstr ""
+
+ #: modules/codec/avcodec/vda.c:50
+ msgid "Video Decode Acceleration Framework (VDA)"
+ msgstr ""
+
+ #: modules/codec/avcodec/vdpau.c:47
+ msgid "Video Decode and Presentation API for Unix (VDPAU)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/cc.c:55
msgid "CC 608/708"
@@@ -10990,75 -10960,75 +11516,143 @@@ msgstr "កន្ទុយ​ឯកសá
#: modules/codec/fdkaac.c:67
msgid "Encoder Profile"
++<<<<<<< HEAD
+msgstr "ទម្រង់​កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠ"
+
+#: modules/codec/fdkaac.c:68
+msgid "Encoder Algorithm to use"
+msgstr "ក្បួន​ដោះស្រាយ​កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹ážŠáŸ‚ល​ážáŸ’រូវ​ប្រើ"
+
+#: modules/codec/fdkaac.c:70
+msgid "Enable spectral band replication"
+msgstr "បើក​ការ​ឆ្លើយážáž”​បន្ទះ​វិសាលគម"
+
+#: modules/codec/fdkaac.c:71
+msgid "This is an optional feature only for the AAC-ELD profile"
+msgstr "áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž›áž€áŸ’ážážŽâ€‹áž–ិសáŸážŸâ€‹áž‡áž˜áŸ’រើស​សម្រាប់​ážáŸ‚​ទម្រង់ AAC-ELD ប៉ុណ្ណោះ"
+
+#: modules/codec/fdkaac.c:73
+msgid "VBR Quality"
+msgstr "គុណភាព VBR"
+
+#: modules/codec/fdkaac.c:74
+msgid "Quality of the VBR Encoding (0=cbr, 1-5 constant quality vbr, 5 is best"
+msgstr "គុណភាព​នៃ​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠ VBR (0=cbr, 1-5 vbr គុណភាព​ážáŸážš 5 គឺ​ល្អ​បំផុáž"
+
+#: modules/codec/fdkaac.c:76
+msgid "Enable afterburner library"
+msgstr "បើក​បណ្ណាលáŸáž™ afterburner"
++=======
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:68
+ msgid "Encoder Algorithm to use"
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:70
+ msgid "Enable spectral band replication"
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:71
+ msgid "This is an optional feature only for the AAC-ELD profile"
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:73
+ msgid "VBR Quality"
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:74
+ msgid "Quality of the VBR Encoding (0=cbr, 1-5 constant quality vbr, 5 is best"
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:76
+ msgid "Enable afterburner library"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fdkaac.c:77
msgid ""
"This library will produce higher quality audio at the expense of additional "
"CPU usage (default is enabled)"
++<<<<<<< HEAD
+msgstr "បណ្ណាលáŸáž™â€‹áž“áŸáŸ‡â€‹áž“ឹង​បង្កើážâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼â€‹áž‚ុណភាព​ážáŸ’ពស់​ដោយ​ចំណាយ​ការ​ប្រើប្រាស់​ស៊ីភីយូ​បន្ážáŸ‚ម (លំនាំដើម​គឺ​បើក)"
+
+#: modules/codec/fdkaac.c:79
+msgid "Signaling mode of the extension AOT"
+msgstr "របៀប​ដាក់​សញ្ញា​ផ្នែក​បន្ážáŸ‚ម​របស់ AOT"
++=======
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:79
+ msgid "Signaling mode of the extension AOT"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fdkaac.c:80
msgid ""
"1 is explicit for SBR and implicit for PS (default), 2 is explicit "
"hierarchical"
++<<<<<<< HEAD
+msgstr "1 គឺ​ច្បាស់​សម្រាប់ SBR ប៉ុន្ážáŸ‚​មិន​ច្បាស់​សម្រាប់ PS (លំនាំដើម), 2 គឺ​មិន​ច្បាស់​សម្រាប់​លំដាប់"
+
+#: modules/codec/fdkaac.c:97
+msgid "AAC-LC"
+msgstr "AAC-LC"
+
+#: modules/codec/fdkaac.c:97
+msgid "HE-AAC"
+msgstr "HE-AAC"
+
+#: modules/codec/fdkaac.c:97
+msgid "HE-AAC-v2"
+msgstr "HE-AAC-v2"
+
+#: modules/codec/fdkaac.c:97
+msgid "AAC-LD"
+msgstr "AAC-LD"
+
+#: modules/codec/fdkaac.c:97
+msgid "AAC-ELD"
+msgstr "AAC-ELD"
+
+#: modules/codec/fdkaac.c:100
+msgid "FDKAAC"
+msgstr "FDKAAC"
+
+#: modules/codec/fdkaac.c:101
+msgid "FDK-AAC Audio encoder"
+msgstr "កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼ FDK-AAC"
++=======
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:97
+ msgid "AAC-LC"
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:97
+ msgid "HE-AAC"
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:97
+ msgid "HE-AAC-v2"
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:97
+ msgid "AAC-LD"
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:97
+ msgid "AAC-ELD"
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:100
+ msgid "FDKAAC"
+ msgstr ""
+
+ #: modules/codec/fdkaac.c:101
+ msgid "FDK-AAC Audio encoder"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/flac.c:112
msgid "Flac audio decoder"
@@@ -11078,7 -11048,7 +11672,11 @@@ msgstr "បាន​ទាមទារâ
#: modules/codec/fluidsynth.c:49 modules/demux/mp4/id3genres.h:129
msgid "Chorus"
++<<<<<<< HEAD
+msgstr "បន្ទរ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fluidsynth.c:51
msgid "Synthesis gain"
@@@ -11094,15 -11064,13 +11692,22 @@@ msgstr "
#: modules/codec/fluidsynth.c:55
msgid "Polyphony"
++<<<<<<< HEAD
+msgstr "ពហុ​សព្ទ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fluidsynth.c:57
msgid ""
"The polyphony defines how many voices can be played at a time. Larger values "
"require more processing power."
msgstr ""
++<<<<<<< HEAD
+"ពហុ​សព្ទ​កំណážáŸ‹â€‹áž–ី​ចំនួន​សំឡáŸáž„​ដែល​អាច​ážáŸ’រូវ​បាន​ចាក់​ក្នុង​មួយ​ពáŸáž›áŸ” ážáž˜áŸ’លៃ​កាន់ážáŸ‚​ធំ​ážáŸ’រូវការ​ážáž¶áž˜áž–ល​ដំណើរការ​កាន់ážáŸ‚​"
+"ច្រើន។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fluidsynth.c:60 modules/demux/mod.c:82
msgid "Reverb"
@@@ -11132,11 -11100,11 +11737,19 @@@ msgstr "
#: modules/codec/g711.c:45
msgid "G.711 decoder"
++<<<<<<< HEAD
+msgstr "កម្មវិធី​ដោះ​លáŸážâ€‹áž€áž¼ážŠ G.711"
+
+#: modules/codec/g711.c:53
+msgid "G.711 encoder"
+msgstr "កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠ G.711"
++=======
+ msgstr ""
+
+ #: modules/codec/g711.c:53
+ msgid "G.711 encoder"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/kate.c:194 modules/codec/subsdec.c:173
msgid "Formatted Subtitles"
@@@ -11160,46 -11128,46 +11773,74 @@@ msgstr "​ស្រមោល
msgid "Outline"
msgstr "គ្រោង"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "ážáŸ’មៅ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "ប្រផáŸáŸ‡"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "ប្រាក់"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "ស"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "ážáŸ’នោážâ€‹áž…ាស់"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "ក្រហម"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11207,61 -11175,61 +11848,97 @@@ msgid "Fuchsia
msgstr "ស៊ីជម្ពូរ"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "លឿង"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "អូលីវ"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "បៃážáž„"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "ážáŸ€ážœâ€‹áž”ៃážáž„​ក្រម៉ៅ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "បៃážáž„​ážáŸ’ចី"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "ស្វាយ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "ážáŸ€ážœâ€‹áž…ាស់"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "ážáŸ€ážœ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11404,7 -11372,7 +12081,11 @@@ msgstr "ចំណងជើង​រង
msgid "Subtitle renderers using libass"
msgstr "កម្មវិធី​បង្ហាញ​ចំណងជើង​រង​ដោយប្រើ libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "ស្ážáž¶áž”នា​ឃ្លាំង​សម្ងាážáŸ‹â€‹áž–ុម្ពអក្សរ"
@@@ -11446,7 -11414,7 +12127,11 @@@ msgstr "កម្មវិធី​វá
#: modules/codec/omxil/android_mediacodec.c:163
msgid "Video decoder using Android MediaCodec"
++<<<<<<< HEAD
+msgstr "ដោះ​លáŸážâ€‹áž€áž¼ážŠâ€‹ážœáž¸ážŠáŸáž¢áž¼â€‹ážŠáŸ„យ​ប្រើ Android MediaCodec"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/omxil/omxil.c:72
msgid "Audio/Video decoder (using OpenMAX IL)"
@@@ -11458,15 -11426,15 +12143,27 @@@ msgstr "អ៊ិនកូឌáŸážšâ€‹á
#: modules/codec/omxil/vout.c:49
msgid "OpenMAX IL video output"
++<<<<<<< HEAD
+msgstr "លទ្ធផល​វីដáŸáž¢áž¼ OpenMAX IL"
+
+#: modules/codec/opus.c:62
+msgid "Opus audio decoder"
+msgstr "ស្នាដៃ​កម្មវិធី​ដោះ​លáŸážâ€‹áž€áž¼ážŠâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼"
+
+#: modules/codec/opus.c:64
+msgid "Opus"
+msgstr "ស្នាដៃ"
++=======
+ msgstr ""
+
+ #: modules/codec/opus.c:62
+ msgid "Opus audio decoder"
+ msgstr ""
+
+ #: modules/codec/opus.c:64
+ msgid "Opus"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/png.c:58
msgid "PNG video decoder"
@@@ -11474,19 -11442,17 +12171,30 @@@ msgstr "ឌិកូឌáŸážšâ€‹ážœáž¸á
#: modules/codec/qsv.c:56
msgid "Enable software mode"
++<<<<<<< HEAD
+msgstr "បើក​របៀប​កម្មវិធី"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:57
msgid ""
"Allow the use of the Intel Media SDK software implementation of the codecs "
"if no QuickSync Video hardware acceleration is present on the system."
msgstr ""
++<<<<<<< HEAD
+"អនុញ្ញាážâ€‹áž²áŸ’យ​ប្រើ​ការ​អនុវážáŸ’ážâ€‹áž€áž˜áŸ’មវិធី Intel Media SDK ​នៃ​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠ ប្រសិនបើ​មិន​មាន​ការ​បង្កើន​"
+"ល្បឿន​ផ្នែក​រឹង​វិដáŸáž¢áž¼ QuickSync នៅ​លើ​ប្រពáŸáž“្ធ។"
+
+#: modules/codec/qsv.c:61
+msgid "Codec Profile"
+msgstr "ទម្រង់​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠ"
++=======
+
+ #: modules/codec/qsv.c:61
+ msgid "Codec Profile"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:63
msgid ""
@@@ -11494,12 -11460,10 +12202,19 @@@
"the correct profile from other sources, such as resolution and bitrate. E.g. "
"'high'"
msgstr ""
++<<<<<<< HEAD
+"បញ្ជាក់​ទម្រង់​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž…្បាស់លាស់។ បើ​អ្នក​មិន​មាន​ទ០ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž“ឹង​កំណážáŸ‹â€‹â€‹áž‘ម្រង់​ážáŸ’រឹមážáŸ’រូវ​ពី​ប្រភព​"
+"ផ្សáŸáž„ ដូចជា​គុណភាព​បង្ហាញ និង​អážáŸ’រាប៊ីážáŸ” ឧ.'high'"
+
+#: modules/codec/qsv.c:67
+msgid "Codec Level"
+msgstr "កម្រិážâ€‹áž€áž¶ážšâ€‹ážŠáž¶áž€áŸ‹â€‹áž›áŸážâ€‹áž€áž¼ážŠ"
++=======
+
+ #: modules/codec/qsv.c:67
+ msgid "Codec Level"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:69
msgid ""
@@@ -11507,12 -11471,10 +12222,19 @@@
"the correct profile from other sources, such as resolution and bitrate. E.g. "
"'4.2' for mpeg4-part10 or 'low' for mpeg2"
msgstr ""
++<<<<<<< HEAD
+"បញ្ជាក់​កម្រិážâ€‹áž€áž¶ážšâ€‹ážŠáž¶áž€áŸ‹â€‹áž›áŸážâ€‹áž€áž¼ážŠâ€‹áž…្បាស់លាស់។ បើ​អ្នក​មិន​មាន​ទ០ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž“ឹង​កំណážáŸ‹â€‹áž‘ម្រង់​ážáŸ’រឹមážáŸ’រូវ​ពី​ប្រភព​"
+"ផ្សáŸáž„ ដូច​ជា​គុណភាព​បង្ហាញ និង​អážáŸ’រា​ប៊ីážáŸ” ឧ. '4.2' សម្រាប់ mpeg4-part10 ឬ 'low' សម្រាប់ mpeg2"
+
+#: modules/codec/qsv.c:73
+msgid "Group of Picture size"
+msgstr "ក្រុម​ទំហំ​រូបភាព"
++=======
+
+ #: modules/codec/qsv.c:73
+ msgid "Group of Picture size"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:75
msgid ""
@@@ -11520,36 -11482,30 +12242,57 @@@
"GopPicSize=0, then the GOP size is unspecified. If GopPicSize=1, only I-"
"frames are used."
msgstr ""
++<<<<<<< HEAD
+"ចំនួន​រូបភាព​នៅ​ក្នុង GOP (Group of Pictures); បច្ចុប្បន្ន បើ GopPicSize=0 នោះ​ទំហំ GOP គឺ​មិន​"
+"បាន​បញ្ជាក់។ បើ GopPicSize=1 នោះ​គឺ​មានážáŸ‚ I-frames ដែល​ážáŸ’រូវ​បាន​ប្រើ។"
+
+#: modules/codec/qsv.c:79
+msgid "Group of Picture Reference Distance"
+msgstr "ក្រុម​រូបភាព​ចម្ងាយ​យោង"
++=======
+
+ #: modules/codec/qsv.c:79
+ msgid "Group of Picture Reference Distance"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:81
msgid ""
"Distance between I- or P- key frames; if it is zero, the GOP structure is "
"unspecified. Note: If GopRefDist = 1, there are no B- frames used. "
msgstr ""
++<<<<<<< HEAD
+"ចម្ងាយ​រវាង I- ឬ P- key frames; ប្រសិនបើ​វា​សូន្យ រចនាសមពáŸáž“្ធ GOP គឺ​មិន​បាន​បញ្ជាក់។ ចំណាំ៖ បើ "
+"GopRefDist = 1 នោះ​គឺ​មិន​មាន B- ណាមួយ​ážáŸ’រូវ​បាន​ប្រើ​ទáŸáŸ”"
+
+#: modules/codec/qsv.c:85
+msgid "Target Usage"
+msgstr "ទិសដៅ​ប្រើប្រាស់"
++=======
+
+ #: modules/codec/qsv.c:85
+ msgid "Target Usage"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:86
msgid ""
"The target usage allow to choose between different trade-offs between "
"quality and speed. Allowed values are : 'speed', 'balanced' and 'quality'."
msgstr ""
++<<<<<<< HEAD
+"ទិសដៅ​ប្រើប្រាស់​អនុញ្ញាážâ€‹áž²áŸ’យ​​ជ្រើស​រវាង​ážáž»áž›áŸ’យភាព រវាង​គុណភាព និង​ល្បឿន។ ážáž˜áŸ’លៃ​ដែល​អនុញ្ញាážâ€‹áž‚ឺ៖ 'speed', "
+"'balanced' និង 'quality' ។"
+
+#: modules/codec/qsv.c:90
+msgid "IDR interval"
+msgstr "ចន្លោះ​ពáŸáž› IDR"
++=======
+
+ #: modules/codec/qsv.c:90
+ msgid "IDR interval"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:92
msgid ""
@@@ -11560,28 -11516,20 +12303,42 @@@
"the sequence header before every Nth I-frame. If IdrInterval=0 (default), "
"SDK inserts the sequence header once at the beginning of the stream. "
msgstr ""
++<<<<<<< HEAD
+"សម្រាប់ H.264, IdrInterval បញ្ជាក់​ចន្លោះ​ពáŸáž› IDR-frame នៅ​ក្នុង​លក្ážážážŽáŸ’ឌ​របស់ I- frames; "
+"បើ IdrInterval=0 នោះ I-frame ទាំងអស់​គឺជា IDR-frame ។ បើ IdrInterval=1 នោះ I-"
+"frame ផ្សáŸáž„ទៀážâ€‹áž‘ាំងអស់​គឺជា IDR-frame ។ សម្រាប់ MPEG2, IdrInterval កំណážáŸ‹â€‹áž›áŸ†ážŠáž¶áž”់​ចន្លោះ​ពáŸáž›â€‹"
+"ក្បាល​នៅ​ក្នុង​លក្ážážážŽáŸ’ឌ​របស់ I-frames ។ បើ IdrInterval=N នោះ SDK នឹង​បញ្ចូល​លំដាប់​ក្បាល​នៅ​មុន "
+"Nth I-frame នីមួយៗ។ បើ IdrInterval=0 (លំនាំដើម) នោះ SDK នឹង​បញ្ចូល​លំដាប់​ក្បាល​ម្ដង​នៅ​ពáŸáž›â€‹"
+"ចាប់ផ្ដើម​ស្ទ្រីម"
+
+#: modules/codec/qsv.c:100
+msgid "Rate Control Method"
+msgstr "វិធីសាស្ážáŸ’រ​គ្រប់គ្រង​អážáŸ’រា"
++=======
+
+ #: modules/codec/qsv.c:100
+ msgid "Rate Control Method"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:102
msgid ""
"The rate control method to use when encoding. Can be one of 'crb', 'vbr', "
"'qp', 'avbr'. 'qp' mode isn't supported for mpeg2"
msgstr ""
++<<<<<<< HEAD
+"វិធីសាស្ážáŸ’រ​គ្រប់គ្រង​អážáŸ’រា​ដែល​ážáŸ’រូវ​ប្រើ​ពáŸáž›â€‹ážŠáž¶áž€áŸ‹â€‹áž›áŸážâ€‹áž€áž¼ážŠáŸ” អាច​មួយ​ក្នុង​ចំណោម 'crb', 'vbr', 'qp', "
+"'avbr' ។ របៀប 'qp' មិន​ážáŸ’រូវ​បាន​គាំទ្រ​សម្រាប់ mpeg2 áž‘áŸ"
+
+#: modules/codec/qsv.c:105
+msgid "Quantization parameter"
+msgstr "ប៉ារ៉ាម៉ែážáŸ’រ​ការ​កំណážáŸ‹â€‹áž”រិមាណ"
++=======
+
+ #: modules/codec/qsv.c:105
+ msgid "Quantization parameter"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:106
msgid ""
@@@ -11589,48 -11537,40 +12346,76 @@@
"qpp and qpp. It has less precedence than the forementionned parameters. Used "
"only if rc_method is 'qp'."
msgstr ""
++<<<<<<< HEAD
+"ប៉ារ៉ាម៉ែážáŸ’រ​ការ​កំណážáŸ‹â€‹áž”រិមាណ​សម្រាប់​ប្រភáŸáž‘​ស៊ុម​ទាំងអស់។ ប៉ារ៉ាម៉ែážáŸ’រ​នáŸáŸ‡â€‹áž€áŸ†ážŽážáŸ‹ qpi, qpp áž“áž·áž„ qpp ។ វា​មាន​"
+"អាទិភាព​​ជាង​ប៉ារ់ាមែážáŸ’រ​ដែល​បាន​លើក​ឡើង​ážáž¶áž„មុážáŸ” ប្រើ​ážáŸ‚​នៅ​ពáŸáž›â€‹ážŠáŸ‚áž› rc_method ជា 'qp' ប៉ុណ្ណោះ។"
+
+#: modules/codec/qsv.c:110
+msgid "Quantization parameter for I-frames"
+msgstr "ប៉ារ៉ាម៉ែážáŸ’រ​ការ​កំណážáŸ‹â€‹áž”រិមាណ​សម្រាប់ I-frames"
++=======
+
+ #: modules/codec/qsv.c:110
+ msgid "Quantization parameter for I-frames"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:111
msgid ""
"Quantization parameter for I-frames. This parameter overrides any qp set "
"globally. Used only if rc_method is 'qp'."
msgstr ""
++<<<<<<< HEAD
+"ប៉ារ៉ាម៉ែážáŸ’រ​ការ​កំណážáŸ‹â€‹áž”រិមាណ​សម្រាប់ I-frames ។ ប៉ារ៉ាម៉ែážáŸ’រ​បáŸáŸ‡â€‹áž”ដិសáŸáž’​ការ​កំណážáŸ‹ qp ណាមួយ​ជា​សាកល។ ប្រើ​"
+"ážáŸ‚​នៅ​ពáŸáž›â€‹ážŠáŸ‚áž› rc_method ជា 'qp' ប៉ុណ្ណោះ។"
+
+#: modules/codec/qsv.c:114
+msgid "Quantization parameter for P-frames"
+msgstr "ប៉ារ៉ាម៉ែážáŸ’រ​ការ​កំណážáŸ‹â€‹áž”រិមាណ​សម្រាប់ P-frames"
++=======
+
+ #: modules/codec/qsv.c:114
+ msgid "Quantization parameter for P-frames"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:115
msgid ""
"Quantization parameter for P-frames. This parameter overrides any qp set "
"globally. Used only if rc_method is 'qp'."
msgstr ""
++<<<<<<< HEAD
+"ប៉ារ៉ាម៉ែážáŸ’រ​ការ​កំណážáŸ‹â€‹áž”រិមាណ​សម្រាប់ P-frames។ ប៉ារ៉ាម៉ែážáŸ’រ​នáŸáŸ‡â€‹áž”ដិសáŸáž’​ការ​កំណážáŸ‹ qp ណាមួយ​ជា​សាកល។ ប្រើ​"
+"ážáŸ‚​នៅ​ពáŸáž›â€‹ážŠáŸ‚áž› rc_method ជា 'qp' ប៉ុណ្ណោះ។"
+
+#: modules/codec/qsv.c:118
+msgid "Quantization parameter for B-frames"
+msgstr "ប៉ារ៉មែážáŸ’រ​ការ​កំណážáŸ‹â€‹áž”រិមាណ​សម្រាប់ B-frames"
++=======
+
+ #: modules/codec/qsv.c:118
+ msgid "Quantization parameter for B-frames"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:119
msgid ""
"Quantization parameter for B-frames. This parameter overrides any qp set "
"globally. Used only if rc_method is 'qp'."
msgstr ""
++<<<<<<< HEAD
+"ប៉ារ៉ម៉ែážáŸ’រ​ការ​កំណážáŸ‹â€‹áž”រិមាណ​សម្រាប់ B-frames ។ ប៉ារ៉ាម៉ែážáŸ’រ​នáŸáŸ‡â€‹áž”ដិសáŸáž’​ការ​កំណážáŸ‹ qp ណាមួយ​ជា​សាកល។ ប្រើ​"
+"ážáŸ‚​នៅ​ពáŸáž›â€‹ážŠáŸ‚áž› rc_method ជា 'qp' ប៉ុណ្ណោះ។"
+
+#: modules/codec/qsv.c:122
+msgid "Maximum Bitrate"
+msgstr "អážáŸ’រា​ប៊ីážâ€‹áž¢ážáž·áž”រមា"
++=======
+
+ #: modules/codec/qsv.c:122
+ msgid "Maximum Bitrate"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:123
msgid ""
@@@ -11638,12 -11578,10 +12423,19 @@@
"method. If not set, this parameter. is computed from other sources such as "
"bitrate, profile, level, etc."
msgstr ""
++<<<<<<< HEAD
+"កំណážáŸ‹â€‹áž¢ážáŸ’រា​ប៊ីážâ€‹áž¢ážáž·áž”រមា​គិážáž‡áž¶ Kpbs (1000 bits/s) សម្រាប់​វិធីសាស្ážáŸ’រ​គ្រប់គ្រង​អážáŸ’រា​ប៊ីហVBR ។ បើ​មិន​កំណážáŸ‹â€‹"
+"ទ០ប៉ារ៉ាម៉ែážáŸ’រ​នáŸáŸ‡â€‹áž“ឹង​ážáŸ’រូវ​បាន​គណនា​ចáŸáž‰áž–ី​ប្រភព​ផ្សáŸáž„ទៀážâ€‹ážŠáž¼áž…ជា អážáŸ’រា​ប៊ីហទម្រង់ និង​កម្រិážáŸ”ល។"
+
+#: modules/codec/qsv.c:127
+msgid "Accuracy of RateControl"
+msgstr "សុក្រឹážáž—ាព​នៃ​ការ​គ្រប់គ្រង​អážáŸ’រា"
++=======
+
+ #: modules/codec/qsv.c:127
+ msgid "Accuracy of RateControl"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:128
msgid ""
@@@ -11652,25 -11590,20 +12444,39 @@@
"880 kpbs and under 730 kpbs. The targeted accuracy is only reached after a "
"certained convergence period. See the convergence parameter"
msgstr ""
++<<<<<<< HEAD
+"ប្រលោះ​គិážáž‡áž¶â€‹áž—ាគរយ​នៃ​វិធី​សាស្ážáŸ’ážš 'avbr' (Average Variable BitRate) ។ (ឧ. 10 ជាមួយ​អážáŸ’រា​"
+"ប៊ីហ800 kpbs មាននáŸáž™ážáž¶â€‹áž€áž˜áŸ’មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž“ឹង​មិន​ព្យាយាម​លើស​ពី 880 kpbs ហើយ​កáŸâ€‹áž˜áž·áž“​ក្រោម 730 "
+"kpbs ដែរ។ សុក្រឹážáž—ាព​គោលដៅ​ážáŸ’រូវ​បាន​ដល់​ážáŸ‚​បន្ទាប់ពី​រយៈពáŸáž›â€‹áž˜áž½áž™â€‹áž‡áž¶áž€áŸ‹áž›áž¶áž€áŸ‹â€‹áž”៉ុណ្ណោះ។ មើល​ប៉ារ៉ាម៉ែážáŸ’រ​រួម"
+
+#: modules/codec/qsv.c:134
+msgid "Convergence time of 'avbr' RateControl"
+msgstr "áž–áŸáž›ážœáŸáž›áž¶â€‹ážšáž½áž˜â€‹áž“ៃ​ការ​គ្រប់គ្រង​អážáŸ’រា 'avbr'"
++=======
+
+ #: modules/codec/qsv.c:134
+ msgid "Convergence time of 'avbr' RateControl"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:135
msgid ""
"Number of 100 frames before the 'avbr' rate control method reaches the "
"requested bitrate with the requested accuracy. See the accuracy parameter. "
msgstr ""
++<<<<<<< HEAD
+"ចំនួន​នៃ​ស៊ុម 100 មុន​ពáŸáž›â€‹ážŠáŸ‚ល​វិធីសាស្ážáŸ’រ​គ្រប់គ្រង​អážáŸ’រា 'avbr' ឡើង​ដល់​អážáŸ’រា​ប៊ីហនិង​សុក្រឹážáž—ាព​ដែល​បាន​ស្នើ។ "
+"មើល​ប៉ារ៉ាម៉ែážáŸ’រ​សុក្រឹážáž—ាព។"
+
+#: modules/codec/qsv.c:139
+msgid "Number of slices per frame"
+msgstr "ចំនួន​ចំណិážâ€‹áž€áŸ’នុង​មួយ​ស៊ុម"
++=======
+
+ #: modules/codec/qsv.c:139
+ msgid "Number of slices per frame"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:140
msgid ""
@@@ -11678,8 -11611,6 +12484,11 @@@
"block rows. If numslice is not set, the encoder may choose any slice "
"partitioning allowed by the codec standard."
msgstr ""
++<<<<<<< HEAD
+"ចំនួន​ចំណិážâ€‹áž€áŸ’នុង​ស៊ុម​វីដáŸáž¢áž¼â€‹áž“ីមួយ ចំណិážâ€‹áž“ីមួយៗ​មាន​ជួរដáŸáž€ macro-block មួយ ឬ​ច្រើន។ ប្រសិនបើ​មិន​បាន​កំណážáŸ‹â€‹áž…ំនួន​ចំណិážâ€‹"
+"ទ០កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž¢áž¶áž…​នឹង​ជ្រើស​ចម្រៀក​ចំណិážâ€‹ážŽáž¶áž˜áž½áž™â€‹ážŠáŸ‚ល​បាន​អនុញ្ញាážâ€‹ážŠáŸ„យ​ស្ážáž„់ដារ​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠáŸ”"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:145 modules/codec/qsv.c:146 modules/codec/x264.c:134
msgid "Number of reference frames"
@@@ -11687,7 -11618,7 +12496,11 @@@ msgstr "ចំនួន​ស៊ុមâ
#: modules/codec/qsv.c:148
msgid "Number of parallel operations"
++<<<<<<< HEAD
+msgstr "ចំនួន​ប្រážáž·áž”ážáŸ’ážáž·áž€áž¶ážšâ€‹áž”៉ារ៉ាឡែល"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:149
msgid ""
@@@ -11695,13 -11626,10 +12508,19 @@@
"result. Higher may result on better throughput depending on hardware. MPEG2 "
"needs at least 1 here."
msgstr ""
++<<<<<<< HEAD
+"កំណážáŸ‹â€‹áž…ំនួន​ប្រážáž·áž”ážáŸ’ážáž·áž€áž¶ážšâ€‹áž€áž¶ážšâ€‹ážŠáž¶áž€áŸ‹â€‹áž›áŸážâ€‹áž€áž¼ážŠâ€‹áž”៉ារ៉ាឡែល មុន​ពáŸáž›â€‹áž’្វើ​សមកាលកម្ម​លទ្ធផល។ ážáž˜áŸ’លៃ​ážáŸ’ពស់​អាច​មាន​លទ្ធផល​"
+"អážáŸ’រា​ល្អ​ážáŸ‚​អាស្រáŸáž™â€‹áž›áž¾â€‹áž•áŸ’នែក​រឹង​ដែរ។ MPEG2 ទាមទារ​យ៉ាង​ហោច 1 ។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:193
msgid "Intel QuickSync Video encoder for MPEG4-Part10/MPEG2 (aka H.264/H.262)"
msgstr ""
++<<<<<<< HEAD
+"កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹ážœáž¸ážŠáŸáž¢áž¼ Intel QuickSync សម្រាប់ MPEG4-Part10/MPEG2 (aka H.264/H.262)"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/quicktime.c:66
msgid "QuickTime library decoder"
@@@ -12293,7 -12221,7 +13112,11 @@@ msgstr "វៀážážŽáž¶áž˜ (វីនáž
#: modules/codec/subsdec.c:166
msgid "Subtitle text encoding"
++<<<<<<< HEAD
+msgstr "ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž¢ážáŸ’ážáž”ទ​ចំណង​ជើង​រង"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsdec.c:167
msgid "Set the encoding used in text subtitles"
@@@ -12301,7 -12229,7 +13124,11 @@@ msgstr "កំណážáŸ‹â€‹áž€áž¶ážšâ€‹á
#: modules/codec/subsdec.c:168
msgid "Subtitle justification"
++<<<<<<< HEAD
+msgstr "ការ​ážáž˜áŸ’រឹម​ចំណងជើង​រង"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsdec.c:169
msgid "Set the justification of subtitles"
@@@ -12309,12 -12237,12 +13136,20 @@@ msgstr "កំណážáŸ‹â€‹áž€áž¶ážšâ€‹á
#: modules/codec/subsdec.c:170
msgid "UTF-8 subtitle autodetection"
++<<<<<<< HEAD
+msgstr "ការ​រក​ឃើញ​ចំណងជើង​រក​ស្វáŸáž™áž”្រវážáŸ’ážáž· UTF-8"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsdec.c:171
msgid ""
"This enables automatic detection of UTF-8 encoding within subtitle files."
++<<<<<<< HEAD
+msgstr "វា​នឹង​បើក​ការ​រក​ឃើញ​ស្វáŸáž™áž”្រវážáŸ’ážáž·â€‹áž“ៃ​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠ UTF-8 ដោយ​ប្រើ​ឯកសារ​ចំណងជើង​រង។"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsdec.c:174
msgid ""
@@@ -12326,7 -12254,7 +13161,11 @@@ msgstr "
#: modules/codec/subsdec.c:182
msgid "Text subtitle decoder"
++<<<<<<< HEAD
+msgstr "កម្មវិធី​ដោះ​លáŸážâ€‹áž€áž¼ážŠâ€‹áž…ំណងជើង​រង​អážáŸ’ážáž”áž‘"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#. xgettext:
#. The Windows ANSI code page most commonly used for this language.
@@@ -12467,7 -12395,7 +13306,11 @@@ msgstr "អ៊ិនកូឌáŸážšâ€‹á
#: modules/codec/uleaddvaudio.c:41
msgid "Ulead DV audio decoder"
++<<<<<<< HEAD
+msgstr "កម្មវិធី​ដោះ​លáŸážâ€‹áž€áž¼ážŠ Ulead DV"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/vorbis.c:175
msgid "Maximum encoding bitrate"
@@@ -12518,8 -12446,6 +13361,11 @@@ msgid "
"improving quality for a given bitrate at the cost of seeking precision. Use "
"-1 for infinite."
msgstr ""
++<<<<<<< HEAD
+"កំណážáŸ‹â€‹áž…ន្លោះ​ពáŸáž›â€‹áž¢ážáž·áž”រមា​រវាង IDR-frames ។ ážáž˜áŸ’លៃ​ធំ​សន្សំសំចៃ​ប៊ីហដូច្នáŸáŸ‡â€‹áž”ង្កើន​គុណភាព​សម្រាប់​អážáŸ’រា​ប៊ីážâ€‹"
+"ដែល​បាន​ផ្ដល់​នៅ​ážáž˜áŸ’លៃ​រក​ឃើញ​ជាក់លាក់។ ប្រើ -1 សម្រាប់​មិន​កំណážáŸ‹áŸ”"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:67
msgid "Minimum GOP size"
@@@ -12645,15 -12571,13 +13491,22 @@@ msgstr "
#: modules/codec/x264.c:125
msgid "Use fullrange instead of TV colorrange"
++<<<<<<< HEAD
+msgstr "ប្រើ fullrange ជំនួស​ឲ្យ TV colorrange"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:126
msgid ""
"TV-range is usually used colorrange, defining this to true will enable "
"libx264 to use full colorrange on encoding"
msgstr ""
++<<<<<<< HEAD
+"TV-range ជាទូទៅ​បាន​ប្រើ colorrange, ការ​កំណážáŸ‹â€‹áž‘ៅ​ពិážâ€‹áž‚ឺ​វា​នឹង​បើក libx264 ដើម្បី​ប្រើ "
+"colorrange áž–áŸáž‰áž›áŸáž‰â€‹áž“ៅ​ពáŸáž›â€‹ážŠáž¶áž€áŸ‹â€‹áž›áŸážâ€‹áž€áž¼ážŠ"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:129
msgid "CABAC"
@@@ -12730,7 -12654,7 +13583,11 @@@ msgstr "របៀប​ážáŸ’ážšáž½ážâ
#: modules/codec/x264.c:164
msgid "Frame packing"
++<<<<<<< HEAD
+msgstr "ការ​វáŸáž…​ážáŸ’ចប់​ស៊ុម"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:165
msgid ""
@@@ -12742,13 -12666,6 +13599,16 @@@
" 4: top bottom - L is on top, R on bottom\n"
" 5: frame alternation - one view per frame"
msgstr ""
++<<<<<<< HEAD
+"សម្រាប់​វីដáŸáž¢áž¼ stereoscopic កំណážáŸ‹â€‹áž€áž¶ážšâ€‹ážšáŸ€áž”ចំ​ស៊ុម៖\n"
+" ០៖ ក្ដារ​ចážáž»ážšáž„្គ - ភីកសែល​គឺ​ឆ្លាស់គ្នា​រវាង L áž“áž·áž„ R\n"
+" ១៖ ការ​ឆ្លាស់​ជួរឈរ - L áž“áž·áž„ R ážáŸ’រូវ​បាន​ážáŸ’របាញ់​ចូលគ្នា​ដោយ​ជួរឈរ\n"
+" ២៖ ការ​ឆ្លាស់​ជួរដáŸáž€ - L áž“áž·áž„ R ážáŸ’រូវ​បាន​ážáŸ’របាញ់​ចូលគ្នា​ដោយ​ជួរដáŸáž€\n"
+" ៣៖ ម្ដង​មួយ​ផ្នែក - L គឺ​នៅ​ážáž¶áž„ឆ្វáŸáž„ R គឺ​នៅ​ážáž¶áž„ស្ដាំ\n"
+" ៤៖ កំពូល និង​បាហ- L គឺ​នៅ​កំពូល R គឺ​នៅ​បាáž\n"
+" ៥៖ ការ​ឆ្លាស់​ស៊ុម - ទិដ្ឋភាព​មួយ​ក្នុង​មួយ​ស៊ុម"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:173
msgid "Use Periodic Intra Refresh"
@@@ -13311,19 -13228,19 +14171,35 @@@ msgstr "áž–áŸážáŸŒáž˜áž¶áž“ HRD-timin
#: modules/codec/x264.c:409
msgid "Default tune setting used"
++<<<<<<< HEAD
+msgstr "បាន​ប្រើ​ការ​កំណážáŸ‹â€‹áž”ទ​លំនាំដើម"
+
+#: modules/codec/x264.c:410
+msgid "Default preset setting used"
+msgstr "បាន​ប្រើ​ការ​កំណážáŸ‹â€‹ážŸáŸ’ážšáŸáž…​លំនាំដើម"
+
+#: modules/codec/x264.c:412
+msgid "x264 advanced options."
+msgstr "x264 ជម្រើស​កម្រិážâ€‹ážáŸ’ពស់។"
+
+#: modules/codec/x264.c:413
+msgid "x264 advanced options, in the form {opt=val,op2=val2} ."
+msgstr "x264 ជម្រើស​កម្រិážâ€‹ážáŸ’ពស់ នៅ​ក្នុង​ទម្រង់ {opt=val,op2=val2} ។"
++=======
+ msgstr ""
+
+ #: modules/codec/x264.c:410
+ msgid "Default preset setting used"
+ msgstr ""
+
+ #: modules/codec/x264.c:412
+ msgid "x264 advanced options."
+ msgstr ""
+
+ #: modules/codec/x264.c:413
+ msgid "x264 advanced options, in the form {opt=val,op2=val2} ."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:418
msgid "dia"
@@@ -13347,64 -13264,64 +14223,122 @@@ msgstr "tesa
#: modules/codec/x264.c:429
msgid "Fast"
++<<<<<<< HEAD
+msgstr "លឿន​"
+
+#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ msgstr ""
+
+ #: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "ធម្មážáž¶"
#: modules/codec/x264.c:429
msgid "Slow"
++<<<<<<< HEAD
+msgstr "យឺážâ€‹"
+
+#: modules/codec/x264.c:434
+msgid "Spatial"
+msgstr "Spatial"
+
+#: modules/codec/x264.c:434
+msgid "Temporal"
+msgstr "Temporal"
+
+#: modules/codec/x264.c:439
+msgid "checkerboard"
+msgstr "ក្ដារ​ចážáž»ážšáž„្គ"
+
+#: modules/codec/x264.c:439
+msgid "column alternation"
+msgstr "ការ​ឆ្លាស់​ជួរឈរ"
+
+#: modules/codec/x264.c:439
+msgid "row alternation"
+msgstr "ការ​ឆ្លាស់​ជួរដáŸáž€"
+
+#: modules/codec/x264.c:439
+msgid "side by side"
+msgstr "ម្ដង​មួយ​ផ្នែក"
+
+#: modules/codec/x264.c:439
+msgid "top bottom"
+msgstr "កំពូល និង​បាáž"
+
+#: modules/codec/x264.c:439
+msgid "frame alternation"
+msgstr "ការ​ឆ្លាស់​ស៊ុម"
+
+#: modules/codec/x264.c:443
+msgid "H.264/MPEG-4 Part 10/AVC encoder (x264 10-bit)"
+msgstr "ផ្នែក H.264/MPEG-4 កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠ 10/AVC (x264 10-bit)"
+
+#: modules/codec/x264.c:446
+msgid "H.264/MPEG-4 Part 10/AVC encoder (x264)"
+msgstr "ផ្នែក H.264/MPEG-4 កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠ 10/AVC (x264)"
+
+#: modules/codec/xwd.c:36
+msgid "XWD image decoder"
+msgstr "កម្មវិធី​ដោះ​លáŸážâ€‹áž€áž¼ážŠ XWD"
++=======
+ msgstr ""
+
+ #: modules/codec/x264.c:434
+ msgid "Spatial"
+ msgstr ""
+
+ #: modules/codec/x264.c:434
+ msgid "Temporal"
+ msgstr ""
+
+ #: modules/codec/x264.c:439
+ msgid "checkerboard"
+ msgstr ""
+
+ #: modules/codec/x264.c:439
+ msgid "column alternation"
+ msgstr ""
+
+ #: modules/codec/x264.c:439
+ msgid "row alternation"
+ msgstr ""
+
+ #: modules/codec/x264.c:439
+ msgid "side by side"
+ msgstr ""
+
+ #: modules/codec/x264.c:439
+ msgid "top bottom"
+ msgstr ""
+
+ #: modules/codec/x264.c:439
+ msgid "frame alternation"
+ msgstr ""
+
+ #: modules/codec/x264.c:443
+ msgid "H.264/MPEG-4 Part 10/AVC encoder (x264 10-bit)"
+ msgstr ""
+
+ #: modules/codec/x264.c:446
+ msgid "H.264/MPEG-4 Part 10/AVC encoder (x264)"
+ msgstr ""
+
+ #: modules/codec/xwd.c:36
+ msgid "XWD image decoder"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/zvbi.c:58
msgid "Teletext page"
@@@ -13460,8 -13377,8 +14394,13 @@@ msgid "D-Bus control interface
msgstr "ចំណុច​ប្រទាក់​ឧបករណáŸâ€‹áž”ញ្ជា D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13543,17 -13460,17 +14482,29 @@@ msgstr "ចំណុច​ប្រទá
#: modules/control/hotkeys.c:188
msgid "One"
++<<<<<<< HEAD
+msgstr "មួយ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:195
#, c-format
msgid "Loop: %s"
++<<<<<<< HEAD
+msgstr "រង្វិល​ជុំ៖ %s"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:202
#, c-format
msgid "Random: %s"
++<<<<<<< HEAD
+msgstr "ចៃដន្យ៖ %s"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:331
#, c-format
@@@ -13570,28 -13487,28 +14521,52 @@@ msgstr "បាន​កážáŸ‹ážáŸ’ážšá
#: modules/control/hotkeys.c:409
msgid "Sub sync: bookmarked audio time"
++<<<<<<< HEAD
+msgstr "សមកាលកម្ម​រង៖ បាន​ចំណាំ​ពáŸáž›ážœáŸáž›áž¶â€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼"
+
+#: modules/control/hotkeys.c:424 modules/control/hotkeys.c:493
+msgid "No active subtitle"
+msgstr "គ្មាន​ចំណងជើង​រង​សកម្ម"
+
+#: modules/control/hotkeys.c:430
+msgid "Sub sync: bookmarked subtitle time"
+msgstr "សម្មកាលកម្ម​រង៖ បាន​ចំណាំ​ពáŸáž›ážœáŸáž›áž¶â€‹áž…ំណងជើង​រង"
+
+#: modules/control/hotkeys.c:450
+msgid "Sub sync: set bookmarks first!"
+msgstr "សមកាលកម្ម​រង៖ កំណážáŸ‹â€‹áž…ំណាំ​ជា​មុន​សិន!"
++=======
+ msgstr ""
+
+ #: modules/control/hotkeys.c:424 modules/control/hotkeys.c:493
+ msgid "No active subtitle"
+ msgstr ""
+
+ #: modules/control/hotkeys.c:430
+ msgid "Sub sync: bookmarked subtitle time"
+ msgstr ""
+
+ #: modules/control/hotkeys.c:450
+ msgid "Sub sync: set bookmarks first!"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:459
#, c-format
msgid "Sub sync: corrected %i ms (total delay = %i ms)"
++<<<<<<< HEAD
+msgstr "សមកាលកម្ម​រង៖ បាន​កែážáž˜áŸ’រូវ %i ms (ការ​ពន្យារ​សរុប = %i ms)"
+
+#: modules/control/hotkeys.c:472
+msgid "Sub sync: delay reset"
+msgstr "សមកាលកម្ម​រង៖ កំណážáŸ‹â€‹áž€áž¶ážšâ€‹áž–ន្យារ​ឡើងវិញ"
++=======
+ msgstr ""
+
+ #: modules/control/hotkeys.c:472
+ msgid "Sub sync: delay reset"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:501
#, c-format
@@@ -13620,7 -13537,7 +14595,11 @@@ msgstr "N/A
#: modules/control/hotkeys.c:613 modules/control/hotkeys.c:645
#, c-format
msgid "Program Service ID: %s"
++<<<<<<< HEAD
+msgstr "áž›áŸážâ€‹ážŸáž˜áŸ’គាល់​សáŸážœáž¶â€‹áž€áž˜áŸ’មវិធី៖ %s"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:769
#, c-format
@@@ -13659,17 -13576,17 +14638,29 @@@ msgstr "បើក​មិន​ážáŸ’á
#: modules/control/hotkeys.c:1022
msgid "Subtitle position: no active subtitle"
++<<<<<<< HEAD
+msgstr "ទីážáž¶áŸ†áž„​ចំណងជើង​រង៖ គ្មាន​ចំណងជើង​រង​សកម្ម"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:1034
#, c-format
msgid "Subtitle position %d px"
++<<<<<<< HEAD
+msgstr "ទីážáž¶áŸ†áž„​ចំណងជើង​រង %d px"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:1168
#, c-format
msgid "Volume %ld%%"
++<<<<<<< HEAD
+msgstr "កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„ %ld%%"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:1173
#, c-format
@@@ -13806,9 -13723,9 +14797,15 @@@ msgstr "កំពុង​ចាប់á
msgid "Opening"
msgstr "កំពុង​បើក"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "ផ្អាក"
@@@ -14034,7 -13951,7 +15031,11 @@@ msgstr "| voldown [X] . . . . . . áž”
#: modules/control/rc.c:824
msgid "| adev [device] . . . . . . . . set/get audio device"
++<<<<<<< HEAD
+msgstr "| adev [device] . . . . . . . . set/get audio device"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:825
msgid "| achan [X]. . . . . . . . . . set/get audio channels"
@@@ -14066,7 -13983,7 +15067,11 @@@ msgstr "| snapshot . . . . . . . . . .
#: modules/control/rc.c:832
msgid "| strack [X] . . . . . . . . . set/get subtitle track"
++<<<<<<< HEAD
+msgstr "| strack [X] . . . . . . . . . set/get subtitle track"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:833
msgid "| key [hotkey name] . . . . . . simulate hotkey press"
@@@ -14109,7 -14026,7 +15114,11 @@@ msgstr "កំហុស ៖ `goto' ážá
#, c-format
msgid "Playlist has only %u element"
msgid_plural "Playlist has only %u elements"
++<<<<<<< HEAD
+msgstr[0] "បញ្ជី​ចាក់​មាន​ធាážáž»â€‹ážáŸ‚ %u ប៉ុណ្ណោះ"
++=======
+ msgstr[0] ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:1747 modules/gui/ncurses.c:805
msgid "+-[Incoming]"
@@@ -14284,7 -14201,7 +15293,11 @@@ msgstr "កុំ​ជួស​ជុá
#: modules/demux/avi/avi.c:68
msgid "Fix when necessary"
++<<<<<<< HEAD
+msgstr "ជួសជុល​នៅ​ពáŸáž›â€‹áž…ាំបាច់"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/avi/avi.c:72
msgid "AVI demuxer"
@@@ -14303,11 -14220,6 +15316,14 @@@ msgid "
"This step might take a long time on a large file.\n"
"What do you want to do?"
msgstr ""
++<<<<<<< HEAD
+"ដោយសារážáŸ‚​លិបិក្រម​​ឯកសារ AVI áž“áŸáŸ‡â€‹â€‹ážáž¼áž… ឬ​បាážáŸ‹ នាំឲ្យ​ការ​ស្វែងរក​ដំណើរការ​មិន​ážáŸ’រឹមážáŸ’រូវ។\n"
+"VLC នឹង​​មិន​ជួសជុល​ឯកសារ​របស់​អ្នក​ទ០ប៉ុន្ážáŸ‚​​វា​អាច​ជួសជុល​បញ្ហា​នáŸáŸ‡â€‹áž‡áž¶â€‹áž”ណ្ដោះ​អាសន្ន ដោយ​ការ​បង្កើážâ€‹áž›áž·áž”ិក្រម​នៅ​"
+"ក្នុង​អង្គ​ចងចាំ។\n"
+"ជំហាន​នáŸáŸ‡â€‹áž¢áž¶áž…​ប្រើ​ពáŸáž›ážœáŸáž›áž¶â€‹áž™áž¼ážšâ€‹ážŸáž˜áŸ’រាប់​ឯកសារ​ដែល​មាន​ទំហំ​ធំ។\n"
+"ážáž¾â€‹áž¢áŸ’នក​ចង់​ធ្វើ​អ្វី?"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/avi/avi.c:680
msgid "Build index then play"
@@@ -14331,7 -14243,7 +15347,11 @@@ msgstr "ឧបករណáŸâ€‹áž˜áž·áž“â
#: modules/demux/demuxdump.c:32
msgid "Dump module"
++<<<<<<< HEAD
+msgstr "ម៉ូឌុល​មិន​ល្អ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/demuxdump.c:33
msgid "Dump filename"
@@@ -14586,7 -14498,7 +15606,11 @@@ msgstr "Blues
#: modules/demux/mp4/id3genres.h:33
msgid "Classic Rock"
++<<<<<<< HEAD
+msgstr "Classic Rock"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:34
msgid "Country"
@@@ -14646,7 -14558,7 +15670,11 @@@ msgstr "Alternative
#: modules/demux/mp4/id3genres.h:54
msgid "Death Metal"
++<<<<<<< HEAD
+msgstr "Death Metal"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:55
msgid "Pranks"
@@@ -14702,7 -14614,7 +15730,11 @@@ msgstr "Game
#: modules/demux/mp4/id3genres.h:69
msgid "Sound Clip"
++<<<<<<< HEAD
+msgstr "ឃ្លីប​សំឡáŸáž„"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:70
msgid "Gospel"
@@@ -14714,7 -14626,7 +15746,11 @@@ msgstr "អ៊ូអរ
#: modules/demux/mp4/id3genres.h:72
msgid "Alternative Rock"
++<<<<<<< HEAD
+msgstr "Alternative Rock"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:73
msgid "Bass"
@@@ -14734,11 -14646,11 +15770,19 @@@ msgstr "Meditative
#: modules/demux/mp4/id3genres.h:78
msgid "Instrumental Pop"
++<<<<<<< HEAD
+msgstr "Instrumental Pop"
+
+#: modules/demux/mp4/id3genres.h:79
+msgid "Instrumental Rock"
+msgstr "Instrumental Rock"
++=======
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:79
+ msgid "Instrumental Rock"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:80
msgid "Ethnic"
@@@ -14774,7 -14686,7 +15818,11 @@@ msgstr "Dream
#: modules/demux/mp4/id3genres.h:88
msgid "Southern Rock"
++<<<<<<< HEAD
+msgstr "Southern Rock"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:89
msgid "Comedy"
@@@ -14794,11 -14706,11 +15842,19 @@@ msgstr "៤០លើគáŸ
#: modules/demux/mp4/id3genres.h:93
msgid "Christian Rap"
++<<<<<<< HEAD
+msgstr "Christian Rap"
+
+#: modules/demux/mp4/id3genres.h:94
+msgid "Pop/Funk"
+msgstr "Pop/Funk"
++=======
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:94
+ msgid "Pop/Funk"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:95
msgid "Jungle"
@@@ -14814,7 -14726,7 +15870,11 @@@ msgstr "Cabaret
#: modules/demux/mp4/id3genres.h:98
msgid "New Wave"
++<<<<<<< HEAD
+msgstr "New Wave"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:99 modules/gui/macosx/VideoEffects.m:160
#: modules/video_filter/psychedelic.c:55
@@@ -14844,11 -14756,11 +15904,19 @@@ msgstr "កុលសម្ពáŸáž“្á
#: modules/demux/mp4/id3genres.h:105
msgid "Acid Punk"
++<<<<<<< HEAD
+msgstr "Acid Punk"
+
+#: modules/demux/mp4/id3genres.h:106
+msgid "Acid Jazz"
+msgstr "Acid Jazz"
++=======
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:106
+ msgid "Acid Jazz"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:107
msgid "Polka"
@@@ -14864,271 -14776,271 +15932,539 @@@ msgstr "ážáž“្ážáŸ’រី
#: modules/demux/mp4/id3genres.h:110
msgid "Rock & Roll"
++<<<<<<< HEAD
+msgstr "Rock & Roll"
+
+#: modules/demux/mp4/id3genres.h:111
+msgid "Hard Rock"
+msgstr "Hard Rock"
+
+#: modules/demux/mp4/id3genres.h:112
+msgid "Folk"
+msgstr "Folk"
+
+#: modules/demux/mp4/id3genres.h:113
+msgid "Folk-Rock"
+msgstr "Folk-Rock"
+
+#: modules/demux/mp4/id3genres.h:114
+msgid "National Folk"
+msgstr "National Folk"
+
+#: modules/demux/mp4/id3genres.h:115
+msgid "Swing"
+msgstr "Swing"
+
+#: modules/demux/mp4/id3genres.h:116
+msgid "Fast Fusion"
+msgstr "Fast Fusion"
+
+#: modules/demux/mp4/id3genres.h:117
+msgid "Bebob"
+msgstr "Bebob"
+
+#: modules/demux/mp4/id3genres.h:119
+msgid "Revival"
+msgstr "Revival"
+
+#: modules/demux/mp4/id3genres.h:120
+msgid "Celtic"
+msgstr "Celtic"
+
+#: modules/demux/mp4/id3genres.h:121
+msgid "Bluegrass"
+msgstr "Bluegrass"
+
+#: modules/demux/mp4/id3genres.h:122
+msgid "Avantgarde"
+msgstr "Avantgarde"
+
+#: modules/demux/mp4/id3genres.h:123
+msgid "Gothic Rock"
+msgstr "Gothic Rock"
+
+#: modules/demux/mp4/id3genres.h:124
+msgid "Progressive Rock"
+msgstr "Progressive Rock"
+
+#: modules/demux/mp4/id3genres.h:125
+msgid "Psychedelic Rock"
+msgstr "Psychedelic Rock"
+
+#: modules/demux/mp4/id3genres.h:126
+msgid "Symphonic Rock"
+msgstr "Symphonic Rock"
+
+#: modules/demux/mp4/id3genres.h:127
+msgid "Slow Rock"
+msgstr "Slow Rock"
+
+#: modules/demux/mp4/id3genres.h:128
+msgid "Big Band"
+msgstr "Big Band"
+
+#: modules/demux/mp4/id3genres.h:130
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: modules/demux/mp4/id3genres.h:131
+msgid "Acoustic"
+msgstr "Acoustic"
+
+#: modules/demux/mp4/id3genres.h:132
+msgid "Humour"
+msgstr "Humour"
+
+#: modules/demux/mp4/id3genres.h:133
+msgid "Speech"
+msgstr "Speech"
+
+#: modules/demux/mp4/id3genres.h:134
+msgid "Chanson"
+msgstr "Chanson"
+
+#: modules/demux/mp4/id3genres.h:135
+msgid "Opera"
+msgstr "Opera"
+
+#: modules/demux/mp4/id3genres.h:136
+msgid "Chamber Music"
+msgstr "Chamber Music"
+
+#: modules/demux/mp4/id3genres.h:137
+msgid "Sonata"
+msgstr "Sonata"
+
+#: modules/demux/mp4/id3genres.h:138
+msgid "Symphony"
+msgstr "Symphony"
+
+#: modules/demux/mp4/id3genres.h:139
+msgid "Booty Bass"
+msgstr "Booty Bass"
+
+#: modules/demux/mp4/id3genres.h:140
+msgid "Primus"
+msgstr "Primus"
+
+#: modules/demux/mp4/id3genres.h:141
+msgid "Porn Groove"
+msgstr "Porn Groove"
+
+#: modules/demux/mp4/id3genres.h:142
+msgid "Satire"
+msgstr "Satire"
+
+#: modules/demux/mp4/id3genres.h:143
+msgid "Slow Jam"
+msgstr "Slow Jam"
+
+#: modules/demux/mp4/id3genres.h:145
+msgid "Tango"
+msgstr "Tango"
+
+#: modules/demux/mp4/id3genres.h:146
+msgid "Samba"
+msgstr "Samba"
+
+#: modules/demux/mp4/id3genres.h:147
+msgid "Folklore"
+msgstr "Folklore"
+
+#: modules/demux/mp4/id3genres.h:148
+msgid "Ballad"
+msgstr "Ballad"
+
+#: modules/demux/mp4/id3genres.h:149
+msgid "Power Ballad"
+msgstr "Power Ballad"
+
+#: modules/demux/mp4/id3genres.h:150
+msgid "Rhythmic Soul"
+msgstr "Rhythmic Soul"
+
+#: modules/demux/mp4/id3genres.h:151
+msgid "Freestyle"
+msgstr "Freestyle"
+
+#: modules/demux/mp4/id3genres.h:152
+msgid "Duet"
+msgstr "Duet"
+
+#: modules/demux/mp4/id3genres.h:153
+msgid "Punk Rock"
+msgstr "Punk Rock"
+
+#: modules/demux/mp4/id3genres.h:154
+msgid "Drum Solo"
+msgstr "Drum Solo"
+
+#: modules/demux/mp4/id3genres.h:155
+msgid "Acapella"
+msgstr "Acapella"
+
+#: modules/demux/mp4/id3genres.h:156
+msgid "Euro-House"
+msgstr "Euro-House"
+
+#: modules/demux/mp4/id3genres.h:157
+msgid "Dance Hall"
+msgstr "Dance Hall"
+
+#: modules/demux/mp4/id3genres.h:158
+msgid "Goa"
+msgstr "Goa"
+
+#: modules/demux/mp4/id3genres.h:159
+msgid "Drum & Bass"
+msgstr "Drum & Bass"
+
+#: modules/demux/mp4/id3genres.h:160
+msgid "Club - House"
+msgstr "Club - House"
+
+#: modules/demux/mp4/id3genres.h:161
+msgid "Hardcore"
+msgstr "Hardcore"
+
+#: modules/demux/mp4/id3genres.h:162
+msgid "Terror"
+msgstr "Terror"
+
+#: modules/demux/mp4/id3genres.h:163
+msgid "Indie"
+msgstr "Indie"
+
+#: modules/demux/mp4/id3genres.h:164
+msgid "BritPop"
+msgstr "BritPop"
+
+#: modules/demux/mp4/id3genres.h:165
+msgid "Negerpunk"
+msgstr "Negerpunk"
+
+#: modules/demux/mp4/id3genres.h:166
+msgid "Polsk Punk"
+msgstr "Polsk Punk"
+
+#: modules/demux/mp4/id3genres.h:167
+msgid "Beat"
+msgstr "Beat"
+
+#: modules/demux/mp4/id3genres.h:168
+msgid "Christian Gangsta Rap"
+msgstr "Christian Gangsta Rap"
+
+#: modules/demux/mp4/id3genres.h:169
+msgid "Heavy Metal"
+msgstr "Heavy Metal"
+
+#: modules/demux/mp4/id3genres.h:170
+msgid "Black Metal"
+msgstr "Black Metal"
+
+#: modules/demux/mp4/id3genres.h:171
+msgid "Crossover"
+msgstr "Crossover"
+
+#: modules/demux/mp4/id3genres.h:172
+msgid "Contemporary Christian"
+msgstr "Contemporary Christian"
+
+#: modules/demux/mp4/id3genres.h:173
+msgid "Christian Rock"
+msgstr "Christian Rock"
+
+#: modules/demux/mp4/id3genres.h:174
+msgid "Merengue"
+msgstr "Merengue"
+
+#: modules/demux/mp4/id3genres.h:175
+msgid "Salsa"
+msgstr "Salsa"
+
+#: modules/demux/mp4/id3genres.h:176
+msgid "Thrash Metal"
+msgstr "Thrash Metal"
+
+#: modules/demux/mp4/id3genres.h:177
+msgid "Anime"
+msgstr "Anime"
+
+#: modules/demux/mp4/id3genres.h:178
+msgid "JPop"
+msgstr "JPop"
+
+#: modules/demux/mp4/id3genres.h:179
+msgid "Synthpop"
+msgstr "Synthpop"
++=======
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:111
+ msgid "Hard Rock"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:112
+ msgid "Folk"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:113
+ msgid "Folk-Rock"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:114
+ msgid "National Folk"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:115
+ msgid "Swing"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:116
+ msgid "Fast Fusion"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:117
+ msgid "Bebob"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:119
+ msgid "Revival"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:120
+ msgid "Celtic"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:121
+ msgid "Bluegrass"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:122
+ msgid "Avantgarde"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:123
+ msgid "Gothic Rock"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:124
+ msgid "Progressive Rock"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:125
+ msgid "Psychedelic Rock"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:126
+ msgid "Symphonic Rock"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:127
+ msgid "Slow Rock"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:128
+ msgid "Big Band"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:130
+ msgid "Easy Listening"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:131
+ msgid "Acoustic"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:132
+ msgid "Humour"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:133
+ msgid "Speech"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:134
+ msgid "Chanson"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:135
+ msgid "Opera"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:136
+ msgid "Chamber Music"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:137
+ msgid "Sonata"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:138
+ msgid "Symphony"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:139
+ msgid "Booty Bass"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:140
+ msgid "Primus"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:141
+ msgid "Porn Groove"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:142
+ msgid "Satire"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:143
+ msgid "Slow Jam"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:145
+ msgid "Tango"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:146
+ msgid "Samba"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:147
+ msgid "Folklore"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:148
+ msgid "Ballad"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:149
+ msgid "Power Ballad"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:150
+ msgid "Rhythmic Soul"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:151
+ msgid "Freestyle"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:152
+ msgid "Duet"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:153
+ msgid "Punk Rock"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:154
+ msgid "Drum Solo"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:155
+ msgid "Acapella"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:156
+ msgid "Euro-House"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:157
+ msgid "Dance Hall"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:158
+ msgid "Goa"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:159
+ msgid "Drum & Bass"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:160
+ msgid "Club - House"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:161
+ msgid "Hardcore"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:162
+ msgid "Terror"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:163
+ msgid "Indie"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:164
+ msgid "BritPop"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:165
+ msgid "Negerpunk"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:166
+ msgid "Polsk Punk"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:167
+ msgid "Beat"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:168
+ msgid "Christian Gangsta Rap"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:169
+ msgid "Heavy Metal"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:170
+ msgid "Black Metal"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:171
+ msgid "Crossover"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:172
+ msgid "Contemporary Christian"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:173
+ msgid "Christian Rock"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:174
+ msgid "Merengue"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:175
+ msgid "Salsa"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:176
+ msgid "Thrash Metal"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:177
+ msgid "Anime"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:178
+ msgid "JPop"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:179
+ msgid "Synthpop"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:52
msgid "MP4 stream demuxer"
@@@ -15207,7 -15119,7 +16543,11 @@@ msgstr "អážáŸ’ážáž”ទ​ចម្á
#: modules/demux/mp4/mp4.c:1075
msgid "Record Company"
++<<<<<<< HEAD
+msgstr "ក្រុមហ៊ុន​ážáž"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1076
msgid "Model"
@@@ -15223,43 -15135,43 +16563,83 @@@ msgstr "ដាក់​ជា​ក្á
#: modules/demux/mp4/mp4.c:1080
msgid "Sub-Title"
++<<<<<<< HEAD
+msgstr "ចំណងជើង​រង"
+
+#: modules/demux/mp4/mp4.c:1081
+msgid "Arranger"
+msgstr "អ្នក​រៀបចំ"
+
+#: modules/demux/mp4/mp4.c:1082
+msgid "Art Director"
+msgstr "ចាងហ្វាង​សិល្បៈ"
+
+#: modules/demux/mp4/mp4.c:1083
+msgid "Copyright Acknowledgement"
+msgstr "រក្សាសិទ្ធិ​ការ​ទទួលស្គាល់"
+
+#: modules/demux/mp4/mp4.c:1084
+msgid "Conductor"
+msgstr "គ្រូ​ភ្លáŸáž„"
+
+#: modules/demux/mp4/mp4.c:1085
+msgid "Song Description"
+msgstr "សáŸáž…ក្ដី​ពណ៌នា​ចម្រៀង"
+
+#: modules/demux/mp4/mp4.c:1086
+msgid "Liner Notes"
+msgstr "ទ្រនាប់​ចំណាំ"
+
+#: modules/demux/mp4/mp4.c:1087
+msgid "Phonogram Rights"
+msgstr "សិទ្ធ​ផលិáž"
+
+#: modules/demux/mp4/mp4.c:1089
+msgid "Sound Engineer"
+msgstr "វិស្វករ​សំឡáŸáž„"
+
+#: modules/demux/mp4/mp4.c:1090
+msgid "Soloist"
+msgstr "អ្នក​លáŸáž„​សូឡូ"
++=======
+ msgstr ""
+
+ #: modules/demux/mp4/mp4.c:1081
+ msgid "Arranger"
+ msgstr ""
+
+ #: modules/demux/mp4/mp4.c:1082
+ msgid "Art Director"
+ msgstr ""
+
+ #: modules/demux/mp4/mp4.c:1083
+ msgid "Copyright Acknowledgement"
+ msgstr ""
+
+ #: modules/demux/mp4/mp4.c:1084
+ msgid "Conductor"
+ msgstr ""
+
+ #: modules/demux/mp4/mp4.c:1085
+ msgid "Song Description"
+ msgstr ""
+
+ #: modules/demux/mp4/mp4.c:1086
+ msgid "Liner Notes"
+ msgstr ""
+
+ #: modules/demux/mp4/mp4.c:1087
+ msgid "Phonogram Rights"
+ msgstr ""
+
+ #: modules/demux/mp4/mp4.c:1089
+ msgid "Sound Engineer"
+ msgstr ""
+
+ #: modules/demux/mp4/mp4.c:1090
+ msgid "Soloist"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1091
msgid "Thanks"
@@@ -15267,7 -15179,7 +16647,11 @@@ msgstr "អរគុណ
#: modules/demux/mp4/mp4.c:1092
msgid "Executive Producer"
++<<<<<<< HEAD
+msgstr "ផលិážáž€ážšâ€‹áž”្រážáž·áž”ážáŸ’ážáž·"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mpc.c:62
msgid "MusePack demuxer"
@@@ -15393,7 -15305,7 +16777,11 @@@ msgstr "កម្មវិធី​នá
#: modules/demux/playlist/playlist.c:129
msgid "Dummy IFO demux"
++<<<<<<< HEAD
+msgstr "IFO មិន​ទ្វáŸâ€‹áž‘ិស​មិន​ល្អ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/playlist/playlist.c:134
msgid "iTunes Music Library importer"
@@@ -15550,7 -15462,7 +16938,11 @@@ msgstr "ឧបករណáŸâ€‹áž˜áž·áž“â
msgid ""
"This is the desired frame rate when playing raw video streams. In the form "
"30000/1001 or 29.97"
++<<<<<<< HEAD
+msgstr "áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž¢ážáŸ’រា​ស៊ុម​ដែល​ចង់បាន​ពáŸáž›â€‹áž…ាក់​ស្ទ្រីម​វីដáŸáž¢áž¼â€‹ážŠáž¾áž˜áŸ” នៅ​ក្នុង​ទម្រង់ 30000/1001 ឬ 29.97"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/rawvid.c:49
msgid "This specifies the width in pixels of the raw video stream."
@@@ -15605,8 -15517,6 +16997,11 @@@ msgid "
"Force the subtiles format. Selecting \"auto\" means autodetection and should "
"always work."
msgstr ""
++<<<<<<< HEAD
+"បង្ážáŸ†â€‹áž‘្រង់ទ្រាយ​ចំណងជើង​រង។ ការ​ជ្រើស \"ស្វáŸáž™áž”្រវážáŸ’ážáž·\" មាននáŸáž™ážáž¶â€‹ážšáž€â€‹ážƒáž¾áž‰â€‹ážŸáŸ’ážœáŸáž™áž”្រវážáŸ’ážáž· ហើយ​វា​ដំណើរការ​"
+"ជានិច្ច។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/subtitle.c:58
msgid "Override the default track description."
@@@ -15614,19 -15524,19 +17009,35 @@@ msgstr "បដិសáŸáž’​សáŸáž…á
#: modules/demux/subtitle.c:70
msgid "Text subtitle parser"
++<<<<<<< HEAD
+msgstr "កម្មវិធី​ញែក​ចំណងជើង​រង​អážáŸ’ážáž”áž‘"
+
+#: modules/demux/subtitle.c:78 modules/video_filter/subsdelay.c:275
+msgid "Subtitle delay"
+msgstr "ការ​ពន្យារពáŸáž›â€‹áž…ំណងជើង​រង"
+
+#: modules/demux/subtitle.c:80
+msgid "Subtitle format"
+msgstr "ទ្រង់ទ្រាយ​ចំណងជើង​រង"
+
+#: modules/demux/subtitle.c:83
+msgid "Subtitle description"
+msgstr "សáŸáž…ក្ដី​ពណ៌នា​ចំណង​ជើង​រង"
++=======
+ msgstr ""
+
+ #: modules/demux/subtitle.c:78 modules/video_filter/subsdelay.c:275
+ msgid "Subtitle delay"
+ msgstr ""
+
+ #: modules/demux/subtitle.c:80
+ msgid "Subtitle format"
+ msgstr ""
+
+ #: modules/demux/subtitle.c:83
+ msgid "Subtitle description"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/ts.c:94
msgid "Extra PMT"
@@@ -15720,7 -15630,7 +17131,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "ឧបករណáŸâ€‹áž˜áž·áž“​ទ្វáŸâ€‹áž‘ិស​ស្ទ្រីម​បញ្ជូន MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "áž–áŸážáŸŒáž˜áž¶áž“​ទូរទស្សនáŸ"
@@@ -15862,7 -15772,7 +17277,11 @@@ msgstr "អំពី​កម្មវá
#: modules/gui/macosx/about.m:95 modules/gui/qt4/dialogs/help.cpp:125
msgid "Credits"
++<<<<<<< HEAD
+msgstr "អ្នកចូលរួម"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/about.m:98 modules/gui/macosx/MainMenu.m:450
#: modules/gui/qt4/dialogs/help.cpp:119
@@@ -15876,11 -15786,11 +17295,19 @@@ msgstr "អ្នក​និពន្á
#: modules/gui/macosx/about.m:104
msgid ""
"VLC media player and VideoLAN are trademarks of the VideoLAN Association."
++<<<<<<< HEAD
+msgstr "កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC áž“áž·áž„ VideoLAN គឺជា​ស្លាក​សញ្ញា​របស់​សម្ពáŸáž“្ធ VideoLAN ។"
+
+#: modules/gui/macosx/about.m:115
+msgid "Compiled by %s with %@"
+msgstr "បាន​ចង​ក្រង​ដោយ %s ជាមួយ %@"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/about.m:115
+ msgid "Compiled by %s with %@"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/about.m:132 modules/gui/qt4/dialogs/help.cpp:94
msgid ""
@@@ -15893,20 -15803,13 +17320,27 @@@
"\"http://www.videolan.org/contribute/\"><span style=\" text-decoration: "
"underline; color:#0057ae;\">Help and join us!</span></a>"
msgstr ""
++<<<<<<< HEAD
+"<p>កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC គឺជា​កម្មវិធី​ស្ទ្រីម កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠ និង​ជា​កម្មវិធី​ចាក់​មáŸážŒáŸ€â€‹áž€áž¼ážŠâ€‹áž…ំហ​ឥážâ€‹áž”ង់​ážáŸ’លៃ "
+"ដែល​បាន​បង្កើážâ€‹ážŠáŸ„យ​អ្នក​ស្មáŸáž‚្រចិážáŸ’ážâ€‹ážšáž”ស់​សហគមន០<a href=\"http://www.videolan.org/\"><span "
+"style=\" text-decoration: underline; color:#0057ae;\">VideoLAN</span></a> ។</"
+"p><p>VLC ប្រើ​ការ​បម្លែង​កូដ​ážáž¶áž„ក្នុង​របស់​វា ដែល​ដំណើរការ​ជាមួយ​កម្មវិធី​​ពáŸáž‰â€‹áž“ិយម​ជាច្រើន និង​អាច​អាន​"
+"ឯកសារ​ជាច្រើន​ដូចជា ស៊ីឌី ឌីវីឌី ស្ទ្រីម​បណ្ដាញ កាážâ€‹áž…ាប់​យក និង​ទ្រង់ទ្រាយ​មáŸážŒáŸ€â€‹áž•áŸ’សáŸáž„ទៀáž!</p><p><a "
+"href=\"http://www.videolan.org/contribute/\"><span style=\" text-decoration: "
+"underline; color:#0057ae;\">ជួយ​គាំទ្រ និង​ចូលរួម​ជាមួយ​ពួក​យើង!</span></a>"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/about.m:273
msgid "VLC media player Help"
msgstr "ជំនួយ​កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "លិបិក្រម"
@@@ -15973,30 -15876,30 +17407,52 @@@ msgstr "បែបផែន​អូឌá
#: modules/gui/macosx/AudioEffects.m:202 modules/gui/macosx/VideoEffects.m:231
msgid "Duplicate current profile..."
++<<<<<<< HEAD
+msgstr "ស្ទួន​ប្រវážáŸ’ážáž·ážšáž¼áž”​បច្ចុប្បន្ន..."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:207
#: modules/gui/macosx/ConvertAndSave.m:1054
msgid "Organize Profiles..."
++<<<<<<< HEAD
+msgstr "រៀបចំ​ប្រវážáŸ’ážáž·ážšáž¼áž”..."
+
+#: modules/gui/macosx/AudioEffects.m:385 modules/gui/macosx/VideoEffects.m:877
+msgid "Duplicate current profile for a new profile"
+msgstr "ស្ទួន​ប្រវážáŸ’ážáž·ážšáž¼áž”​បច្ចុប្បន្ន​សម្រាប់​ប្រវážáŸ’ážáž·ážšáž¼áž”​ážáŸ’មី"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/AudioEffects.m:385 modules/gui/macosx/VideoEffects.m:877
+ msgid "Duplicate current profile for a new profile"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:386
#: modules/gui/macosx/ConvertAndSave.m:367
#: modules/gui/macosx/VideoEffects.m:878
msgid "Enter a name for the new profile:"
++<<<<<<< HEAD
+msgstr "បញ្ចូល​ឈ្មោះ​សម្រាប់​ប្រវážáŸ’ážáž·ážšáž¼áž”​ážáŸ’មី៖"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:388 modules/gui/macosx/AudioEffects.m:642
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "រក្សាទុក"
@@@ -16004,12 -15907,12 +17460,20 @@@
#: modules/gui/macosx/AudioEffects.m:399 modules/gui/macosx/AudioEffects.m:738
#: modules/gui/macosx/VideoEffects.m:940
msgid "Remove a preset"
++<<<<<<< HEAD
+msgstr "លុប​ការ​កំណážáŸ‹â€‹ážŸáŸ’ážšáŸáž…​ចáŸáž‰"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:400 modules/gui/macosx/AudioEffects.m:739
#: modules/gui/macosx/VideoEffects.m:941
msgid "Select the preset you would like to remove:"
++<<<<<<< HEAD
+msgstr "ជ្រើស​ការ​កំណážáŸ‹â€‹ážŸáŸ’ážšáŸáž…​ដែល​អ្នក​ចង់​លុបចáŸáž‰áŸ–"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:401 modules/gui/macosx/AudioEffects.m:740
#: modules/gui/macosx/bookmarks.m:95 modules/gui/macosx/ConvertAndSave.m:381
@@@ -16019,27 -15922,27 +17483,51 @@@ msgstr "យកចáŸáž‰
#: modules/gui/macosx/AudioEffects.m:461
msgid "Add new Preset..."
++<<<<<<< HEAD
+msgstr "បន្ážáŸ‚ម​ការ​កំណážáŸ‹â€‹ážŸáŸ’ážšáŸáž…​ážáŸ’មី..."
+
+#: modules/gui/macosx/AudioEffects.m:466
+msgid "Organize Presets..."
+msgstr "រៀបចំ​ការ​កំណážáŸ‹â€‹ážŸáŸ’ážšáŸáž…..."
+
+#: modules/gui/macosx/AudioEffects.m:639
+msgid "Save current selection as new preset"
+msgstr "រក្សាទុក​ជម្រើស​បច្ចុប្បន្ន​ជា​ការ​កំណážáŸ‹â€‹ážŸáŸ’ážšáŸáž…​​ážáŸ’មី"
+
+#: modules/gui/macosx/AudioEffects.m:640
+msgid "Enter a name for the new preset:"
+msgstr "បញ្ចូល​ឈ្មោះ​សម្រាប់​ការ​កំណážáŸ‹â€‹ážŸáŸ’ážšáŸáž…​ážáŸ’មី៖"
+
+#: modules/gui/macosx/AudioEffects.m:705 modules/gui/macosx/VideoEffects.m:903
+msgid "Please enter a unique name for the new profile."
+msgstr "សូម​បញ្ចូល​ឈ្មោះ​ážáŸ‚មួយ​សម្រាប់​ការ​កំណážáŸ‹â€‹ážŸáŸ’ážšáŸáž…​ážáŸ’មី។"
+
+#: modules/gui/macosx/AudioEffects.m:706 modules/gui/macosx/VideoEffects.m:904
+msgid "Multiple profiles with the same name are not allowed."
+msgstr "មិន​អនុញ្ញាážâ€‹áž”្រវážáŸ’ážáž·ážšáž¼áž”​ច្រើន​ដែល​មាន​ឈ្មោះ​ដូចគ្នា​ទáŸáŸ”"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/AudioEffects.m:466
+ msgid "Organize Presets..."
+ msgstr ""
+
+ #: modules/gui/macosx/AudioEffects.m:639
+ msgid "Save current selection as new preset"
+ msgstr ""
+
+ #: modules/gui/macosx/AudioEffects.m:640
+ msgid "Enter a name for the new preset:"
+ msgstr ""
+
+ #: modules/gui/macosx/AudioEffects.m:705 modules/gui/macosx/VideoEffects.m:903
+ msgid "Please enter a unique name for the new profile."
+ msgstr ""
+
+ #: modules/gui/macosx/AudioEffects.m:706 modules/gui/macosx/VideoEffects.m:904
+ msgid "Multiple profiles with the same name are not allowed."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/bookmarks.m:90
msgid "Bookmarks"
@@@ -16137,7 -16040,7 +17625,11 @@@ msgstr "រក​មិន​ឃើញâ
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "ស្ទ្រីម​ážáŸ’រូវážáŸ‚​បាន​ចាក់ ឬ​ផ្អាក​ទើប​អាច​ចំណាំ​បាន ។"
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "ទៅកាន់​ពáŸáž›ážœáŸáž›áž¶"
@@@ -16151,33 -16054,33 +17643,57 @@@ msgstr "ទៅកាន់​ពáŸáž›á
#: modules/gui/macosx/ControlsBar.m:53 modules/gui/macosx/fspanel.m:418
msgid "Click to play or pause the current media."
++<<<<<<< HEAD
+msgstr "ចុច​ដើម្បី​ចាក់ ឬ​ផ្អាក​មáŸážŒáŸ€â€‹áž”ច្ចុប្បន្ន។"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ControlsBar.m:56 modules/gui/macosx/fspanel.m:417
msgid "Backward"
msgstr "ážáž™áž€áŸ’រោយ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
+msgid ""
+"Click to go to the previous playlist item. Hold to skip backward through the "
+"current media."
+msgstr "ចុច​ដើម្បី​ទៅកាន់​ធាážáž»â€‹áž”ញ្ជី​ចាក់​មុន។ សង្កážáŸ‹â€‹ážŠáž¾áž˜áŸ’បី​រំលង​ážáž™áž€áŸ’រោយ​ážáž¶áž˜â€‹áž˜áŸážŒáŸ€â€‹áž”ច្ចុប្បន្ន។"
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
+ msgid ""
+ "Click to go to the previous playlist item. Hold to skip backward through the "
+ "current media."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ControlsBar.m:60 modules/gui/macosx/fspanel.m:419
msgid "Forward"
msgstr "ទៅ​មុáž"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
+msgid ""
+"Click to go to the next playlist item. Hold to skip forward through the "
+"current media."
+msgstr "ចុច​ដើម្បី​ទៅកាន់​ធាážáž»â€‹áž”ញ្ជី​ចាក់​បន្ទាប់។ សង្កážáŸ‹â€‹ážŠáž¾áž˜áŸ’បី​រំលង​ទៅមុážâ€‹ážáž¶áž˜â€‹áž˜áŸážŒáŸ€â€‹áž”ច្ចុប្បន្ន។"
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
+ msgid ""
+ "Click to go to the next playlist item. Hold to skip forward through the "
+ "current media."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ControlsBar.m:65 modules/gui/macosx/fspanel.m:445
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change current playback position."
++<<<<<<< HEAD
+msgstr "ចុច និង​ផ្លាស់ទី​កណ្ដុរ​ដោយ​សង្កážáŸ‹â€‹áž”៊ូážáž»áž„​ឲ្យ​ជាប់​ដើម្បី​ប្រើ​គ្រាប់​រំកិល​នáŸáŸ‡â€‹áž”្ដូរ​ទីážáž¶áŸ†áž„​ការ​ចាក់​បច្ចុប្បន្ន។"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ControlsBar.m:68 modules/gui/macosx/fspanel.m:421
msgid "Toggle Fullscreen mode"
@@@ -16185,96 -16088,93 +17701,182 @@@ msgstr "បិទ/បើក​របៀ
#: modules/gui/macosx/ControlsBar.m:69
msgid "Click to enable fullscreen video playback."
++<<<<<<< HEAD
+msgstr "ចុច​ដើម្បី​បើក​ការ​ចាក់​វីដáŸáž¢áž¼â€‹áž–áŸáž‰â€‹áž¢áŸáž€áŸ’រង់។"
+
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "ចុច រួច​សង្កážáŸ‹â€‹ážŠáž¾áž˜áŸ’បី​​រំលង​ážáž™áž€áŸ’រោយ​កាážáŸ‹ážáž¶áž˜â€‹áž˜áŸážŒáŸ€â€‹áž”ច្ចុប្បន្ន។"
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "ចុច រួច​សង្កážáŸ‹â€‹ážŠáž¾áž˜áŸ’បី​​រំលង​ទៅមុážâ€‹áž€áž¶ážáŸ‹ážáž¶áž˜â€‹áž˜áŸážŒáŸ€â€‹áž”ច្ចុប្បន្ន។"
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "ចុច​ដើម្បី​បញ្ឈប់​ការ​ចាក់។"
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "បង្ហាញ/លាក់​បញ្ជី​ចាក់"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "បង្ហាញ/លាក់​បញ្ជី​ចាក់"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+"ចុច​ដើម្បី​ប្ដូរ​រវាង​ការ​បង្ហាញ​វីដáŸáž¢áž¼ និង​បញ្ជី​ចាក់។ ប្រសិនបើ​គ្មាន​វីដáŸáž¢áž¼â€‹ážáŸ’រូវ​បង្ហាញ​នៅ​ក្នុង​បង្អួច​មáŸâ€‹áž‘០វា​នឹង​"
+"អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​លាក់​បញ្ជី​ចាក់។"
+
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "ចាក់​ឡើងវិញ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+"ចុច​ដើម្បី​ប្ដូរ​របៀប​ធ្វើ​ឡើងវិញ។ មាន​បី​ជម្រើស​គឺ៖ ធ្វើ​ឡើងវិញ​មួយ ធ្វើ​ឡើងវិញ​ទាំងអស់ និង​កុំ​ធ្វើ​ឡើងវិញ។"
+
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "ចៃដន្យ"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "ចុច​ដើម្បី​បើក ឬ​បិទ​ការ​ចាក់​ចៃដន្យ។"
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
+msgid ""
+"Click and move the mouse while keeping the button pressed to use this slider "
+"to change the volume."
+msgstr "ចុច និង​ផ្លាស់ទី​កណ្ដុរ​ដោយ​សង្កážáŸ‹â€‹áž”៊ូážáž»áž„​ឲ្យ​ជាប់​ដើម្បី​ប្រើ​គ្រាប់​រំកិល​ប្ដូរ​កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„។"
+
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "ចុច​ដើម្បី​បិទ/បើក​សំឡáŸáž„។"
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„​ពáŸáž‰"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "ចុច​ដើម្បី​ចាក់​សំឡáŸáž„​នៅ​កម្រិážâ€‹áž¢ážáž·áž”រមា។"
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "ចៃដន្យ"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
+ msgid ""
+ "Click and move the mouse while keeping the button pressed to use this slider "
+ "to change the volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„​ពáŸáž‰"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "បែបផែន"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
+msgid ""
+"Click to show an Audio Effects panel featuring an equalizer and further "
+"filters."
+msgstr "ចុច​ដើម្បី​បង្ហាញ​បែបផែន​អូឌីយ៉ូ លក្ážážŽáŸˆâ€‹áž•áŸ’ទាំង​អáŸáž ្គុយ និង​ážáž˜áŸ’រង​ផ្សáŸáž„ទៀážáŸ”"
+
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "ចុច​ដើម្បី​ទៅកាន់​ធាážáž»â€‹áž”ញ្ជី​ចាក់​មុន។"
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "ចុច​ដើម្បី​ទៅកាន់​ធាážáž»â€‹áž”ញ្ជី​ចាក់​បន្ទាប់។"
+
+#: modules/gui/macosx/ConvertAndSave.m:152
+msgid "Convert & Stream"
+msgstr "បម្លែង និង​ស្ទ្រីម"
+
+#: modules/gui/macosx/ConvertAndSave.m:153
+msgid "Go!"
+msgstr "ចាប់ផ្ដើម!"
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
+ msgid ""
+ "Click to show an Audio Effects panel featuring an equalizer and further "
+ "filters."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:152
+ msgid "Convert & Stream"
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:153
+ msgid "Go!"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:154 modules/gui/macosx/MainWindow.m:173
msgid "Drop media here"
@@@ -16286,24 -16186,24 +17888,44 @@@ msgstr "បើក​មáŸážŒáŸ€...
#: modules/gui/macosx/ConvertAndSave.m:156
msgid "Choose Profile"
++<<<<<<< HEAD
+msgstr "ជ្រើស​ប្រវážáŸ’ážáž·ážšáž¼áž”"
+
+#: modules/gui/macosx/ConvertAndSave.m:157
+msgid "Customize..."
+msgstr "ប្ដូរ​ážáž¶áž˜â€‹ážáž˜áŸ’រូវការ..."
+
+#: modules/gui/macosx/ConvertAndSave.m:158
+msgid "Choose Destination"
+msgstr "ជ្រើស​ទិសដៅ"
+
+#: modules/gui/macosx/ConvertAndSave.m:159
+msgid "Choose an output location"
+msgstr "ជ្រើស​ទីážáž¶áŸ†áž„​បង្ហាញ"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:157
+ msgid "Customize..."
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:158
+ msgid "Choose Destination"
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:159
+ msgid "Choose an output location"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16315,11 -16215,11 +17937,19 @@@ msgstr "រក​មើល...
#: modules/gui/macosx/ConvertAndSave.m:162
msgid "Setup Streaming..."
++<<<<<<< HEAD
+msgstr "កំពុង​រៀបចំ​ស្ទ្រីម..."
+
+#: modules/gui/macosx/ConvertAndSave.m:164
+msgid "Save as File"
+msgstr "រក្សាទុក​ជា​ឯកសារ"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:164
+ msgid "Save as File"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:165
#: modules/gui/macosx/ConvertAndSave.m:416 modules/gui/macosx/output.m:134
@@@ -16330,11 -16230,11 +17960,19 @@@ msgstr "ស្ទ្រីម
#: modules/gui/macosx/ConvertAndSave.m:167
#: modules/gui/macosx/ConvertAndSave.m:193
msgid "Apply"
++<<<<<<< HEAD
+msgstr "អនុវážáŸ’áž"
+
+#: modules/gui/macosx/ConvertAndSave.m:169
+msgid "Save as new Profile..."
+msgstr "រក្សាទុក​ជា​ប្រវážáŸ’ážáž·ážšáž¼áž”​ážáŸ’មី..."
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:169
+ msgid "Save as new Profile..."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:170 modules/gui/qt4/ui/profiles.h:708
msgid "Encapsulation"
@@@ -16383,11 -16283,11 +18021,19 @@@ msgstr "ážáž˜áŸ’ážšáž½ážâ€‹áž…ំណá
#: modules/gui/macosx/ConvertAndSave.m:195
msgid "Stream Destination"
++<<<<<<< HEAD
+msgstr "ទិសដៅ​ស្ទ្រីម"
+
+#: modules/gui/macosx/ConvertAndSave.m:196
+msgid "Stream Announcement"
+msgstr "ការប្រកាស​ស្ទ្រីម"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:196
+ msgid "Stream Announcement"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:198 modules/gui/macosx/open.m:195
#: modules/gui/macosx/output.m:137
@@@ -16400,7 -16300,7 +18046,11 @@@ msgstr "អាសយដ្ឋាន
#: modules/gui/macosx/ConvertAndSave.m:199
msgid "TTL"
++<<<<<<< HEAD
+msgstr "TTL"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:202 modules/gui/macosx/open.m:183
#: modules/gui/macosx/open.m:185 modules/gui/macosx/output.m:138
@@@ -16419,17 -16319,17 +18069,29 @@@ msgstr "ច្រក
#: modules/gui/macosx/wizard.m:400 modules/gui/macosx/wizard.m:432
#: modules/gui/macosx/wizard.m:1798
msgid "SAP Announcement"
++<<<<<<< HEAD
+msgstr "ការប្រកាស SAP"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:205 modules/gui/macosx/output.m:174
#: modules/gui/macosx/output.m:550
msgid "HTTP Announcement"
++<<<<<<< HEAD
+msgstr "ការប្រកាស HTTP"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:206 modules/gui/macosx/output.m:173
#: modules/gui/macosx/output.m:546
msgid "RTSP Announcement"
++<<<<<<< HEAD
+msgstr "ការប្រកាស RTSP"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:207 modules/gui/macosx/output.m:175
#: modules/gui/macosx/output.m:554
@@@ -16438,59 -16338,58 +18100,110 @@@ msgstr "នាំចáŸáž‰ SDP ជាâ€
#: modules/gui/macosx/ConvertAndSave.m:284
msgid "Invalid container format for HTTP streaming"
++<<<<<<< HEAD
+msgstr "ទ្រង់ទ្រាយ​ឧបករណáŸâ€‹áž•áŸ’ទុក​មិន​ážáŸ’រឹមážáŸ’រូវ​សម្រាប់​ការ​ស្ទ្រីម HTTP"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:286
msgid ""
"Media encapsulated as %@ cannot be streamed through the HTTP protocol for "
"technical reasons."
msgstr ""
++<<<<<<< HEAD
+"មáŸážŒáŸ€â€‹ážŠáŸ‚ល​បាន​វáŸáž…​ážáŸ’ចប់​ជា %@ មិន​អាច​ážáŸ’រូវ​បាន​ស្ទ្រីម​ážáž¶áž˜â€‹áž–ិធីការ HTTP បាន​ទ០ដោយសារ​កំហុស​បច្ចáŸáž€áž‘áŸážŸáŸ”"
+
+#: modules/gui/macosx/ConvertAndSave.m:366
+msgid "Save as new profile"
+msgstr "រក្សាទុក​ជា​ប្រវážáŸ’ážáž·ážšáž¼áž”​ážáŸ’មី..."
+
+#: modules/gui/macosx/ConvertAndSave.m:379
+msgid "Remove a profile"
+msgstr "លុប​ប្រវážáŸ’ážáž·ážšáž¼áž”​ចáŸáž‰"
+
+#: modules/gui/macosx/ConvertAndSave.m:380
+msgid "Select the profile you would like to remove:"
+msgstr "ជ្រើស​ប្រវážáŸ’ážáž·ážšáž¼áž”​ដែល​អ្នក​ចង់​លុបចáŸáž‰áŸ–"
+
+#: modules/gui/macosx/ConvertAndSave.m:468
+msgid "%@ stream to %@:%@"
+msgstr "%@ ស្ទ្រីម​​ទៅកាន់ %@:%@"
+
+#: modules/gui/macosx/ConvertAndSave.m:478
+msgid "No Address given"
+msgstr "មិន​បាន​ផ្ដល់​អាសយដ្ឋាន"
+
+#: modules/gui/macosx/ConvertAndSave.m:480
+msgid "In order to stream, a valid destination address is required."
+msgstr "ដើម្បី​ស្ទ្រីម​បាន ចាំបាច់​ážáŸ’រូវ​មាន​អាសយដ្ឋាន​ទិសដៅ​ážáŸ’រឹមážáŸ’រូវ។"
+
+#: modules/gui/macosx/ConvertAndSave.m:485
+msgid "No Channel Name given"
+msgstr "មិន​បាន​ផ្ដល់​ឈ្មោះ​ឆានែល"
++=======
+
+ #: modules/gui/macosx/ConvertAndSave.m:366
+ msgid "Save as new profile"
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:379
+ msgid "Remove a profile"
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:380
+ msgid "Select the profile you would like to remove:"
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:468
+ msgid "%@ stream to %@:%@"
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:478
+ msgid "No Address given"
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:480
+ msgid "In order to stream, a valid destination address is required."
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:485
+ msgid "No Channel Name given"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:487
msgid ""
"SAP stream announcement is enabled. However, no channel name is provided."
++<<<<<<< HEAD
+msgstr "ការ​ប្រកាស​ស្ទ្រីម SAP ážáŸ’រូវ​បាន​បិទ។ ទោះ​យ៉ាងណា​មិន​មាន​ឈ្មោះ​ឆានែល​បាន​ផ្ដល់​ដែរ។"
+
+#: modules/gui/macosx/ConvertAndSave.m:492
+msgid "No SDP URL given"
+msgstr "មិន​បាន​ផ្ដល់ SDP URL"
+
+#: modules/gui/macosx/ConvertAndSave.m:494
+msgid "A SDP export is requested, but no URL is provided."
+msgstr "បាន​ស្នើ​ការ​នាំចáŸáž‰ SDP ប់ូន្ážáŸ‚​មិន​បាន​ផ្ដល់ URL ។"
+
+#: modules/gui/macosx/ConvertAndSave.m:1052
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:492
+ msgid "No SDP URL given"
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:494
+ msgid "A SDP export is requested, but no URL is provided."
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:1052
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "ážáž¶áž˜â€‹ážáž˜áŸ’រូវការ"
@@@ -16532,7 -16431,7 +18245,11 @@@ msgstr "(ពុំមាន​ធាáž
#: modules/gui/macosx/fspanel.m:421
msgid "Click to exit fullscreen playback."
++<<<<<<< HEAD
+msgstr "ចុច​ដើម្បី​ចáŸáž‰áž–ី​​ការ​ចាក់​ពáŸáž‰â€‹áž¢áŸáž€áŸ’រង់។"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/intf.m:842 modules/gui/qt4/dialogs/messages.cpp:77
#: modules/gui/qt4/ui/messages_panel.h:138
@@@ -16587,41 -16486,41 +18304,78 @@@ msgstr "
#: modules/gui/macosx/intf.m:854
msgid "Don't ask again"
++<<<<<<< HEAD
+msgstr "កុំ​សួរ​ម្ដងទៀáž"
+
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "រក​មិន​ឃើញ​កំណážáŸ‹áž áŸážáž»â€‹áž€áž¶ážšâ€‹áž‚ាំង​ទáŸ"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "រក​មិន​ឃើញ​កំណážáŸ‹áž áŸážáž»â€‹áž€áž¶ážšâ€‹áž‚ាំង​ទáŸ"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "បន្áž"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "មិន​អាច​រក​ឃើញ​ដាន​នៃ​ការ​គាំង​ពី​មុន​ទ០។"
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "យក​ចំណូលចិážáŸ’ážâ€‹áž…ាស់​ចáŸáž‰â€‹áž¬ ?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "យើង​ទើបážáŸ‚​រក​ឃើញ​កំណែ​ចាស់​របស់​ឯកសារ​ចំណូលចិážáŸ’áž VLC ។"
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "ផ្លាស់ទី​ទៅ​ធុង​សំរាម រួច​ចាប់ផ្ដើម VLC ឡើងវិញ"
+
+#: modules/gui/macosx/intf.m:2065
+#, c-format
+msgid "VLC Debug Log (%s).rtf"
+msgstr "កំណážáŸ‹â€‹áž áŸážáž»â€‹áž”ំបាážáŸ‹â€‹áž€áŸ†áž ុស VLC (%s).rtf"
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "មិន​អាច​រក​ឃើញ​ដាន​នៃ​ការ​គាំង​ពី​មុន​ទ០។"
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "យក​ចំណូលចិážáŸ’ážâ€‹áž…ាស់​ចáŸáž‰â€‹áž¬ ?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "យើង​ទើបážáŸ‚​រក​ឃើញ​កំណែ​ចាស់​របស់​ឯកសារ​ចំណូលចិážáŸ’áž VLC ។"
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "ផ្លាស់ទី​ទៅ​ធុង​សំរាម រួច​ចាប់ផ្ដើម VLC ឡើងវិញ"
+
+ #: modules/gui/macosx/intf.m:2049
+ #, c-format
+ msgid "VLC Debug Log (%s).rtf"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:53
msgid "Video device"
@@@ -16690,27 -16589,23 +18444,41 @@@ msgstr "ážáž¶áž˜â€‹áž›áŸ†áž“ាំដá
#: modules/gui/macosx/macosx.m:81 modules/gui/macosx/simple_prefs.m:365
msgid "Control system volume with the Apple Remote"
++<<<<<<< HEAD
+msgstr "គ្រប់គ្រង​កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„​ប្រពáŸáž“្ធ​ដោយ​ប្រើ​ឧបករណáŸâ€‹áž”ញ្ជា​ពី​ចម្ងាយ​របស់ Apple"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:82
msgid ""
"By default, VLC will control its own volume with the Apple Remote. However, "
"you can choose to control the global system volume instead."
msgstr ""
++<<<<<<< HEAD
+"ážáž¶áž˜â€‹áž›áŸ†áž“ាំដើម VLC នឹង​គ្រប់គ្រង​កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„​ផ្ទាល់ážáŸ’លួន​របស់​វា​ដោយ​ប្រើ​ឧបករណáŸâ€‹áž”ញ្ជា​ពី​ចម្ងាយ​របស់ Apple ។ "
+"ទោះ​យ៉ាងណា​អ្នក​កáŸâ€‹áž¢áž¶áž…​ជ្រើស​ដើម្បី​គ្រប់គ្រង​កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„​ប្រពáŸáž“្ធ​សាកល​ជំនួស​បាន​ដែរ។"
+
+#: modules/gui/macosx/macosx.m:84
+msgid "Control playlist items with the Apple Remote"
+msgstr "គ្រប់គ្រង​ធាážáž»â€‹áž”ញ្ជី​ចាក់​ដោយ​ប្រើ​វážáŸ’ážáž»â€‹áž”ញ្ជា​ពី​ចម្ងាយ​របស់ Apple"
++=======
+
+ #: modules/gui/macosx/macosx.m:84
+ msgid "Control playlist items with the Apple Remote"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:85
msgid ""
"By default, VLC will allow you to switch to the next or previous item with "
"the Apple Remote. You can disable this behavior with this option."
msgstr ""
++<<<<<<< HEAD
+"ážáž¶áž˜â€‹áž›áŸ†áž“ាំដើម VLC អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​ប្ដូរ​ទៅ​ធាážáž»â€‹áž˜áž»áž“ ឬ​ធាážáž»â€‹áž”ន្ទាប់​បាន​ដោយ​ប្រើ​ឧបករណáŸâ€‹áž”ញ្ជា​ពី​ចម្ងាយ​របស់ "
+"Apple ។ អ្នក​អាច​មិន​លក្ážážŽáŸˆâ€‹áž“áŸáŸ‡â€‹áž‡áž¶áž˜áž½áž½â€‹áž‡áž˜áŸ’រើស​ážáž¶áž„ក្រោម។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:87 modules/gui/macosx/simple_prefs.m:366
msgid "Control playback with media keys"
@@@ -16724,19 -16619,17 +18492,30 @@@ msgstr "ážáž¶áž˜â€‹áž›áŸ†áž“ាំដá
#: modules/gui/macosx/macosx.m:91
msgid "Run VLC with dark interface style"
++<<<<<<< HEAD
+msgstr "ដំណើរការ VLC ជាមួយ​រចនាបáŸáž‘្ម​ចំណុចប្រទាក់​ងងឹáž"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:92
msgid ""
"If this option is enabled, VLC will use the dark interface style. Otherwise, "
"the grey interface style is used."
msgstr ""
++<<<<<<< HEAD
+"បើ​បាន​បើក​ជម្រើស​នáŸáŸ‡ VLC នឹង​ប្រើ​រចនាបáŸáž‘្ម​ចំណុចប្រទាក់​ងងឹážáŸ” បើមិនដូច្នោះទ០រចនាបáŸáž‘្ម​ចំណុចប្រទាក់​"
+"ប្រផáŸáŸ‡â€‹áž“ឹង​ážáŸ’រូវ​បាន​ប្រើ។"
+
+#: modules/gui/macosx/macosx.m:94 modules/gui/macosx/simple_prefs.m:361
+msgid "Use the native fullscreen mode"
+msgstr "ប្រើ​របៀប​ពáŸáž‰â€‹áž¢áŸáž€áŸ’រង់​ដើម"
++=======
+
+ #: modules/gui/macosx/macosx.m:94 modules/gui/macosx/simple_prefs.m:361
+ msgid "Use the native fullscreen mode"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:95
msgid ""
@@@ -16784,69 -16677,67 +18563,128 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr "ជម្រើស​នáŸáŸ‡â€‹â€‹áž¢áž“ុញ្ញាážâ€‹áž²áŸ’យ​​ចំណុចប្រទាក់​ផ្លាស់ប្ដូរ​រូបážáŸ†ážŽáž¶áž„​របស់​វា​​ážáž¶áž˜â€‹áž–áŸáž›â€‹ážœáŸáž›áž¶ ។"
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "ចាក់សោ​សមាមាážáŸ’ážš"
#: modules/gui/macosx/macosx.m:112 modules/gui/macosx/MainMenu.m:338
msgid "Show Previous & Next Buttons"
++<<<<<<< HEAD
+msgstr "បង្ហាញ​ប៊ូážáž»áž„​មុន និង​បន្ទាប់"
+
+#: modules/gui/macosx/macosx.m:113
+msgid "Shows the previous and next buttons in the main window."
+msgstr "បង្ហាញ​ប៊ូážáž»áž„​មុន និង​បន្ទាប់​នៅ​ក្នុង​បង្អួច​មáŸáŸ”"
+
+#: modules/gui/macosx/macosx.m:115 modules/gui/macosx/MainMenu.m:340
+msgid "Show Shuffle & Repeat Buttons"
+msgstr "បង្ហាញ​ប៊ូážáž»áž„​ចៃដន្យ និង​ប៊ូážáž»áž„​ចាក់​ឡើងវិញ"
+
+#: modules/gui/macosx/macosx.m:116
+msgid "Shows the shuffle and repeat buttons in the main window."
+msgstr "បង្ហាញ​ប៊ូážáž»áž„​ចៃដន្យ និង​ប៊ូážáž»áž„​ចាក់​ឡើងវិញ​នៅ​ក្នុង​បង្អួច​មáŸáŸ”"
+
+#: modules/gui/macosx/macosx.m:118 modules/gui/macosx/MainMenu.m:342
+msgid "Show Audio Effects Button"
+msgstr "បង្ហាញ​ប៊ូážáž»áž„​បែបផែន​អូឌីយ៉ូ"
+
+#: modules/gui/macosx/macosx.m:119
+msgid "Shows the audio effects button in the main window."
+msgstr "បង្ហាញ​ប៊ូážáž»áž„​បែបផែន​អូឌីយ៉ូ​នៅ​ក្នុង​បង្អួច​មáŸáŸ”"
+
+#: modules/gui/macosx/macosx.m:121 modules/gui/macosx/MainMenu.m:344
+msgid "Show Sidebar"
+msgstr "បង្ហាញ​របារ​ចំហៀង"
+
+#: modules/gui/macosx/macosx.m:122
+msgid "Shows a sidebar in the main window listing media sources."
+msgstr "បង្ហាញ​របារ​ចំហៀង​នៅ​ក្នុង​បង្អួច​មáŸâ€‹áž›áž¶áž™â€‹áž‡áž¶áž˜áž½áž™â€‹áž”្រភព​មáŸážŒáŸ€áŸ”"
+
+#: modules/gui/macosx/macosx.m:124
+msgid "Pause iTunes during VLC playback"
+msgstr "ផ្អាក iTunes áž–áŸáž›â€‹áž…ាក់ VLC"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:113
+ msgid "Shows the previous and next buttons in the main window."
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:115 modules/gui/macosx/MainMenu.m:340
+ msgid "Show Shuffle & Repeat Buttons"
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:116
+ msgid "Shows the shuffle and repeat buttons in the main window."
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:118 modules/gui/macosx/MainMenu.m:342
+ msgid "Show Audio Effects Button"
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:119
+ msgid "Shows the audio effects button in the main window."
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:121 modules/gui/macosx/MainMenu.m:344
+ msgid "Show Sidebar"
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:122
+ msgid "Shows a sidebar in the main window listing media sources."
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:124
+ msgid "Pause iTunes during VLC playback"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:125
msgid ""
"Pauses iTunes playback when VLC playback starts. If selected, iTunes "
"playback will be resumed again if VLC playback is finished."
msgstr ""
++<<<<<<< HEAD
+"ផ្អាក​ការ​ចាក់ iTunes áž–áŸáž›â€‹áž…ាប់ផ្ដើម​ចាក់ VLC ។ បើ​បាន​ជ្រើស ការ​ចាក់ iTunes នឹង​ážáŸ’រូវ​បាន​ធ្វើ​បន្ážâ€‹"
+"ម្ដងទៀហពáŸáž›â€‹áž€áž¶ážšâ€‹áž…ាក់ VLC បាន​បញ្ចប់។"
+
+#: modules/gui/macosx/macosx.m:130
+msgid "Do nothing"
+msgstr "កុំ​ធ្វើ​អ្វី​ទាំងអស់"
+
+#: modules/gui/macosx/macosx.m:130
+msgid "Pause iTunes"
+msgstr "ផ្អាក iTunes"
+
+#: modules/gui/macosx/macosx.m:130
+msgid "Pause and resume iTunes"
+msgstr "ផ្អាក និង​ធ្វើ​បន្ហiTunes"
+
+#: modules/gui/macosx/macosx.m:133 modules/gui/qt4/qt4.cpp:178
+msgid "Maximum Volume displayed"
+msgstr "បាន​បង្ហាញ​កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„​អážáž·áž”រមា"
++=======
+
+ #: modules/gui/macosx/macosx.m:130
+ msgid "Do nothing"
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:130
+ msgid "Pause iTunes"
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:130
+ msgid "Pause and resume iTunes"
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:133 modules/gui/qt4/qt4.cpp:178
+ msgid "Maximum Volume displayed"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:137
msgid "Mac OS X interface"
@@@ -16854,23 -16745,23 +18692,43 @@@ msgstr "ចំណុច​ប្រទá
#: modules/gui/macosx/macosx.m:146
msgid "Appearance"
++<<<<<<< HEAD
+msgstr "រូបរាង"
+
+#: modules/gui/macosx/macosx.m:156
+msgid "Behavior"
+msgstr "ឥរិយាបáž"
+
+#: modules/gui/macosx/macosx.m:166
+msgid "Apple Remote and media keys"
+msgstr "ឧបករណáŸâ€‹áž”ញ្ជា​ពី​ចម្ងាយ​របស់ Apple និង​គ្រាប់ចុច​មáŸážŒáŸ€"
+
+#: modules/gui/macosx/macosx.m:181
+msgid "Video output"
+msgstr "លទ្ធផល​វីដáŸáž¢áž¼"
+
+#: modules/gui/macosx/MainMenu.m:68
+msgid "Track Number"
+msgstr "áž›áŸážâ€‹áž”áž‘"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:156
+ msgid "Behavior"
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:166
+ msgid "Apple Remote and media keys"
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:181
+ msgid "Video output"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:68
+ msgid "Track Number"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:70 modules/gui/macosx/playlist.m:165
#: modules/gui/macosx/wizard.m:347 modules/gui/qt4/dialogs/plugins.cpp:557
@@@ -16915,7 -16806,7 +18773,11 @@@ msgstr "លាក់ VLC
msgid "Hide Others"
msgstr "លាក់​ផ្សáŸáž„ទៀáž"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "បង្ហាញ​ទាំងអស់​"
@@@ -16957,7 -16848,7 +18819,11 @@@ msgstr "អ្នកជំនួយកá
#: modules/gui/macosx/MainMenu.m:328
msgid "Convert / Stream..."
++<<<<<<< HEAD
+msgstr "បម្លែង/ស្ទ្រីម..."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:331
msgid "Cut"
@@@ -16977,11 -16868,11 +18843,19 @@@ msgstr "ជ្រើស​ទាំងá
#: modules/gui/macosx/MainMenu.m:337
msgid "View"
++<<<<<<< HEAD
+msgstr "មើល"
+
+#: modules/gui/macosx/MainMenu.m:346 modules/gui/macosx/MainMenu.m:347
+msgid "Playlist Table Columns"
+msgstr "ជួរឈរ​ážáž¶ážšáž¶áž„​បញ្ជី​ចាក់"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:346 modules/gui/macosx/MainMenu.m:347
+ msgid "Playlist Table Columns"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:349
msgid "Playback"
@@@ -16998,17 -16889,17 +18872,31 @@@ msgstr "ការ​ធ្វើ​សá
#: modules/gui/macosx/MainMenu.m:365
msgid "A→B Loop"
++<<<<<<< HEAD
+msgstr "រង្វិល​ជុំ A→B"
+
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "បិទ​បន្ទាប់ពី​ចាក់​ឡើងវិញ"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "ទៅមុážâ€‹áž˜áž½áž™â€‹áž‡áŸ†áž ាន"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "បិទ​បន្ទាប់ពី​ចាក់​ឡើងវិញ"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "ទៅមុážâ€‹áž˜áž½áž™â€‹áž‡áŸ†áž ាន"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "ážáž™â€‹áž€áŸ’រោយ​មួយ​ជំហាន"
@@@ -17024,30 -16915,30 +18912,56 @@@ msgstr "បន្ážáž™â€‹áž€áž˜áŸ’ážšá
msgid "Audio Device"
msgstr "ឧបករណáŸâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "ទំហំ​ពាក់​កណ្ដាល"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "ទំហំ​ធម្មážáž¶"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "ទំហំ​ទ្វáŸ"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "សម​ទៅ​នឹង​អáŸáž€áŸ’រង់"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "ទំហំ​ពាក់​កណ្ដាល"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "ទំហំ​ធម្មážáž¶"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "ទំហំ​ទ្វáŸ"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "សម​ទៅ​នឹង​អáŸáž€áŸ’រង់"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "អណ្ដែážâ€‹áž“ៅលើ​កំពូល"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "ឧបករណáŸâ€‹ážœáž¸ážŠáŸáž¢áž¼â€‹áž–áŸáž‰â€‹áž¢áŸáž€áŸ’រង់"
@@@ -17056,9 -16947,9 +18970,15 @@@
msgid "Post processing"
msgstr "ការ​ដំណើរការ​ážáž¶áž˜â€‹áž€áŸ’រោយ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
+msgid "Add Subtitle File..."
+msgstr "បន្ážáŸ‚ម​ឯកសារ​ចំណងជើង​រង..."
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
+ msgid "Add Subtitle File..."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:415 modules/gui/macosx/MainMenu.m:416
msgid "Subtitles Track"
@@@ -17066,11 -16957,11 +18986,19 @@@ msgstr "បទ​ចំណងជើងâ
#: modules/gui/macosx/MainMenu.m:417
msgid "Text Size"
++<<<<<<< HEAD
+msgstr "ទំហំ​អážáŸ’ážáž”áž‘"
+
+#: modules/gui/macosx/MainMenu.m:418
+msgid "Text Color"
+msgstr "ពណ៌​អážáŸ’ážáž”áž‘"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:418
+ msgid "Text Color"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:419
msgid "Outline Thickness"
@@@ -17078,11 -16969,11 +19006,19 @@@ msgstr "គ្រោង​ក្រាá
#: modules/gui/macosx/MainMenu.m:421 modules/gui/macosx/MainMenu.m:422
msgid "Background Opacity"
++<<<<<<< HEAD
+msgstr "ភាព​ស្រអាប់​នៃ​ផ្ទៃážáž¶áž„ក្រោយ"
+
+#: modules/gui/macosx/MainMenu.m:423
+msgid "Background Color"
+msgstr "ពណ៌​ផ្ទៃážáž¶áž„ក្រោយ"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:423
+ msgid "Background Color"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:425
msgid "Transparent"
@@@ -17114,7 -17005,7 +19050,11 @@@ msgstr "បែបផែន​អូឌá
#: modules/gui/macosx/MainMenu.m:438
msgid "Video Effects..."
++<<<<<<< HEAD
+msgstr "បែបផែន​វីដáŸáž¢áž¼..."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:439
msgid "Bookmarks..."
@@@ -17172,15 -17063,13 +19112,22 @@@ msgstr "ážœáŸáž‘ិកា​លើ​á
#: modules/gui/macosx/MainWindow.m:169
msgid ""
"Enter a term to search the playlist. Results will be selected in the table."
++<<<<<<< HEAD
+msgstr "បញ្ចូល​ពាក្យ​ដើម្បី​ស្វែងរក​បញ្ជី​ចាក់។ លទ្ធផល​នឹង​ážáŸ’រូវ​បាន​ជ្រើស​នៅ​ក្នុង​ážáž¶ážšáž¶áž„។"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainWindow.m:172
msgid ""
"Click to open an advanced dialog to select the media to play. You can also "
"drop files here to play."
msgstr ""
++<<<<<<< HEAD
+"ចុច​បើក​ប្រអប់​ជម្រើស​កម្រិážâ€‹ážáŸ’ពស់​រួច​ជ្រើស​មáŸážŒáŸ€â€‹ážŠáž¾áž˜áŸ’បី​ចាក់។ អ្នក​កáŸâ€‹áž¢áž¶áž…​ទម្លាក់​ឯកសារ​នៅ​ទីនáŸáŸ‡â€‹ážŠáž¾áž˜áŸ’បី​ចាក់​បាន​ផង​"
+"ដែរ។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainWindow.m:175 modules/gui/macosx/MainWindow.m:180
#: modules/gui/qt4/components/playlist/selector.cpp:591
@@@ -17204,11 -17093,11 +19151,19 @@@ msgstr "បញ្ចូល URL ážšáž”áž
#: modules/gui/macosx/MainWindow.m:181
msgid "Unsubscribe from a podcast"
++<<<<<<< HEAD
+msgstr "ឈប់​ជាវ​ពី​ផážážáž¶ážŸáŸ‹"
+
+#: modules/gui/macosx/MainWindow.m:182
+msgid "Select the podcast you would like to unsubscribe from:"
+msgstr "ជ្រើស​ផážážáž¶ážŸáŸ‹â€‹ážŠáŸ‚ល​អ្នក​ចង់​ឈប់​ជាវ​ពី៖"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainWindow.m:182
+ msgid "Select the podcast you would like to unsubscribe from:"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainWindow.m:219
msgid "LIBRARY"
@@@ -17266,10 -17155,6 +19221,13 @@@ msgid "
"or 'Capture' for Input Devices such as microphones or cameras, the current "
"screen or TV streams if the EyeTV application is installed."
msgstr ""
++<<<<<<< HEAD
+"មាន ៤ ផ្ទាំង​ដើម្បី​ជ្រើស​រវាង​ការ​បញ្ចូល​មáŸážŒáŸ€áŸ” ផ្ទាំង 'ឯកសារ' សម្រាប់​ឯកសារ ផ្ទាំង 'ážáž¶ážŸ' សម្រាប់​"
+"មáŸážŒáŸ€â€‹áž¢áž»áž”ទិក​ដូចជា ឌីវីឌី ស៊ីឌី​អូឌីយ៉ូ ឬ BRs, ផ្ទាំង 'បណ្ដាញ' សម្រាប់​ការ​ស្ទ្រីម​បណ្ដាញ និង​ផ្ទាំង 'ចាប់​យក' "
+"សម្រាប់​ឧបករណáŸâ€‹áž”ញ្ចូល​ដូចជា មីក្រូហ្វូន ឬ​ម៉ាស៊ីន​ážáž អáŸáž€áŸ’រង់​បច្ចុប្បន្ន ឬ​ស្ទ្រីម TV ប្រសិនបើ​បាន​ដំឡើង​កម្មវិធី "
+"EyeTV ។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:134 modules/gui/macosx/open.m:494
#: modules/gui/macosx/open.m:599
@@@ -17282,7 -17167,7 +19240,11 @@@ msgstr "ជ្រើស​ឯកសាá
#: modules/gui/macosx/open.m:139
msgid "Click to select a file for playback"
++<<<<<<< HEAD
+msgstr "ចុច​ដើម្បី​ជ្រើស​ឯកសារ​សម្រាប់​ចាក់"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:140
msgid "Treat as a pipe rather than as a file"
@@@ -17293,7 -17178,7 +19255,11 @@@ msgid "Play another media synchronously
msgstr "ចាក់​មáŸážŒáŸ€â€‹áž•áŸ’សáŸáž„​ទៀážâ€‹ážŠáŸ†ážŽáž¶áž›â€‹áž‚្នា"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "ជ្រើស..."
@@@ -17302,11 -17187,11 +19268,19 @@@
msgid ""
"Click to select a another file to play it in sync with the previously "
"selected file."
++<<<<<<< HEAD
+msgstr "ចុច​ដើម្បី​ជ្រើស​ឯកសារ​​ផ្សáŸáž„​សម្រាប់​ចាក់​នៅ​ក្នុង​សមកាលម្ម​ជាមួយ​ឯកសារ​ដែល​បាន​ជ្រើស​ពី​មុន។"
+
+#: modules/gui/macosx/open.m:149
+msgid "Custom playback"
+msgstr "ប្ដូរ​ការ​ចាក់​ážáž¶áž˜â€‹ážáž˜áŸ’រូវការ"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/open.m:149
+ msgid "Custom playback"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:157
msgid "Open VIDEO_TS folder"
@@@ -17360,7 -17245,6 +19334,10 @@@ msgid "
"Enter a URL here to open the network stream. To open RTP or UDP streams, "
"click on the respective button below."
msgstr ""
++<<<<<<< HEAD
+"បញ្ចូល URL នៅ​ទីនáŸáŸ‡â€‹ážŠáž¾áž˜áŸ’បី​បើក​ការ​ស្ទ្រីម​បណ្ដាញ។ ដើម្បី​បើក​ស្ទ្រីម RTP ឬ UDP សូម​ចុច​ប៊ូážáž»áž„​ážáž¶áž„ក្រោម។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:192
msgid "Open RTP/UDP Stream"
@@@ -17385,7 -17269,7 +19362,11 @@@ msgstr "ម៉ាល់ធីážáž¶ážŸ
#: modules/gui/macosx/open.m:206 modules/gui/macosx/open.m:513
#: modules/gui/macosx/open.m:1396
msgid "Input Devices"
++<<<<<<< HEAD
+msgstr "ឧបករណáŸâ€‹áž”ញ្ចូល"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:209
msgid ""
@@@ -17395,15 -17279,15 +19376,27 @@@ msgstr "áž–áŸážáŸŒáž˜áž¶áž“​បញá
#: modules/gui/macosx/open.m:212
msgid "Subscreen left"
++<<<<<<< HEAD
+msgstr "អáŸáž€áŸ’រង់​រង​ážáž¶áž„ឆ្វáŸáž„"
+
+#: modules/gui/macosx/open.m:213
+msgid "Subscreen top"
+msgstr "អáŸáž€áŸ’រង់​រង​ážáž¶áž„​លើ"
+
+#: modules/gui/macosx/open.m:217
+msgid "Capture Audio"
+msgstr "ចាប់​យក​សំឡáŸáž„"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/open.m:213
+ msgid "Subscreen top"
+ msgstr ""
+
+ #: modules/gui/macosx/open.m:217
+ msgid "Capture Audio"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:218
msgid "Current channel:"
@@@ -17451,15 -17335,15 +19444,27 @@@ msgstr "កម្ពស់​រូបá
#: modules/gui/macosx/open.m:361
msgid "Add Subtitle File:"
++<<<<<<< HEAD
+msgstr "បន្ážáŸ‚ម​ឯកសារ​ចំណងជើង​រង៖"
+
+#: modules/gui/macosx/open.m:366
+msgid "Click to setup subtitle playback in full detail."
+msgstr "ចុច​ដើម្បី​រៀបចំ​ការ​ចាក់​ចំណងជើង​រង​ឲ្យ​លម្អិážâ€‹áž–áŸáž‰áž›áŸáž‰áŸ”"
+
+#: modules/gui/macosx/open.m:368
+msgid "Click to select a subtitle file."
+msgstr "ចុច​ដើម្បី​ជ្រើស​ឯកសារ​ចំណងជើង​រង។"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/open.m:366
+ msgid "Click to setup subtitle playback in full detail."
+ msgstr ""
+
+ #: modules/gui/macosx/open.m:368
+ msgid "Click to select a subtitle file."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:369
msgid "Override parameters"
@@@ -17471,20 -17355,20 +19476,34 @@@ msgstr "FPS
#: modules/gui/macosx/open.m:374
msgid "Subtitle encoding"
++<<<<<<< HEAD
+msgstr "ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž…ំណងជើង​រង"
+
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "ទំហំ​ពុម្ពអក្សរ"
#: modules/gui/macosx/open.m:378
msgid "Subtitle alignment"
++<<<<<<< HEAD
+msgstr "ការ​ážáž˜áŸ’រឹម​ចំណងជើង​រង"
+
+#: modules/gui/macosx/open.m:381
+msgid "Click to dismiss the subtitle setup dialog."
+msgstr "ចុច​ដើម្បី​បិទ​ប្រអប់​រៀបចំ​ចំណងជើង​រង។"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/open.m:381
+ msgid "Click to dismiss the subtitle setup dialog."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:382
msgid "Font Properties"
@@@ -17702,12 -17586,12 +19721,20 @@@ msgstr "កំហុស​ពáŸáž›â€‹á
msgid "VLC was unable to save the meta data."
msgstr "VLC មិន​អាច​រក្សាទុក​ទិន្ននáŸáž™â€‹áž˜áŸážáž¶â€‹áž”ានទáŸÂ ។"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "ចំណូល​ចិážáŸ’áž"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "កំណážáŸ‹â€‹áž¡áž¾áž„វិញ​ទាំងអស់"
@@@ -17749,11 -17633,11 +19776,19 @@@ msgstr "ការ​កំណážáŸ‹â€‹á
#: modules/gui/qt4/components/simple_preferences.cpp:226
#: modules/gui/qt4/components/simple_preferences.cpp:840
msgid "Subtitle & On Screen Display Settings"
++<<<<<<< HEAD
+msgstr "ការ​កំណážáŸ‹â€‹áž…ំណងជើង​រង និង​ការ​បង្ហាញ​លើ​អáŸáž€áŸ’រង់"
+
+#: modules/gui/macosx/simple_prefs.m:277
+msgid "Input & Codec Settings"
+msgstr "ការ​កំណážáŸ‹â€‹áž–áŸážáŸŒáž˜áž¶áž“​បញ្ចូល និង​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠ"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:277
+ msgid "Input & Codec Settings"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/simple_prefs.m:311
msgid "General Audio"
@@@ -17826,7 -17710,7 +19861,11 @@@ msgstr "កូដិក/ឧបករណ
#: modules/gui/macosx/simple_prefs.m:341
msgid "Hardware Acceleration"
++<<<<<<< HEAD
+msgstr "ការ​បង្កើន​ល្បឿន​ផ្នែក​រឹង"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/simple_prefs.m:342
msgid "Post-Processing Quality"
@@@ -17834,15 -17718,15 +19873,27 @@@ msgstr "គុណភាព​ដំណá
#: modules/gui/macosx/simple_prefs.m:346
msgid "Edit default application settings for network protocols"
++<<<<<<< HEAD
+msgstr "កែសម្រួល​ការ​កំណážáŸ‹â€‹áž€áž˜áŸ’មវិធី​លំនាំដើម​សម្រាប់​ពិធីការ​បណ្ដាញ"
+
+#: modules/gui/macosx/simple_prefs.m:349
+msgid "Open network streams using the following protocols"
+msgstr "បើក​ការ​ស្ទ្រីក​បណ្ដាញ​ដោយ​ប្រើ​ពិធិការ​ដូចážáž¶áž„ក្រោម"
+
+#: modules/gui/macosx/simple_prefs.m:350
+msgid "Note that these are system-wide settings."
+msgstr "ចងចាំ​ážáž¶â€‹áž‘ាំងនáŸáŸ‡â€‹áž‡áž¶â€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹â€‹áž”្រពáŸáž“្ធ​ទាំងមូល។"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:349
+ msgid "Open network streams using the following protocols"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:350
+ msgid "Note that these are system-wide settings."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/simple_prefs.m:356
msgid "Interface style"
@@@ -17886,130 -17770,125 +19937,239 @@@ msgstr "បើក​​ការ​ជá
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "ផ្អាក iTunes áž–áŸáž›â€‹áž…ាក់ VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "ការ​អ៊ិនកូដ​លំនាំដើម"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "កំណážáŸ‹â€‹áž€áž¶ážšâ€‹áž”ង្ហាញ"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "ការ​អ៊ិនកូដ​លំនាំដើម"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "កំណážáŸ‹â€‹áž€áž¶ážšâ€‹áž”ង្ហាញ"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "ពណ៌​ពុម្ពអក្សរ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "ពុម្ពអក្សរ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "ភាសា​ចំណងជើង​រង"
+
+#: modules/gui/macosx/simple_prefs.m:384
+#: modules/gui/qt4/ui/sprefs_subtitles.h:292
+msgid "Preferred subtitle language"
+msgstr "ភាសា​ចំណងជើង​រង​ដែល​ចូលចិážáŸ’áž"
+
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "បើក OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:292
+ msgid "Preferred subtitle language"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "បើក OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "ភាព​ស្រអាប់​"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "បង្ážáŸ†â€‹ážŠáž·áž"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "បង្ážáŸ†â€‹ážŠáž·áž"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "ពណ៌​គ្រោង"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "កម្រាស់​គ្រោង"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "អáŸáž€áŸ’រង់​ážáŸ’មៅ​នៅ​ក្នុង​របៀប​ពáŸáž‰â€‹áž¢áŸáž€áŸ’រង់"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "អáŸáž€áŸ’រង់​ážáŸ’មៅ​នៅ​ក្នុង​របៀប​ពáŸáž‰â€‹áž¢áŸáž€áŸ’រង់"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "បង្ហាញ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "ម៉ូឌុល​លទ្ធផល"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "រូបážážâ€‹ážœáž¸ážŠáŸáž¢áž¼"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "ážáž"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "ទ្រង់ទ្រាយ"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "បុព្វបទ"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "ការ​ដាក់​លáŸážážšáŸ€áž„ážáž¶áž˜â€‹áž›áŸ†ážŠáž¶áž”់"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "បាន​ពិនិážáŸ’យ​មើល​ចុងក្រោយ​នៅ ៖ %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "មិន​ទាន់​មាន​ការ​ពិនិážáŸ’យមើល​នៅ​ឡើយ​ទ០។"
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "ម៉ូឌុល​លទ្ធផល"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "រូបážážâ€‹ážœáž¸ážŠáŸáž¢áž¼"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "ážáž"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "ទ្រង់ទ្រាយ"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "បុព្វបទ"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "ការ​ដាក់​លáŸážážšáŸ€áž„ážáž¶áž˜â€‹áž›áŸ†ážŠáž¶áž”់"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "បាន​ពិនិážáŸ’យ​មើល​ចុងក្រោយ​នៅ ៖ %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "មិន​ទាន់​មាន​ការ​ពិនិážáŸ’យមើល​នៅ​ឡើយ​ទ០។"
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "ភាព​មើល​មិន​ឃើញ​ទាប​បំផុáž"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "ភាព​មើលមិនឃើញ​ទាប"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "ភាព​មើល​មិន​ឃើញ​ážáŸ’ពស់"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "ភាព​មើល​មិនឃើញ​ážáŸ’ពស់​ជាង"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "កំណážáŸ‹â€‹áž…ំណូលចិážáŸ’ážâ€‹áž¡áž¾áž„វិញ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18021,29 -17900,21 +20181,47 @@@
"\n"
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+"វា​នឹង​កំណážáŸ‹â€‹áž…ំណូលចិážáŸ’ážâ€‹áž€áž˜áŸ’មវិធី​ចាក់​មáŸážŒáŸ€ VLC ឡើងវិញ។\n"
+"\n"
+"ចងចាំ​ážáž¶ VLC នឹង​ចាប់ផ្ដើម​ឡើងវិញ​នៅ​ពáŸáž›â€‹áž€áŸ†áž–ុង​ដំណើរការ ដូច្នáŸáŸ‡â€‹áž”ញ្ជី​ចាក់​របស់​អ្នក​នឹង​ážáŸ’រូវ​បាន​សម្អាហហើយ​"
+"ការ​ចាក់​ឡើងវិញ​យážáž¶áž áŸážáž» ការ​ស្ទ្រីម និង​សកម្មភាព​បម្លែង​ážáŸ’រឡប់​នឹង​ážáŸ’រូវ​បាន​ឈប់​ភ្លាមៗ​ដែរ។\n"
+"\n"
+"បណ្ណាលáŸáž™â€‹áž˜áŸážŒáŸ€â€‹áž“ឹង​មិន​ប៉ះពាល់​ទáŸáŸ”\n"
+"\n"
+"ážáž¾â€‹áž¢áŸ’នក​ពិជា​ចង់​បន្ážâ€‹áž˜áŸ‚ន​ឬ?"
+
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "ជ្រើស​ážážâ€‹ážŠáž¾áž˜áŸ’បី​រក្សាទុក​រូបážážâ€‹ážœáž¸ážŠáŸáž¢áž¼â€‹ážšáž”ស់​អ្នក ។"
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "ជ្រើសរើស"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "ជ្រើសរើស​ážáž ឬ​ឈ្មោះ​ឯកសារ​ដើម្បី​រក្សាទុក​កំណážáŸ‹ážáŸ’រា ។"
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "ជ្រើស​ážážâ€‹ážŠáž¾áž˜áŸ’បី​រក្សាទុក​រូបážážâ€‹ážœáž¸ážŠáŸáž¢áž¼â€‹ážšáž”ស់​អ្នក ។"
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "ជ្រើសរើស"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "ជ្រើសរើស​ážáž ឬ​ឈ្មោះ​ឯកសារ​ដើម្បី​រក្សាទុក​កំណážáŸ‹ážáŸ’រា ។"
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18051,16 -17922,16 +20229,29 @@@ msgstr "
"ចុង​គ្រាប់ចុច​ážáŸ’មី​សម្រាប់\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "បន្សំ​មិនážáŸ’រឹមážáŸ’រូវ"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "គួរ​ឲ្យ​ស្ដាយ គ្រាប់ចុច​ទាំងនáŸáŸ‡â€‹áž˜áž·áž“​អាច​កំណážáŸ‹â€‹áž‡áž¶â€‹áž‚្រាប់ចុច​​ផ្លូវ​កាážáŸ‹ážšáž áŸážŸâ€‹áž”ានទ០។"
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "បន្សំ​មិនážáŸ’រឹមážáŸ’រូវ"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "គួរ​ឲ្យ​ស្ដាយ គ្រាប់ចុច​ទាំងនáŸáŸ‡â€‹áž˜áž·áž“​អាច​កំណážáŸ‹â€‹áž‡áž¶â€‹áž‚្រាប់ចុច​​ផ្លូវ​កាážáŸ‹ážšáž áŸážŸâ€‹áž”ានទ០។"
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "ការ​បន្សំ​នáŸáŸ‡â€‹áž‚ឺ​ážáŸ’រូវ​បាន​ជ្រើស​រួចហើយ​ដោយ \"%@\" ។"
@@@ -18095,7 -17966,7 +20286,11 @@@ msgstr "ចំណងជើង​រង/
#: modules/gui/macosx/TrackSynchronization.m:66
#: modules/gui/qt4/components/extended_panels.cpp:1480
msgid "Subtitle track synchronization:"
++<<<<<<< HEAD
+msgstr "ការ​ធ្វើ​សមកាលកម្ម​បទ​ចំណងជើង​រង៖"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/TrackSynchronization.m:68
msgid "A positive value means that the subtitles are ahead of the video"
@@@ -18104,7 -17975,7 +20299,11 @@@ msgstr "ážáž˜áŸ’លៃ​វិជ្á
#: modules/gui/macosx/TrackSynchronization.m:69
#: modules/gui/qt4/components/extended_panels.cpp:1487
msgid "Subtitle speed:"
++<<<<<<< HEAD
+msgstr "ល្បឿន​ចំណងជើង​រង៖"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/TrackSynchronization.m:70
msgid "fps"
@@@ -18113,7 -17984,7 +20312,11 @@@ msgstr "fps
#: modules/gui/macosx/TrackSynchronization.m:71
#: modules/gui/qt4/components/extended_panels.cpp:1501
msgid "Subtitle duration factor:"
++<<<<<<< HEAD
+msgstr "កážáŸ’ážáž¶â€‹ážáž·ážšážœáŸáž›áž¶â€‹áž…ំណងជើង​រង៖"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/TrackSynchronization.m:79
#: modules/gui/qt4/components/extended_panels.cpp:1612
@@@ -18121,8 -17992,6 +20324,11 @@@ msgid "
"Extend subtitle duration by this value.\n"
"Set 0 to disable."
msgstr ""
++<<<<<<< HEAD
+"បន្ážáŸ‚ម​រយៈពáŸáž›â€‹áž…ំណងជើង​ដោយ​ážáž˜áŸ’លៃ​នáŸáŸ‡áŸ”\n"
+"កំណážáŸ‹â€‹áž‘ៅ ០ដើម្បី​បិទ។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/TrackSynchronization.m:83
#: modules/gui/qt4/components/extended_panels.cpp:1617
@@@ -18130,8 -17999,6 +20336,11 @@@ msgid "
"Multiply subtitle duration by this value.\n"
"Set 0 to disable."
msgstr ""
++<<<<<<< HEAD
+"បង្កើន​រយៈពáŸáž›â€‹áž…ំណងជើង​រង​ដោយ​ážáž˜áŸ’លៃ​នáŸáŸ‡áŸ”\n"
+"កំណážáŸ‹â€‹áž‘ៅ ០ដើម្បី​បិទ។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/TrackSynchronization.m:87
#: modules/gui/qt4/components/extended_panels.cpp:1622
@@@ -18140,9 -18007,6 +20349,12 @@@ msgid "
"to their content and this value.\n"
"Set 0 to disable."
msgstr ""
++<<<<<<< HEAD
+"គណនា​រយៈពáŸáž›â€‹áž…ំណងជើង​រង​ឡើងវិញ​ផ្អែកážáž¶áž˜\n"
+"មាážáž·áž€áž¶â€‹ážšáž”ស់​វា និង​ážáž˜áŸ’លៃ​នáŸáŸ‡áŸ”\n"
+"កំណážáŸ‹â€‹áž‘ៅ ០ដើម្បី​បិទ។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:76
#: modules/gui/qt4/dialogs/extended.cpp:84
@@@ -18354,7 -18218,7 +20566,11 @@@ msgstr "បែបផែន​ទឹក
#: modules/gui/macosx/VideoEffects.m:161 modules/video_filter/anaglyph.c:73
msgid "Anaglyph"
++<<<<<<< HEAD
+msgstr "Anaglyph"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:163
#: modules/gui/qt4/ui/video_effects.h:1366
@@@ -18384,7 -18248,7 +20600,11 @@@ msgstr "ភាពážáŸ’លា
#: modules/gui/macosx/VideoEffects.m:236
msgid "Organize profiles..."
++<<<<<<< HEAD
+msgstr "រៀបចំ​ប្រវážáŸ’ážáž·ážšáž¼áž”..."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:116
msgid "MPEG-1 Video codec (usable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
@@@ -18536,9 -18400,6 +20756,12 @@@ msgid "
"that only a small part of the MMS protocol is supported (MMS encapsulated in "
"HTTP)."
msgstr ""
++<<<<<<< HEAD
+"ប្រើ​វា​ដើម្បី​ស្ទ្រីម​កុំព្យូទáŸážšâ€‹áž˜áž½áž™â€‹áž…ំនួន​ដោយ​ប្រើ​ពិធីការ Microsoft MMS ។ ពិធីការ​នáŸáŸ‡â€‹ážáŸ’រូវ​បាន​ប្រើ​ជា​វិធីសាស្ážáŸ’រ​"
+"ដឹកជញ្ជូន​ដោយ​កម្មវិធី​ជាច្រើន​របស់ Microsoft ។ ចងចាំ​ážáž¶â€‹áž˜áž¶áž“ážáŸ‚​ផ្នែក​ážáž¼áž…​មួយ​នៃ​ពិធីការ MMS ប៉ុណ្ណោះ​ដែល​"
+"ážáŸ’រូវ​បាន​គាំទ្រ (MMS បាន​ážáŸ’ចប់​នៅ​ក្នុង HTTP) ។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:270 modules/gui/macosx/wizard.m:280
msgid "Enter the address of the computer to stream to."
@@@ -18833,10 -18694,6 +21056,13 @@@ msgid "
"\n"
"Correct your selection and try again."
msgstr ""
++<<<<<<< HEAD
+"ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹ážŠáŸ‚ល​បាន​ជ្រើស​មិន​ឆបគ្នា​ទៅវិញ​ទៅមក​ទáŸáŸ” ឧទាហរណáŸáŸ– វា​មិន​អាច​លាយ​អូឌីយ៉ូ​ដែល​មិន​បង្ហាប់​ជាមួយ​"
+"ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹ážœáž¸ážŠáŸáž¢áž¼áŸ”\n"
+"\n"
+"កែ​ជម្រើស​របស់​អ្នក​រួច​ព្យាយាម​ម្ដងទៀážáŸ”"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:1020
msgid "Select the directory to save to"
@@@ -19002,7 -18859,7 +21228,11 @@@ msgstr " i បងá
#: modules/gui/ncurses.c:869
msgid " M Show/Hide metadata box"
++<<<<<<< HEAD
+msgstr " M បង្ហាញ/លាក់​ប្រអប់​ទិន្ននáŸáž™â€‹áž˜áŸážáž¶"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:870
msgid " L Show/Hide messages box"
@@@ -19076,7 -18933,7 +21306,11 @@@ msgstr " a, z បងá
#: modules/gui/ncurses.c:892
msgid " m Mute"
++<<<<<<< HEAD
+msgstr " m បិទ​សំឡáŸáž„"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#. xgettext: You can use ↑ and ↓ characters
#: modules/gui/ncurses.c:894
@@@ -19127,7 -18984,7 +21361,11 @@@ msgstr " / ស្á
#: modules/gui/ncurses.c:911
msgid " ; Look for the next item"
++<<<<<<< HEAD
+msgstr " ; រកមើល​ធាážáž»â€‹áž”ន្ទាប់"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:912
msgid " A Add an entry"
@@@ -19192,16 -19049,16 +21430,28 @@@ msgstr " ទីážáž¶áŸ†áž„ ៖ %s/%s
#: modules/gui/ncurses.c:1099
msgid " Volume : Mute"
++<<<<<<< HEAD
+msgstr " កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„ ៖ ស្ងាážáŸ‹"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:1100
#, c-format
msgid " Volume : %3ld%%"
++<<<<<<< HEAD
+msgstr " កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„ ៖ %3ld%%"
+
+#: modules/gui/ncurses.c:1100
+msgid " Volume : ----"
+msgstr " កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„ ៖ ----"
++=======
+ msgstr ""
+
+ #: modules/gui/ncurses.c:1100
+ msgid " Volume : ----"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:1106
#, c-format
@@@ -19224,12 -19081,12 +21474,20 @@@ msgstr " [ h សម្រាប់​áž
#: modules/gui/ncurses.c:1140
#, c-format
msgid "Open: %s"
++<<<<<<< HEAD
+msgstr "បើក៖ %s"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:1142
#, c-format
msgid "Find: %s"
++<<<<<<< HEAD
+msgstr "រក៖ %s"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.cpp:339
msgid "Shift+L"
@@@ -19323,11 -19180,11 +21581,19 @@@ msgstr "បើក​ឧបករណáŸâ
#: modules/gui/qt4/components/controller.hpp:125
msgid "Previous media in the playlist, skip backward when held"
++<<<<<<< HEAD
+msgstr "មáŸážŒáŸ€â€‹áž–ីមុន​ក្នុង​បញ្ជី​ចាក់ រំលង​ការ​ážáž¶ážšâ€‹â€‹ážáž™áž€áŸ’រោយ​ពáŸáž›â€‹áž”ាន​ចុច"
+
+#: modules/gui/qt4/components/controller.hpp:126
+msgid "Next media in the playlist, skip forward when held"
+msgstr "មáŸážŒáŸ€â€‹áž”ន្ទាប់​ក្នុង​បញ្ជី​ចាក់ រំលង​ការ​ážáž¶ážšâ€‹áž‘ៅមុážâ€‹áž–áŸáž›â€‹áž”ាន​ចុច"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/controller.hpp:126
+ msgid "Next media in the playlist, skip forward when held"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:127
msgid "Toggle the video in fullscreen"
@@@ -19343,7 -19200,7 +21609,11 @@@ msgstr "បង្ហាញ​ការâ
#: modules/gui/qt4/components/controller.hpp:128
msgid "Toggle playlist"
++<<<<<<< HEAD
+msgstr "បិទ/បើក​បញ្ជី​ចាក់"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:129
msgid "Take a snapshot"
@@@ -19376,7 -19233,7 +21646,11 @@@ msgstr "មáŸážŒáŸ€â€‹áž”ន្ទាá
#: modules/gui/qt4/components/controller.hpp:134
#: modules/gui/qt4/components/open_panels.cpp:252
msgid "Open subtitle file"
++<<<<<<< HEAD
+msgstr "បើក​ឯកសារ​ចំណងជើង​រង"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:135
msgid "Dock/undock fullscreen controller to/from bottom of screen"
@@@ -19467,78 -19324,78 +21741,150 @@@ msgstr "dB
#: modules/gui/qt4/components/extended_panels.cpp:1192
msgid "170 Hz"
++<<<<<<< HEAD
+msgstr "170 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1193
+msgid "310 Hz"
+msgstr "310 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1194
+msgid "600 Hz"
+msgstr "600 Hz"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1193
+ msgid "310 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1194
+ msgid "600 Hz"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1195
#: modules/gui/qt4/components/extended_panels.cpp:1209
msgid "1 KHz"
++<<<<<<< HEAD
+msgstr "1 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1196
+msgid "3 KHz"
+msgstr "3 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1197
+msgid "6 KHz"
+msgstr "6 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1198
+msgid "12 KHz"
+msgstr "12 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1199
+msgid "14 KHz"
+msgstr "14 KHz"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1196
+ msgid "3 KHz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1197
+ msgid "6 KHz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1198
+ msgid "12 KHz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1199
+ msgid "14 KHz"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1200
#: modules/gui/qt4/components/extended_panels.cpp:1213
msgid "16 KHz"
++<<<<<<< HEAD
+msgstr "16 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1204
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1205
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1206
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1207
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1208
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1210
+msgid "2 KHz"
+msgstr "2 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1211
+msgid "4 KHz"
+msgstr "4 KHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1212
+msgid "8 KHz"
+msgstr "8 KHz"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1204
+ msgid "31 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1205
+ msgid "63 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1206
+ msgid "125 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1207
+ msgid "250 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1208
+ msgid "500 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1210
+ msgid "2 KHz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1211
+ msgid "4 KHz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1212
+ msgid "8 KHz"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1380
#: modules/gui/qt4/components/extended_panels.cpp:1381
msgid "ms"
++<<<<<<< HEAD
+msgstr "ms"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1384
msgid ""
@@@ -19570,11 -19427,11 +21916,19 @@@ msgstr "បង្ážáŸ†â€‹áž”ច្ចá
#: modules/gui/qt4/components/info_panels.cpp:142
msgid "&Fingerprint"
++<<<<<<< HEAD
+msgstr "&ស្នាម​ម្រាមដៃ"
+
+#: modules/gui/qt4/components/info_panels.cpp:143
+msgid "Find meta data using audio fingerprinting"
+msgstr "រក​ទិន្ននáŸáž™â€‹áž˜áŸážáž¶â€‹ážŠáŸ„យ​ប្រើ​ស្នាម​ម្រាមដៃ​សំឡáŸáž„"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/info_panels.cpp:143
+ msgid "Find meta data using audio fingerprinting"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/info_panels.cpp:163
msgid "Comments"
@@@ -19672,11 -19529,11 +22026,19 @@@ msgstr "អង្គ​ចងចាំâ
#: modules/gui/qt4/components/info_panels.cpp:609
msgid "Last 60 seconds"
++<<<<<<< HEAD
+msgstr "៦០វិនាទី​ចុងក្រោយ"
+
+#: modules/gui/qt4/components/info_panels.cpp:610
+msgid "Overall"
+msgstr "ទាំងមូល"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/info_panels.cpp:610
+ msgid "Overall"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/interface_widgets.cpp:427
msgid "Current visualization"
@@@ -19700,15 -19557,15 +22062,27 @@@ msgstr "ទាញយក​សិល្á
#: modules/gui/qt4/components/interface_widgets.cpp:651
msgid "Add cover art from file"
++<<<<<<< HEAD
+msgstr "បន្ážáŸ‚ម​សិល្បៈ​គម្រប​ពី​ឯកសារ"
+
+#: modules/gui/qt4/components/interface_widgets.cpp:717
+msgid "Choose Cover Art"
+msgstr "ជ្រើស​សិល្បៈ​គម្រប"
+
+#: modules/gui/qt4/components/interface_widgets.cpp:718
+msgid "Image Files (*.gif *.jpg *.jpeg *.png)"
+msgstr "ឯកសារ​រូបភាព (*.gif *.jpg *.jpeg *.png)"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/interface_widgets.cpp:717
+ msgid "Choose Cover Art"
+ msgstr ""
+
+ #: modules/gui/qt4/components/interface_widgets.cpp:718
+ msgid "Image Files (*.gif *.jpg *.jpeg *.png)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/interface_widgets.cpp:743
#: modules/gui/qt4/dialogs/toolbar.cpp:461
@@@ -19776,7 -19633,7 +22150,11 @@@ msgstr "ប្រើ​ជំហាន
#: modules/gui/qt4/components/open_panels.cpp:900
msgid "TV - digital"
++<<<<<<< HEAD
+msgstr "ទូរទស្សនáŸ-ឌីជីážáž›"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/open_panels.cpp:903
msgid "Tuner card"
@@@ -19800,7 -19657,7 +22178,11 @@@ msgstr "កម្រិážâ€‹áž”ញ្á
#: modules/gui/qt4/components/open_panels.cpp:1021
msgid "TV - analog"
++<<<<<<< HEAD
+msgstr "ទូរទស្សនáŸ-អាណាឡូក"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/open_panels.cpp:1024
msgid "Device name"
@@@ -19833,7 -19690,7 +22215,11 @@@ msgstr "ស្វែងរក​បញá
#: modules/gui/qt4/components/playlist/playlist_model.cpp:377
msgid "unknown"
++<<<<<<< HEAD
+msgstr "មិន​ស្គាល់"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/selector.cpp:250
msgid "My Computer"
@@@ -19901,31 -19758,29 +22287,54 @@@ msgstr "បន្ážáž™
#: modules/gui/qt4/components/playlist/standardpanel.cpp:281
msgid "Playlist View Mode"
++<<<<<<< HEAD
+msgstr "របៀប​មើល​បញ្ជី​ចាក់"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/standardpanel.cpp:510
msgid ""
"Playlist is currently empty.\n"
"Drop a file here or select a media source from the left."
msgstr ""
++<<<<<<< HEAD
+"បញ្ជី​ចាក់​បច្ចុប្បន្ន​គឺ​ទទáŸáŸ”\n"
+"ទម្លាក់​ឯកសារ​នៅ​ទីនáŸáŸ‡ ឬ​ជ្រើស​ប្រភព​មáŸážŒáŸ€â€‹áž–ី​ážáž¶áž„ឆ្វáŸáž„។"
+
+#: modules/gui/qt4/components/playlist/standardpanel.hpp:156
+msgid "Icons"
+msgstr "រូបážáŸ†ážŽáž¶áž„"
+
+#: modules/gui/qt4/components/playlist/standardpanel.hpp:157
+msgid "Detailed List"
+msgstr "បញ្ជី​លម្អិáž"
+
+#: modules/gui/qt4/components/playlist/standardpanel.hpp:158
+msgid "List"
+msgstr "បញ្ជី"
+
+#: modules/gui/qt4/components/playlist/standardpanel.hpp:159
+msgid "PictureFlow"
+msgstr "លំហូរ​រូបភាព"
++=======
+
+ #: modules/gui/qt4/components/playlist/standardpanel.hpp:156
+ msgid "Icons"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.hpp:157
+ msgid "Detailed List"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.hpp:158
+ msgid "List"
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.hpp:159
+ msgid "PictureFlow"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:304
msgid "Select File"
@@@ -19935,19 -19790,19 +22344,35 @@@ msgstr "ជ្រើស​ឯកសាá
msgid ""
"Select or double click an action to change the associated hotkey. Use delete "
"key to remove hotkeys"
++<<<<<<< HEAD
+msgstr "ជ្រើស ឬ​ចុច​ទ្វáŸážŠáž„​លើ​សកម្មភាព​ដើម្បី​ប្ដូរ​គ្រាប់ចុច​រហáŸážŸáŸ” ប្រើ​គ្រាប់ចុច​លុប​ដើម្បី​លុប​គ្រាប់ចុច​រហáŸážŸâ€‹áž…áŸáž‰áŸ”"
+
+#: modules/gui/qt4/components/preferences_widgets.cpp:1137
+msgid "in"
+msgstr "នៅ​ក្នុង"
+
+#: modules/gui/qt4/components/preferences_widgets.cpp:1139
+msgid "Any field"
+msgstr "វាល​ណាមួយ"
+
+#: modules/gui/qt4/components/preferences_widgets.cpp:1140
+msgid "Actions"
+msgstr "សកម្មភាព"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1137
+ msgid "in"
+ msgstr ""
+
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1139
+ msgid "Any field"
+ msgstr ""
+
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1140
+ msgid "Actions"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1147
msgid "Hotkey"
@@@ -19955,7 -19810,7 +22380,11 @@@ msgstr "គ្រាប់ចុច​á
#: modules/gui/qt4/components/preferences_widgets.cpp:1148
msgid "Application level hotkey"
++<<<<<<< HEAD
+msgstr "គ្រាប់ចុច​រហáŸážŸâ€‹áž€áž˜áŸ’ážšáž·ážâ€‹ážŸáž€áž˜áŸ’មភាព"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1149
#: modules/gui/qt4/components/preferences_widgets.cpp:1409
@@@ -19964,7 -19819,7 +22393,11 @@@ msgstr "សាកល
#: modules/gui/qt4/components/preferences_widgets.cpp:1150
msgid "Desktop level hotkey"
++<<<<<<< HEAD
+msgstr "គ្រាប់ចុច​រហáŸážŸâ€‹áž€áž˜áŸ’ážšáž·ážâ€‹áž•áŸ’ទៃážáž»"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1233
#: modules/gui/qt4/components/preferences_widgets.cpp:1234
@@@ -19972,32 -19827,30 +22405,59 @@@ msgid "
"Double click to change.\n"
"Delete key to remove."
msgstr ""
++<<<<<<< HEAD
+"ចុច​ទ្វáŸážŠáž„​ដើម្បី​ប្ដូរ។\n"
+"គ្រាប់ចុច​លុប​ដើម្បី​លុបចáŸáž‰áŸ”"
+
+#: modules/gui/qt4/components/preferences_widgets.cpp:1410
+msgid "Hotkey change"
+msgstr "ការ​ប្ដូរ​គ្រាប់ចុច​រហáŸážŸ"
+
+#: modules/gui/qt4/components/preferences_widgets.cpp:1414
+msgid "Press the new key or combination for "
+msgstr "ចុច​គ្រាប់ចុច​ážáŸ’មី ឬ​បន្សំ​សម្រាប់"
+
+#: modules/gui/qt4/components/preferences_widgets.cpp:1423
+msgid "Assign"
+msgstr "កំណážáŸ‹"
+
+#: modules/gui/qt4/components/preferences_widgets.cpp:1458
+msgid "Warning: this key or combination is already assigned to "
+msgstr "ព្រមាន៖ គ្រាប់ចុច ឬ​បន្សំ​នáŸáŸ‡â€‹ážáŸ’រូវ​បាន​កំណážáŸ‹â€‹ážšáž½áž…ហើយ"
+
+#: modules/gui/qt4/components/preferences_widgets.cpp:1470
+msgid "Warning: <b>%1</b> is already an application menu shortcut"
+msgstr "ព្រមាន៖ <b>%1</b> គឺជា​ផ្លូវកាážáŸ‹â€‹áž˜ážºáž“ុយ​កម្មវិធី​រួចហើយ"
+
+#: modules/gui/qt4/components/preferences_widgets.cpp:1493
+msgid "Key or combination: "
+msgstr "គ្រាប់ចុច ឬ​បន្សំ៖"
++=======
+
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1410
+ msgid "Hotkey change"
+ msgstr ""
+
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1414
+ msgid "Press the new key or combination for "
+ msgstr ""
+
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1423
+ msgid "Assign"
+ msgstr ""
+
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1458
+ msgid "Warning: this key or combination is already assigned to "
+ msgstr ""
+
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1470
+ msgid "Warning: <b>%1</b> is already an application menu shortcut"
+ msgstr ""
+
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1493
+ msgid "Key or combination: "
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1502
msgid "Key: "
@@@ -20091,20 -19944,20 +22551,36 @@@ msgstr "លុប​ទម្រង់â
msgid "Create a new profile"
msgstr "បង្កើážâ€‹áž‘ម្រង់​ážáŸ’មី"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "បង្កើáž"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "ឧបករណáŸâ€‹áž‘្វáŸâ€‹áž‘ិស​នáŸáŸ‡â€‹áž˜áž·áž“​ážáŸ’រូវ​បាន​ផ្ដល់​ដោយ VLC ៖ វា​ប្រហែលជា​បាážáŸ‹áŸ”"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " បាážáŸ‹â€‹ážˆáŸ’មោះ​ទម្រង់"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " បាážáŸ‹â€‹ážˆáŸ’មោះ​ទម្រង់"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "អ្នក​ážáŸ’រូវ​ážáŸ‚​កំណážáŸ‹â€‹ážˆáŸ’មោះ​សម្រាប់​ទម្រង់ ។"
@@@ -20255,7 -20108,7 +22731,11 @@@ msgstr "ចាប់ផ្ដើម
#: modules/gui/qt4/dialogs/convert.cpp:132
msgid "Containers (*"
++<<<<<<< HEAD
+msgstr "ឧបករណáŸâ€‹áž•áŸ’ទុក (*"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/errors.cpp:40
msgid "Errors"
@@@ -20287,7 -20140,7 +22767,11 @@@ msgstr "ឧបករណáŸâ€‹áž”ញ្á
#: modules/gui/qt4/dialogs/extended.cpp:101
msgid "&Write changes to config"
++<<<<<<< HEAD
+msgstr "&សរសáŸážšâ€‹áž”្ដូរ​ទៅការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:61
#: modules/gui/qt4/dialogs/firstrun.cpp:69
@@@ -20306,14 -20159,6 +22790,17 @@@ msgid "
"entities. Therefore the <i>VLC</i> developers require your express consent "
"for the media player to access the Internet automatically.</p>\n"
msgstr ""
++<<<<<<< HEAD
+"<p>ដើម្បី​ការពារ​ភាព​ឯកជន​របស់​អ្នក <i>កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC</i><b>មិន</b> ប្រមូល​ទិន្ននáŸáž™â€‹áž•áŸ’ទាល់ážáŸ’លួន "
+"ឬ​បញ្ជូន​សូម្បីážáŸ‚​សំណុំ​បែបបទ​ដែល​បាន​លុប​ទៅកាន់​នរណា​ម្នាក់​ឡើយ។</p>\n"
+"<p>ទោះជា​ដូច្នáŸáŸ‡â€‹áž€áŸ’ដី <i>VLC</i> គឺ​អាច​ទៅ​យក​​ពáŸážáŸŒáž˜áž¶áž“​អំពី​មáŸážŒáŸ€â€‹áž“ៅ​ក្នុង​បញ្ជី​ចាក់​របស់​អ្នក​ដោយ​ស្វáŸáž™áž”្រវážáŸ’ážáž·â€‹áž–ី​"
+"ភាគី​ទី​បី​ដោយ​ផ្អែក​ážáž¶áž˜â€‹ážŸáŸážœáž¶áž€áž˜áŸ’ម​អ៊ីនធឺណិážáŸ” មាន​ដូចជា​សិល្បៈ​គម្រប ឈ្មោះ​បទ ការ​និពន្ធ និង​ទិន្ននáŸáž™â€‹áž˜áŸážáž¶â€‹"
+"ផ្សáŸáž„ទៀážáŸ”</p>\n"
+"វា​អាច​ážáž˜áŸ’រូវឲ្យ​មាន​ការ​កំណážáŸ‹â€‹áž¢ážáŸ’ážážŸáž‰áŸ’ញាណ​ឯកសារ​មáŸážŒáŸ€â€‹áž˜áž½áž™â€‹áž…ំនួន​របស់​អ្នក​ចំពោះ​ធាážáž»â€‹áž—ាគី​ទី​បី។ ដូច្នáŸáŸ‡ អ្នក​"
+"អភិវឌ្ážáž“០<i>VLC</i> ទាមទារ​បញ្ជាក់​ការ​យល់ព្រម​របស់​អ្នក​សម្រាប់​កម្មវិធី​ចាក់​មáŸážŒáŸ€â€‹ážŠáž¾áž˜áŸ’បី​ចូល​ដំណើរការ​"
+"អ៊ីនធឺណិážâ€‹ážŠáŸ„យ​ស្វáŸáž™áž”្រវážáŸ’ážáž·áŸ”</p>\n"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:91
msgid "Network Access Policy"
@@@ -20321,11 -20166,11 +22808,19 @@@ msgstr "គោលការណáŸâ€‹áž…á
#: modules/gui/qt4/dialogs/firstrun.cpp:98
msgid "Automatically retrieve media info"
++<<<<<<< HEAD
+msgstr "ទៅ​យក​ពáŸážáŸŒáž˜áž¶áž“​មáŸážŒáŸ€â€‹ážŠáŸ„យ​ស្វáŸáž™áž”្រវážáŸ’ážáž·"
+
+#: modules/gui/qt4/dialogs/firstrun.cpp:103
+msgid "Regularly check for VLC updates"
+msgstr "áž–áž·áž“áž·ážáŸ’យមើល​បច្ចុប្បន្នភាព VLC យ៉ាង​ទៀážáž‘ាážáŸ‹"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs/firstrun.cpp:103
+ msgid "Regularly check for VLC updates"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/gototime.cpp:42
msgid "Go to Time"
@@@ -20373,7 -20218,7 +22868,11 @@@ msgstr "មាន​កំហុស​á
#: modules/gui/qt4/dialogs/mediainfo.cpp:52
msgid "Current Media Information"
++<<<<<<< HEAD
+msgstr "áž–áŸážáŸŒáž˜áž¶áž“​មáŸážŒáŸ€â€‹áž”ច្ចុប្បន្ន"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/mediainfo.cpp:63
msgid "&General"
@@@ -20385,7 -20230,7 +22884,11 @@@ msgstr "ទិន្ននáŸáž™â€‹áž˜á
#: modules/gui/qt4/dialogs/mediainfo.cpp:67
msgid "Co&dec"
++<<<<<<< HEAD
+msgstr "ការ​ដាក់​លáŸážáž€áž¼ážŠ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/mediainfo.cpp:71
msgid "S&tatistics"
@@@ -20425,7 -20270,7 +22928,11 @@@ msgstr "ធ្វើ​បច្ចុá
#: modules/gui/qt4/dialogs/messages.cpp:332
msgid "Clear the messages"
++<<<<<<< HEAD
+msgstr "សម្អាážâ€‹ážŸáž¶ážš"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/open.cpp:78 modules/gui/qt4/menus.cpp:915
msgid "Open Media"
@@@ -20467,11 -20312,11 +22974,19 @@@ msgstr "ស្ទ្រីម
#: modules/gui/qt4/dialogs/open.cpp:121
msgid "C&onvert"
++<<<<<<< HEAD
+msgstr "បម្លែង"
+
+#: modules/gui/qt4/dialogs/open.cpp:205
+msgid "C&onvert / Save"
+msgstr "បម្លែង/រក្សាទុក"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs/open.cpp:205
+ msgid "C&onvert / Save"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/openurl.cpp:47
msgid "Open URL"
@@@ -20483,7 -20328,7 +22998,11 @@@ msgstr "បញ្ចូល URL នៅâ€
#: modules/gui/qt4/dialogs/openurl.cpp:66
msgid "Please enter the URL or path to the media you want to play."
++<<<<<<< HEAD
+msgstr "សូម​បញ្ចូល URL ឬ​ផ្លូវ​ទៅកាន់​មáŸážŒáŸ€â€‹ážŠáŸ‚ល​អ្នក​ចង់​ចាក់។"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/openurl.cpp:70
msgid ""
@@@ -20565,19 -20410,19 +23084,35 @@@ msgstr "កំណážáŸ‹â€‹áž…ំណូá
#: modules/gui/qt4/dialogs/preferences.cpp:163
msgid "Only show current"
++<<<<<<< HEAD
+msgstr "បង្ហាញ​ážáŸ‚​បច្ចុប្បន្ន​ប៉ុណ្ណោះ"
+
+#: modules/gui/qt4/dialogs/preferences.cpp:165
+msgid "Only show modules related to current playback"
+msgstr "បង្ហាញ​ážáŸ‚​ម៉ូឌុល​ដែល​ពាក់ពáŸáž“្ធ​នឹង​ការ​ចាក់​បច្ចុប្បន្ន​ប៉ុណ្ណោះ"
+
+#: modules/gui/qt4/dialogs/preferences.cpp:201
+msgid "Advanced Preferences"
+msgstr "ចំណូលចិážáŸ’ážâ€‹áž€áž˜áŸ’ážšáž·ážâ€‹ážáŸ’ពស់"
+
+#: modules/gui/qt4/dialogs/preferences.cpp:222
+msgid "Simple Preferences"
+msgstr "ចំណូលចិážáŸ’ážâ€‹áž’ម្មážáž¶"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs/preferences.cpp:165
+ msgid "Only show modules related to current playback"
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs/preferences.cpp:201
+ msgid "Advanced Preferences"
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs/preferences.cpp:222
+ msgid "Simple Preferences"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:306
msgid "Cannot save Configuration"
@@@ -20629,7 -20474,7 +23164,11 @@@ msgstr "ឯកសារ​មáŸážŒáŸ€
#: modules/gui/qt4/dialogs_provider.hpp:44
msgid "Subtitle Files"
++<<<<<<< HEAD
+msgstr "ឯកសារ​ចំណងជើង​រង"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs_provider.hpp:45
msgid "All Files"
@@@ -20646,10 -20491,6 +23185,13 @@@ msgid "
"You should start by checking that source matches what you want your input to "
"be and then press the \"Next\" button to continue.\n"
msgstr ""
++<<<<<<< HEAD
+"អ្នកជំនួយការ​នáŸáŸ‡â€‹áž“ឹង​អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​ស្ទ្រីម ឬ​បម្លែង​មáŸážŒáŸ€â€‹ážšáž”ស់​អ្នក​សម្រាប់​ប្រើ​ក្នុង​មូលដ្ឋាន លើ​បណ្ដាញ​ឯកជន​"
+"របស់​អ្នក ឬ​នៅ​លើ​អ៊ីនធឺណិážáŸ”\n"
+"អ្នក​គួរážáŸ‚​ចាប់ផ្ដើម​ដោយ​ពិនិážáŸ’យមើល​ážáž¶â€‹áž”្រភព​នោះ​ផ្គូផ្គង​ជាមួយ​អ្វី​ដែល​អ្នក​បញ្ចូល​ដែរ​ឬទ០រួច​ចុច​ប៊ូážáž»áž„ \"បន្ទាប់"
+"\" ដើម្បី​បន្ážáŸ”\n"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/sout.cpp:58
msgid ""
@@@ -20779,11 -20620,11 +23321,19 @@@ msgstr "ប៊ូážáž»áž„​ចាកá
#: modules/gui/qt4/dialogs/toolbar.cpp:453
msgid "Aspect ratio selector"
++<<<<<<< HEAD
+msgstr "ឧបករណáŸâ€‹áž‡áŸ’រើស​សមាមាážáŸ’ážš"
+
+#: modules/gui/qt4/dialogs/toolbar.cpp:457
+msgid "Speed selector"
+msgstr "ឧបករណáŸâ€‹áž‡áŸ’រើស​ល្បឿន"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs/toolbar.cpp:457
+ msgid "Speed selector"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/vlm.cpp:73
msgid "Broadcast"
@@@ -20880,7 -20721,7 +23430,11 @@@ msgstr "ចំណង​ជើង​រá
#: modules/gui/qt4/menus.cpp:335 modules/gui/qt4/menus.cpp:1068
msgid "T&ools"
++<<<<<<< HEAD
+msgstr "ឧបករណáŸ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:338 modules/gui/qt4/menus.cpp:1103
msgid "V&iew"
@@@ -20896,7 -20737,7 +23450,11 @@@ msgstr "បើក​ឯកសារ...
#: modules/gui/qt4/menus.cpp:355
msgid "&Open Multiple Files..."
++<<<<<<< HEAD
+msgstr "បើក​ឯកសារ​ច្រើន..."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:359 modules/gui/qt4/menus.cpp:920
msgid "Open &Disc..."
@@@ -21004,15 -20845,15 +23562,27 @@@ msgstr "ឧបករណáŸâ€‹áž‡áŸ’ážšá
#: modules/gui/qt4/menus.cpp:583
msgid "&Increase Volume"
++<<<<<<< HEAD
+msgstr "បង្កើន​កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„"
+
+#: modules/gui/qt4/menus.cpp:586
+msgid "&Decrease Volume"
+msgstr "បន្ážáž™â€‹áž€áž˜áŸ’ážšáž·ážâ€‹ážŸáŸ†áž¡áŸáž„"
+
+#: modules/gui/qt4/menus.cpp:589
+msgid "&Mute"
+msgstr "បិទ​សំឡáŸáž„"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/menus.cpp:586
+ msgid "&Decrease Volume"
+ msgstr ""
+
+ #: modules/gui/qt4/menus.cpp:589
+ msgid "&Mute"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:606
msgid "Audio &Track"
@@@ -21024,7 -20865,7 +23594,11 @@@ msgstr "ឧបករណáŸâ€‹áž¢áž¼ážŒá
#: modules/gui/qt4/menus.cpp:608
msgid "&Stereo Mode"
++<<<<<<< HEAD
+msgstr "របៀប​ស្ážáŸážšáŸáž¢áž¼"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:611
msgid "&Visualizations"
@@@ -21032,11 -20873,11 +23606,19 @@@ msgstr "រូបភាព​មើលâ
#: modules/gui/qt4/menus.cpp:637
msgid "Add &Subtitle File..."
++<<<<<<< HEAD
+msgstr "បន្ážáŸ‚ម​ឯកសារ​ចំណងជើង​រង..."
+
+#: modules/gui/qt4/menus.cpp:639
+msgid "Sub &Track"
+msgstr "ចំណងជើង​រង និង​បទ"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/menus.cpp:639
+ msgid "Sub &Track"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:662
msgid "Video &Track"
@@@ -21164,15 -21005,15 +23746,27 @@@ msgstr "ចាក់​ឡើងវិá
#: modules/gui/qt4/menus.cpp:1147
msgid "&Hide VLC media player in taskbar"
++<<<<<<< HEAD
+msgstr "លាក់​កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC ក្នុង​របារ​ភារកិច្ច"
+
+#: modules/gui/qt4/menus.cpp:1153
+msgid "Sho&w VLC media player"
+msgstr "បង្ហាញ​កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC"
+
+#: modules/gui/qt4/menus.cpp:1164
+msgid "&Open Media"
+msgstr "បើក​មáŸážŒáŸ€"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/menus.cpp:1153
+ msgid "Sho&w VLC media player"
+ msgstr ""
+
+ #: modules/gui/qt4/menus.cpp:1164
+ msgid "&Open Media"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:1628
msgid "&Clear"
@@@ -21386,15 -21227,15 +23980,27 @@@ msgstr "
#: modules/gui/qt4/qt4.cpp:184
msgid "Never"
++<<<<<<< HEAD
+msgstr "កុំ"
+
+#: modules/gui/qt4/qt4.cpp:184
+msgid "When minimized"
+msgstr "áž–áŸáž›â€‹áž”ាន​បង្រួម​អប្បរមា"
+
+#: modules/gui/qt4/qt4.cpp:184
+msgid "Always"
+msgstr "ជានិច្ច"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/qt4.cpp:184
+ msgid "When minimized"
+ msgstr ""
+
+ #: modules/gui/qt4/qt4.cpp:184
+ msgid "Always"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:189
msgid "Qt interface"
@@@ -21516,9 -21357,6 +24122,12 @@@ msgid "
"password, or set a password in </p><p>Preferences > All > Main "
"interfaces > Lua > Lua HTTP > Password.</p>"
msgstr ""
++<<<<<<< HEAD
+"<p>មិន​បាន​កំណážáŸ‹â€‹áž–ាក្យសម្ងាážáŸ‹â€‹ážŸáž˜áŸ’រាប់​ចំណុច​ប្រទាក់​បណ្ដាញ។</p><p>សូម​ប្រើ --http-password, ឬ​កំណážáŸ‹â€‹"
+"ពាក្យសម្ងាážáŸ‹â€‹áž“ៅ​ក្នុង </p><p>ចំណូលចិážáŸ’áž > ទាំងអស់ > ចំណុច​ប្រទាក់​ម០> Lua > Lua "
+"HTTP > ពាក្យសម្ងាážáŸ‹áŸ”</p>"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:48
msgid "Lua interface"
@@@ -21542,7 -21380,7 +24151,11 @@@ msgstr "
#: modules/lua/vlc.c:54 modules/lua/vlc.c:70
msgid "A single password restricts access to this interface."
++<<<<<<< HEAD
+msgstr "ពាក្យសម្ងាážáŸ‹â€‹áž‘ោល​ដាក់​កម្រិážâ€‹áž€áž¶ážšâ€‹áž…ូល​ប្រើ​ចំណុចប្រទាក់​នáŸáŸ‡áŸ”"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:56 modules/lua/vlc.c:57
msgid "Source directory"
@@@ -21605,7 -21443,7 +24218,11 @@@ msgstr "Lua CLI
#: modules/lua/vlc.c:110
msgid "Command-line interface"
++<<<<<<< HEAD
+msgstr "ចំណុចប្រទាក់​បន្ទាážáŸ‹â€‹áž–ាក្យ​បញ្ជា"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:119 modules/lua/vlc.c:130
msgid "Lua Telnet"
@@@ -21758,11 -21596,6 +24375,14 @@@ msgid "
"\n"
"If in doubt, abort now.\n"
msgstr ""
++<<<<<<< HEAD
+"អ្នក​បាន​ព្យាយាម​ដល់ %s ។ ទោះ​យ៉ាងណា​វិញ្ញាបនបážáŸ’រ​សុវážáŸ’ážáž·áž—ាព​ដែល​បាន​បង្ហាញ​ដោយ​ម៉ាស៊ីន​មáŸâ€‹áž˜áž·áž“​ážáŸ’រូវ​បាន​ស្គាល់ "
+"និង​មិន​អាច​ផ្ទៀងផ្ទាážáŸ‹â€‹ážŠáŸ„យ​ប្រភព​វិញ្ញាបនបážáŸ’រ​ដែល​ទុកចិážáŸ’ážâ€‹áž”ាន។ បញ្ហា​នáŸáŸ‡â€‹áž¢áž¶áž…​បណ្ដាល​មកពី​កំហុស​​ការ​កំណážáŸ‹â€‹"
+"រចនាសម្ពáŸáž“្ធ ឬ​ការ​ប៉ុនប៉ង​បំបែក​សុវážáŸ’ážáž·áž—ាព ឬ​ភាព​ឯកជន​របស់​អ្នក។\n"
+"\n"
+"បើ​សង្សáŸáž™ សូម​បោះបង់​វា​ឥឡូវ។\n"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/gnutls.c:279
#, c-format
@@@ -21774,23 -21607,18 +24394,38 @@@ msgid "
"\n"
"If in doubt, abort now.\n"
msgstr ""
++<<<<<<< HEAD
+"អ្នក​បាន​ព្យាយាម​ដល់ %s ។ ទោះ​យ៉ាងណា​វិញ្ញាបនបážáŸ’រ​សុវážáŸ’ážáž·áž—ាព​ដែល​បាន​បង្ហាញ​ដោយ​ម៉ាស៊ីន​មáŸâ€‹ážáŸ’រូវ​បាន​ផ្លាស់ប្ដូរ​"
+"ážáž¶áŸ†áž„ពី​ការ​ទស្សនា​មុន ហើយ​មិន​អាច​ផ្ទៀងផ្ទាážáŸ‹â€‹ážŠáŸ„យ​ប្រភព​វិញ្ញាបនបážáŸ’រ​ដែល​ទុកចិážáŸ’ážâ€‹áž”ាន។ បញ្ហា​នáŸáŸ‡â€‹áž¢áž¶áž…​បណ្ដាល​"
+"មកពី​កំហុស​​ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ ឬ​ការ​ប៉ុនប៉ង​បំបែក​សុវážáŸ’ážáž·áž—ាព ឬ​ភាព​ឯកជន​របស់​អ្នក។\n"
+"\n"
+"បើ​សង្សáŸáž™ សូម​បោះបង់​វា​ឥឡូវ។\n"
+
+#: modules/misc/gnutls.c:294 modules/misc/gnutls.c:311
+msgid "Insecure site"
+msgstr "ážáŸ†áž”ន់​បណ្ដាញ​គ្មាន​សុវážáŸ’ážáž·áž—ាព"
+
+#: modules/misc/gnutls.c:295 modules/misc/gnutls.c:314
+msgid "Abort"
+msgstr "បោះបង់"
+
+#: modules/misc/gnutls.c:295
+msgid "View certificate"
+msgstr "មើល​វិញ្ញាបនបážáŸ’ážš"
++=======
+
+ #: modules/misc/gnutls.c:294 modules/misc/gnutls.c:311
+ msgid "Insecure site"
+ msgstr ""
+
+ #: modules/misc/gnutls.c:295 modules/misc/gnutls.c:314
+ msgid "Abort"
+ msgstr ""
+
+ #: modules/misc/gnutls.c:295
+ msgid "View certificate"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/gnutls.c:312
#, c-format
@@@ -21800,18 -21628,14 +24435,29 @@@ msgid "
"\n"
"If in doubt, abort now.\n"
msgstr ""
++<<<<<<< HEAD
+"áž“áŸáŸ‡â€‹áž‡áž¶â€‹ážœáž·áž‰áŸ’ញាបនបážáŸ’រ​ដែល​បាន​បង្ហាញ​ដោយ %s ៖\n"
+"%s\n"
+"\n"
+"បើ​សង្សáŸáž™ សូម​បោះបង់​វា​ឥឡូវ។\n"
+
+#: modules/misc/gnutls.c:314
+msgid "Accept 24 hours"
+msgstr "យល់ព្រម ២៤ ម៉ោង"
+
+#: modules/misc/gnutls.c:315
+msgid "Accept permanently"
+msgstr "យល់ព្រម​រហូáž"
++=======
+
+ #: modules/misc/gnutls.c:314
+ msgid "Accept 24 hours"
+ msgstr ""
+
+ #: modules/misc/gnutls.c:315
+ msgid "Accept permanently"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/inhibit/dbus.c:129
msgid "Playing some media."
@@@ -21819,11 -21643,11 +24465,19 @@@ msgstr "ចាក់​មáŸážŒáŸ€â€‹á
#: modules/misc/inhibit/dbus.c:232
msgid "Power"
++<<<<<<< HEAD
+msgstr "ážáž¶áž˜áž–áž›"
+
+#: modules/misc/inhibit/dbus.c:233
+msgid "Inhibits power suspend and session idle timeout."
+msgstr "បាន​ផ្អាក​ážáž¶áž˜áž–áž› ហើយ​សមáŸáž™â€‹áž‘ំនáŸážšâ€‹áž”ាន​អស់​ម៉ោង។"
++=======
+ msgstr ""
+
+ #: modules/misc/inhibit/dbus.c:233
+ msgid "Inhibits power suspend and session idle timeout."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/inhibit/xdg.c:38
msgid "XDG-screensaver"
@@@ -21839,15 -21663,15 +24493,27 @@@ msgstr "ទ្រង់ទ្រាយâ
#: modules/misc/logger.c:118
msgid "Specify the logging format."
++<<<<<<< HEAD
+msgstr "បញ្ជាក់​ទ្រង់ទ្រាយ​ការ​ចូល។"
+
+#: modules/misc/logger.c:121
+msgid "Syslog ident"
+msgstr "áž›áŸážâ€‹ážŸáž˜áŸ’គាល់​កំណážáŸ‹áž áŸážáž»â€‹áž”្រពáŸáž“្ធ"
+
+#: modules/misc/logger.c:122
+msgid "Set the ident that VLC would use when logging to syslog."
+msgstr "កំណážáŸ‹â€‹áž›áŸážâ€‹ážŸáž˜áŸ’គាល់​ដែល VLC នឹង​ប្រើ​ពáŸáž›â€‹áž…ូល​កំណážáŸ‹áž áŸážáž»â€‹áž”្រពáŸáž“្ធ។"
++=======
+ msgstr ""
+
+ #: modules/misc/logger.c:121
+ msgid "Syslog ident"
+ msgstr ""
+
+ #: modules/misc/logger.c:122
+ msgid "Set the ident that VLC would use when logging to syslog."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/logger.c:125
msgid "Syslog facility"
@@@ -21855,7 -21679,7 +24521,11 @@@ msgstr "សáŸážœáž¶â€‹áž€áŸ†ážŽážáŸ‹á
#: modules/misc/logger.c:126
msgid "Select the syslog facility where logs will be forwarded."
++<<<<<<< HEAD
+msgstr "ជ្រើស​ភាព​ងាយស្រួល​កំណážáŸ‹áž áŸážáž»â€‹áž”្រពáŸáž“្ធ​ដែល​កំណážáŸ‹áž áŸážáž»â€‹áž“ឹង​ážáŸ’រូវ​បាន​បញ្ជូន​បន្ážáŸ”"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/logger.c:153
msgid "Verbosity"
@@@ -22562,20 -22386,20 +25232,36 @@@ msgstr "ផ្ទៃážáž»â€‹
#: modules/stream_filter/dash/dash.cpp:51
#: modules/stream_filter/dash/dash.cpp:52
msgid "Preferred Width"
++<<<<<<< HEAD
+msgstr "ទទឹង​ដែល​ចូលចិážáŸ’áž"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/dash/dash.cpp:54
#: modules/stream_filter/dash/dash.cpp:55
msgid "Preferred Height"
++<<<<<<< HEAD
+msgstr "កម្ពស់​ដែល​ចូលចិážáŸ’áž"
+
+#: modules/stream_filter/dash/dash.cpp:57
+msgid "Buffer Size (Seconds)"
+msgstr "ទំហំ​អង្គ​ចងចាំ​បណ្ដោះអាសន្ន (វិនាទី)"
+
+#: modules/stream_filter/dash/dash.cpp:58
+msgid "Buffer size in seconds"
+msgstr "ទំហំ​អង្គ​ចងចាំ​បណ្ដោះងាសន្ន​គិážáž‡áž¶â€‹ážœáž·áž“ាទី"
++=======
+ msgstr ""
+
+ #: modules/stream_filter/dash/dash.cpp:57
+ msgid "Buffer Size (Seconds)"
+ msgstr ""
+
+ #: modules/stream_filter/dash/dash.cpp:58
+ msgid "Buffer size in seconds"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/dash/dash.cpp:61
msgid "DASH"
@@@ -22587,15 -22411,15 +25273,27 @@@ msgstr "ការ​ស្ទ្រីá
#: modules/stream_filter/decomp.c:59
msgid "LZMA decompression"
++<<<<<<< HEAD
+msgstr "ការ​មិន​បង្ហាប់ LZMA"
+
+#: modules/stream_filter/decomp.c:63
+msgid "Burrows-Wheeler decompression"
+msgstr "ការ​មិន​បង្ហាប់ Burrows-Wheeler"
+
+#: modules/stream_filter/decomp.c:68
+msgid "gzip decompression"
+msgstr "ការ​មិន​បង្ហាប់ gzip"
++=======
+ msgstr ""
+
+ #: modules/stream_filter/decomp.c:63
+ msgid "Burrows-Wheeler decompression"
+ msgstr ""
+
+ #: modules/stream_filter/decomp.c:68
+ msgid "gzip decompression"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/httplive.c:55
msgid "Http Live Streaming stream filter"
@@@ -22607,7 -22431,7 +25305,11 @@@ msgstr "កážáŸ‹ážáŸ’រា​ស្á
#: modules/stream_filter/smooth/smooth.c:61
msgid "Smooth Streaming"
++<<<<<<< HEAD
+msgstr "ការ​ស្ទ្រីម​រលោង"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/autodel.c:46
msgid "Autodel"
@@@ -23504,21 -23328,21 +26206,37 @@@ msgstr "
#: modules/stream_out/transcode/transcode.c:107
msgid "Subtitle encoder"
++<<<<<<< HEAD
+msgstr "កម្មវិធី​ដាក់​លáŸážáž€áž¼ážŠâ€‹áž…ំណងជើង​រង"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:109
msgid ""
"This is the subtitle encoder module that will be used (and its associated "
"options)."
++<<<<<<< HEAD
+msgstr "áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž˜áŸ‰áž¼ážŒáž»áž›â€‹áž€áž˜áŸ’មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž…ំណងជើង​រង​ដែល​នឹង​ážáŸ’រូវ​ប្រើ (និង​ជម្រើស​ពាក់ពáŸáž“្ធ​របស់​វា)"
+
+#: modules/stream_out/transcode/transcode.c:111
+msgid "Destination subtitle codec"
+msgstr "ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž…ំណងជើង​រង​ទិសដៅ"
+
+#: modules/stream_out/transcode/transcode.c:113
+msgid "This is the subtitle codec that will be used."
+msgstr "áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž€áž¶ážšâ€‹ážŠáž¶áž€áŸ‹â€‹áž›áŸážâ€‹áž€áž¼ážŠâ€‹áž…ំណងជើង​រង​ដែល​នឹង​ážáŸ’រូវ​ប្រើ។"
++=======
+ msgstr ""
+
+ #: modules/stream_out/transcode/transcode.c:111
+ msgid "Destination subtitle codec"
+ msgstr ""
+
+ #: modules/stream_out/transcode/transcode.c:113
+ msgid "This is the subtitle codec that will be used."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:117
msgid ""
@@@ -23581,23 -23405,23 +26299,43 @@@ msgstr "បម្លែង​ážáŸ’ážšá
msgid "Overlays/Subtitles"
msgstr "ážáŸ’ážšáž½ážâ€‹áž‚្នា/​ចំណងជើង​រង"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "ពុម្ពអក្សរ Monospace"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "គ្រួសារពុម្ពអក្សរ​សម្រាប់​ពុម្ពអក្សរ​ដែល​អ្នក​ចង់​ប្រើ"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "ឯកសារពុម្ពអក្សរ​សម្រាប់​ពុម្ពអក្សរ​ដែល​អ្នក​ចង់​ប្រើ"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "ទំហំ​ពុម្ព​អក្សរ​គិážâ€‹áž‡áž¶â€‹áž—ីកសែល"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "គ្រួសារពុម្ពអក្សរ​សម្រាប់​ពុម្ពអក្សរ​ដែល​អ្នក​ចង់​ប្រើ"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "ឯកសារពុម្ពអក្សរ​សម្រាប់​ពុម្ពអក្សរ​ដែល​អ្នក​ចង់​ប្រើ"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "ទំហំ​ពុម្ព​អក្សរ​គិážâ€‹áž‡áž¶â€‹áž—ីកសែល"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23606,11 -23430,11 +26344,19 @@@ msgstr "
"áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž‘ំហំ​​ពុម្ព​អក្សរ​លំនាំដើម ដែល​នឹង​ážáŸ’រូវ​បង្ហាញ​នៅ​លើ​វីដáŸáž¢áž¼ ។ ប្រសិនបើ​កំណážáŸ‹â€‹áž¢áŸ’វី​ផ្សáŸáž„​ក្រៅ​ពី ០នោះ​ជម្រើស​"
"áž“áŸáŸ‡â€‹áž“ឹង​បដិសáŸáž’​ទំហំ​ពុម្ព​អក្សរ​ដែល​ទាក់ទង ។"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "ភាព​ស្រអាប់​របស់​អážáŸ’ážáž”áž‘"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "ភាព​ស្រអាប់​របស់​អážáŸ’ážáž”áž‘"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -23618,12 -23442,12 +26364,20 @@@ msgstr "
"ភាព​ស្រអាប់ (ច្រាស​ពី​ភាព​ážáŸ’លា) របស់​អážáŸ’ážáž”ទ​ដែល​នឹង​ážáŸ’រូវ​បង្ហាញ​នៅ​លើ​វីដáŸáž¢áž¼ ។ ០= ážáŸ’លា ២៥៥ = ស្រអាប់​ទាំង​"
"ស្រុង ។"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "ពណ៌​អážáŸ’ážáž”ទ​លំនាំដើម"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23635,12 -23459,12 +26389,20 @@@ msgstr "
"ពីរ​ážáž½â€‹ážŠáŸ†áž”ូង​គឺ​សម្រាប់​ពណ៌​ក្រហម បន្ទាប់មក​ពណ៌​បៃážáž„ និង​បន្ទាប់​មក​ទៀážâ€‹áž‚ឺ​ពណ៌​ážáŸ€ážœ ។ #000000 = ពណ៌​ážáŸ’មៅ "
"#FF0000 = ពណ៌​ក្រហម #00FF00 = បៃážáž„ #FFFF00 = ពណ៌​លឿង (ក្រហម + បៃážáž„) #FFFFFF = ពណ៌​ស"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "ទំហំ​ពុម្ព​អក្សរ​ដែល​ពាក់ពáŸáž“្ធ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -23649,59 -23473,59 +26411,111 @@@ msgstr "
"áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž‘ំហំ​ពុម្ព​អក្សរ​ពាក់ពáŸáž“្ធ​លំនាំដើម ដែល​នឹង​ážáŸ’រូវ​បង្ហាញ​នៅ​លើ​វីដáŸáž¢áž¼ ។ ប្រសិនបើ​បាន​កំណážáŸ‹â€‹áž‘ំហំ​ពុម្ពអក្សរ​"
"ជាក់លាក់ ទំហំ​ដែល​ពាក់ពáŸáž“្ធ​នឹង​ážáŸ’រូវ​បាន​បដិសáŸáž’​ ។"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "ផ្ទៃážáž¶áž„ក្រោយ​ស្រអាប់"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "ពណ៌​ផ្ទៃážáž¶áž„ក្រោយ"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "គ្រោង​ស្រអាប់"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "​ស្រមោល​ស្រអាប់"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "ពណ៌​​ស្រមោល"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "​ស្រមោល​មុំ"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "ចម្ងាយ​​ស្រមោល"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "ផ្ទៃážáž¶áž„ក្រោយ​ស្រអាប់"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "ពណ៌​ផ្ទៃážáž¶áž„ក្រោយ"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "គ្រោង​ស្រអាប់"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "​ស្រមោល​ស្រអាប់"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "ពណ៌​​ស្រមោល"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "​ស្រមោល​មុំ"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "ចម្ងាយ​​ស្រមោល"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "ážáž¼áž…ជាង"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "ážáž¼áž…"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "ធំ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "ធំ​ជាង"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "ប្រើ​កម្មវិធី​បង្ហាញ YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "ប្រើ​កម្មវិធី​បង្ហាញ YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -23709,23 -23533,23 +26523,43 @@@ msgstr "
"វា​បង្ហាញ​ពុម្ពអក្សរ​ដោយ​ប្រើ \"paletized YUV\" ។ ជម្រើស​នáŸáŸ‡â€‹áž‚ឺ​ចាំបាច់​ážáŸ‚​នៅ​ពáŸáž›â€‹ážŠáŸ‚ល​អ្នក​ចង់​អ៊ិនកូដ​ទៅ​"
"ក្នុង​ចំណងជើង​រង DVB"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "ស្ដើង"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "ក្រាស់"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "កម្មវិធី​បង្ហាញ​អážáŸ’ážáž”áž‘"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "កម្មវិធី​បង្ហាញ​ពុម្ពអក្សរ Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "ស្ដើង"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "ក្រាស់"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "កម្មវិធី​បង្ហាញ​អážáŸ’ážáž”áž‘"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "កម្មវិធី​បង្ហាញ​ពុម្ពអក្សរ Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -23886,15 -23710,15 +26720,27 @@@ msgstr "របាំង​អាល់á
#: modules/video_filter/anaglyph.c:39
msgid "Color scheme"
++<<<<<<< HEAD
+msgstr "គ្រោង​ពណ៌"
+
+#: modules/video_filter/anaglyph.c:40
+msgid "Define the glasses' color scheme"
+msgstr "កំណážáŸ‹â€‹áž‚្រោង​ពណ៌​របស់​វែនážáž¶"
+
+#: modules/video_filter/anaglyph.c:72
+msgid "Convert 3D picture to anaglyph image video filter"
+msgstr "បម្លែង​រូបភាព 3D ទៅជា​ážáž˜áŸ’រង​វីដáŸáž¢áž¼â€‹ážšáž¼áž”ភាព anaglyph"
++=======
+ msgstr ""
+
+ #: modules/video_filter/anaglyph.c:40
+ msgid "Define the glasses' color scheme"
+ msgstr ""
+
+ #: modules/video_filter/anaglyph.c:72
+ msgid "Convert 3D picture to anaglyph image video filter"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/antiflicker.c:50
msgid "Window size"
@@@ -25130,7 -24954,7 +27976,11 @@@ msgstr "Gradfun
#: modules/video_filter/gradfun.c:60
msgid "Debanding algorithm"
++<<<<<<< HEAD
+msgstr "ក្បួន​ដោះស្រាយ Debanding"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/gradient.c:62
msgid "Distort mode"
@@@ -25348,11 -25172,11 +28198,19 @@@ msgstr "
#: modules/video_filter/marq.c:104
msgid "Text file"
++<<<<<<< HEAD
+msgstr "ឯកសារ​អážáŸ’ážáž”áž‘"
+
+#: modules/video_filter/marq.c:105
+msgid "File to read the marquee text from."
+msgstr "ឯកសារ​ដែល​ážáŸ’រូវ​អាន​អážáŸ’ážáž”ទ​ម៉ារគី​ចáŸáž‰áž–ី។"
++=======
+ msgstr ""
+
+ #: modules/video_filter/marq.c:105
+ msgid "File to read the marquee text from."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:107 modules/video_filter/rss.c:143
msgid "X offset, from the left screen edge."
@@@ -26046,83 -25870,83 +28904,163 @@@ msgstr "ចំនួន​ជួរឈá
#: modules/video_filter/puzzle.c:55
msgid "Game mode"
++<<<<<<< HEAD
+msgstr "របៀប​ល្បែង"
+
+#: modules/video_filter/puzzle.c:56
+msgid "Select game mode variation from jigsaw puzzle to sliding puzzle."
+msgstr "ជ្រើស​របៀប​ល្បែង​ផ្សáŸáž„ៗ​ពី​ល្បែង​ផ្គុំ​រូប​ដើម្បី​ចាប់ផ្ដើម។"
+
+#: modules/video_filter/puzzle.c:57
+msgid "Border"
+msgstr "ស៊ុម"
+
+#: modules/video_filter/puzzle.c:58
+msgid "Unshuffled Border width."
+msgstr "ទទឹង​ស៊ុម​ដែល​មិន​ឆ្លាស់"
+
+#: modules/video_filter/puzzle.c:59
+msgid "Small preview"
+msgstr "មើល​ជាមុន​ážáž¼áž…"
+
+#: modules/video_filter/puzzle.c:60
+msgid "Show small preview."
+msgstr "បង្ហាញ​ការ​មើល​ជាមុន​ážáž¼áž…។"
+
+#: modules/video_filter/puzzle.c:61
+msgid "Small preview size"
+msgstr "ទំហំ​មើល​ជាមុន​ážáž¼áž…"
+
+#: modules/video_filter/puzzle.c:62
+msgid "Show small preview size (percent of source)."
+msgstr "បង្ហាញ​ទំហំ​មើល​ជាមុន​ážáž¼áž… (ភាគរយ​នៃ​ប្រភព)។"
+
+#: modules/video_filter/puzzle.c:63
+msgid "Piece edge shape size"
+msgstr "បំណែក​ទំហំ​រូបរាង​គែម"
+
+#: modules/video_filter/puzzle.c:64
+msgid "Size of the curve along the piece's edge"
+msgstr "ទំហំ​ážáŸ’សែ​កោង​ážáž¶áž˜â€‹áž”ណ្ដោយ​គែម​បំណែក"
+
+#: modules/video_filter/puzzle.c:65
+msgid "Auto shuffle"
+msgstr "ចៃដន្យ​ស្វáŸáž™áž”្រវážáŸ’ážáž·"
+
+#: modules/video_filter/puzzle.c:66
+msgid "Auto shuffle delay during game"
+msgstr "ពន្យារ​ចៃដន្យ​ស្វáŸáž™áž”្រវážáŸ’ážáž·â€‹áž–áŸáž›â€‹áž›áŸáž„​ល្បែង"
+
+#: modules/video_filter/puzzle.c:67
+msgid "Auto solve"
+msgstr "ដោះស្រាយ​ស្វáŸáž™áž”្រវážáŸ’ážáž·"
+
+#: modules/video_filter/puzzle.c:68
+msgid "Auto solve delay during game"
+msgstr "ពន្យារ​ការ​ដោះស្រាយ​ស្វáŸáž™áž”្រវážáŸ’ážáž·â€‹áž–áŸáž›â€‹áž›áŸáž„​ល្បែង"
+
+#: modules/video_filter/puzzle.c:69
+msgid "Rotation"
+msgstr "ការ​បង្វិល"
+
+#: modules/video_filter/puzzle.c:70
+msgid "Rotation parameter: none;180;90-270;mirror"
+msgstr "ប៉ារ៉ាម៉ែážáŸ’រ​បង្វិល៖ គ្មាន;180;90-270;ឆ្លុះ"
+
+#: modules/video_filter/puzzle.c:73
+msgid "jigsaw puzzle"
+msgstr "ល្បែង​ផ្គុំ​រូប"
+
+#: modules/video_filter/puzzle.c:73
+msgid "sliding puzzle"
+msgstr "ចាប់ផ្ដើម​ល្បែង"
+
+#: modules/video_filter/puzzle.c:73
+msgid "swap puzzle"
+msgstr "ប្ដូរ​ល្បែង"
+
+#: modules/video_filter/puzzle.c:73
+msgid "exchange puzzle"
+msgstr "ផ្លាស់ប្ដូរ​ល្បែង"
++=======
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:56
+ msgid "Select game mode variation from jigsaw puzzle to sliding puzzle."
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:57
+ msgid "Border"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:58
+ msgid "Unshuffled Border width."
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:59
+ msgid "Small preview"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:60
+ msgid "Show small preview."
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:61
+ msgid "Small preview size"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:62
+ msgid "Show small preview size (percent of source)."
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:63
+ msgid "Piece edge shape size"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:64
+ msgid "Size of the curve along the piece's edge"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:65
+ msgid "Auto shuffle"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:66
+ msgid "Auto shuffle delay during game"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:67
+ msgid "Auto solve"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:68
+ msgid "Auto solve delay during game"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:69
+ msgid "Rotation"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:70
+ msgid "Rotation parameter: none;180;90-270;mirror"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:73
+ msgid "jigsaw puzzle"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:73
+ msgid "sliding puzzle"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:73
+ msgid "swap puzzle"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:73
+ msgid "exchange puzzle"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:75
msgid "0"
@@@ -26130,15 -25954,15 +29068,27 @@@ msgstr "0
#: modules/video_filter/puzzle.c:75
msgid "0/180"
++<<<<<<< HEAD
+msgstr "0/180"
+
+#: modules/video_filter/puzzle.c:75
+msgid "0/90/180/270"
+msgstr "0/90/180/270"
+
+#: modules/video_filter/puzzle.c:75
+msgid "0/90/180/270/mirror"
+msgstr "0/90/180/270/ឆ្លុះ"
++=======
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:75
+ msgid "0/90/180/270"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:75
+ msgid "0/90/180/270/mirror"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:83
msgid "Puzzle interactive game video filter"
@@@ -26245,7 -26069,7 +29195,11 @@@ msgstr "មុំ​គិážáž‡áž¶â€‹á
#: modules/video_filter/rotate.c:56
msgid "Use motion sensors"
++<<<<<<< HEAD
+msgstr "ប្រើ​ឧបករណáŸâ€‹áž…ាប់​សញ្ញា​ចលនា"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/rotate.c:66
msgid "Rotate video filter"
@@@ -26402,8 -26226,6 +29356,11 @@@ msgid "
"Directory path where images files should be saved. If not set, then images "
"will be automatically saved in users homedir."
msgstr ""
++<<<<<<< HEAD
+"ផ្លូវ​ážážâ€‹ážŠáŸ‚ល​áŸáž€ážŸáž¶ážšâ€‹ážšáž¼áž”ភាព​ážáŸ’រូវ​រក្សាទុក។ បើ​មិន​បាន​កំណážáŸ‹â€‹áž‘០រូបភាព​នឹង​ážáŸ’រូវ​បាន​រក្សាទុក​នៅ​ក្នុង​ážážâ€‹áž•áŸ’ទះ​ដោយ​"
+"ស្វáŸáž™áž”្រវážáŸ’ážáž·áŸ”"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/scene.c:86
msgid "Always write to the same file"
@@@ -26463,7 -26285,7 +29420,11 @@@ msgstr "ážáž˜áŸ’រង​វីដáŸá
#: modules/video_filter/subsdelay.c:45
msgid "Change subtitle delay"
++<<<<<<< HEAD
+msgstr "ប្ដូរ​ការ​ពន្យារ​ចំណងជើង​រង"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/subsdelay.c:47
msgid "Delay calculation mode"
@@@ -26627,11 -26449,11 +29588,19 @@@ msgstr "ប្រភáŸáž‘​ប្លá
#: modules/video_filter/transform.c:53
msgid "Transpose"
++<<<<<<< HEAD
+msgstr "ផ្លាស់​កន្លែង"
+
+#: modules/video_filter/transform.c:53
+msgid "Anti-transpose"
+msgstr "មិន​ផ្លាស់​កន្លែង"
++=======
+ msgstr ""
+
+ #: modules/video_filter/transform.c:53
+ msgid "Anti-transpose"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/transform.c:56
msgid "Video transformation filter"
@@@ -26695,7 -26517,7 +29664,11 @@@ msgstr "បានប្រើ​ក្á
#: modules/video_output/androidsurface.c:51
msgid "Force use of a specific chroma for output. Default is RGB32."
++<<<<<<< HEAD
+msgstr "ážáž˜áŸ’រូវឲ្យ​ប្រើ​ក្រូម៉ា​ជាក់លាក់​សម្រាប់​លទ្ធផល។ លំនាំដើម​គឺ RGB32 ។"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/androidsurface.c:62
msgid "Android Surface video output"
@@@ -26707,74 -26529,72 +29680,137 @@@ msgstr "ដាក់​ពណ៌​លá
#: modules/video_output/decklink.cpp:69
msgid "Output card"
++<<<<<<< HEAD
+msgstr "កាážâ€‹áž›áž‘្ធផល"
+
+#: modules/video_output/decklink.cpp:71
+msgid "DeckLink output card, if multiple exist. The cards are numbered from 0."
+msgstr "កាážâ€‹áž›áž‘្ធផល DeckLink បើ​មាន​ច្រើន។ កាážâ€‹ážáŸ’រូវ​បាន​ដាក់​លáŸážâ€‹áž…ាប់ពី 0។"
+
+#: modules/video_output/decklink.cpp:74
+msgid "Desired output mode"
+msgstr "របៀប​បង្ហាញ​ដែល​ចង់​បាន"
++=======
+ msgstr ""
+
+ #: modules/video_output/decklink.cpp:71
+ msgid "DeckLink output card, if multiple exist. The cards are numbered from 0."
+ msgstr ""
+
+ #: modules/video_output/decklink.cpp:74
+ msgid "Desired output mode"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:76
msgid ""
"Desired output mode for DeckLink output. This value should be a FOURCC code "
"in textual form, e.g. \"ntsc\"."
msgstr ""
++<<<<<<< HEAD
+"របៀប​បង្ហាញ​ដែល​ចង់​បាន​សម្រាប់​លទ្ធផល DeckLink ។ ážáž˜áŸ’លៃ​នáŸáŸ‡â€‹áž‚ួរážáŸ‚​ជា​កូដ FOURCC នៅ​ក្នុង​ទម្រង់​អážáŸ’ážáž”áž‘ "
+"ឧទាហរណáŸáŸ– \"ntsc\" ។"
+
+#: modules/video_output/decklink.cpp:82
+msgid "Audio connection for DeckLink output."
+msgstr "ការ​ភ្ជាប់​អូឌីយ៉ូ​សម្រាប់​លទ្ធផល DeckLink ។"
++=======
+
+ #: modules/video_output/decklink.cpp:82
+ msgid "Audio connection for DeckLink output."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:87
msgid ""
"Audio sampling rate (in hertz) for DeckLink output. 0 disables audio output."
++<<<<<<< HEAD
+msgstr "អážáŸ’រា​គំរូ​អូឌីយ៉ូ (áž‚áž·ážáž‡áž¶ hertz) សម្រាប់​លទ្ធផល DeckLink ។ 0 គឺ​បិទ​លទ្ធផល​អូឌីយ៉ូ។"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:92
msgid ""
"Number of output channels for DeckLink output. Must be 2, 8 or 16. 0 "
"disables audio output."
++<<<<<<< HEAD
+msgstr "ចំនួន​ឆានែល​បង្ហាញ​សម្រាប់​លទ្ធផល DeckLink ។ ážáŸ’រូវážáŸ‚ 2, 8 ឬ 16 ។ 0 គឺ​បិទ​លទ្ធផល​អូឌីយ៉ូ។"
+
+#: modules/video_output/decklink.cpp:97
+msgid "Video connection for DeckLink output."
+msgstr "ការ​ážáž—្ជាប់​វីដáŸáž¢áž¼â€‹ážŸáž˜áŸ’រាប់​លទ្ធផល DeckLink ។"
+
+#: modules/video_output/decklink.cpp:101
+msgid "Use 10 bits per pixel for video frames."
+msgstr "ប្រើ​អážáŸ’រា ១០ប៊ីážâ€‹áž€áŸ’នុង​មួយ​ភីកសែល​សម្រាប់​ស៊ុម​វីដáŸáž¢áž¼áŸ”"
+
+#: modules/video_output/decklink.cpp:174
+msgid "DecklinkOutput"
+msgstr "លទ្ធផល Decklink"
+
+#: modules/video_output/decklink.cpp:175
+msgid "output module to write to Blackmagic SDI card"
+msgstr "ម៉ូឌុល​លទ្ធផល​ដើម្បី​សរសáŸážšâ€‹áž‘ៅកាន់​កាហBlackmagic SDI"
+
+#: modules/video_output/decklink.cpp:176
+msgid "Decklink General Options"
+msgstr "ជម្រើស​ទូទៅ​របស់ Decklink"
+
+#: modules/video_output/decklink.cpp:181
+msgid "Decklink Video Output module"
+msgstr "ម៉ូឌុល​លទ្ធផល​វីដáŸáž¢áž¼ Decklink"
+
+#: modules/video_output/decklink.cpp:186
+msgid "Decklink Video Options"
+msgstr "ជម្រើស​វីដáŸáž¢áž¼ Decklink"
+
+#: modules/video_output/decklink.cpp:197
+msgid "Decklink Audio Output module"
+msgstr "ជម្រើស​លទ្ធផល​អូឌីយ៉ូ Decklink"
+
+#: modules/video_output/decklink.cpp:202
+msgid "Decklink Audio Options"
+msgstr "ជម្រើស​អូឌីយ៉ូ Decklink"
++=======
+ msgstr ""
+
+ #: modules/video_output/decklink.cpp:97
+ msgid "Video connection for DeckLink output."
+ msgstr ""
+
+ #: modules/video_output/decklink.cpp:101
+ msgid "Use 10 bits per pixel for video frames."
+ msgstr ""
+
+ #: modules/video_output/decklink.cpp:174
+ msgid "DecklinkOutput"
+ msgstr ""
+
+ #: modules/video_output/decklink.cpp:175
+ msgid "output module to write to Blackmagic SDI card"
+ msgstr ""
+
+ #: modules/video_output/decklink.cpp:176
+ msgid "Decklink General Options"
+ msgstr ""
+
+ #: modules/video_output/decklink.cpp:181
+ msgid "Decklink Video Output module"
+ msgstr ""
+
+ #: modules/video_output/decklink.cpp:186
+ msgid "Decklink Video Options"
+ msgstr ""
+
+ #: modules/video_output/decklink.cpp:197
+ msgid "Decklink Audio Output module"
+ msgstr ""
+
+ #: modules/video_output/decklink.cpp:202
+ msgid "Decklink Audio Options"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/directfb.c:50
msgid "DirectFB video output http://www.directfb.org/"
@@@ -26915,7 -26735,7 +29951,11 @@@ msgstr "GLX
#: modules/video_output/glx.c:43
msgid "GLX extension for OpenGL"
++<<<<<<< HEAD
+msgstr "ផ្នែក​បន្ážáŸ‚ម GLX សម្រាប់ OpenGL"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/ios.m:66
msgid "iOS OpenGL ES video output (requires UIView)"
@@@ -26923,7 -26743,7 +29963,11 @@@ msgstr "លទ្ធផល​វីដá
#: modules/video_output/ios2.m:72
msgid "iOS OpenGL video output"
++<<<<<<< HEAD
+msgstr "លទ្ធផល​វីដáŸáž¢áž¼ iOS OpenGL"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:50 modules/gui/qt4/ui/sprefs_video.h:352
msgid "Enable a workaround for T23"
@@@ -26999,7 -26819,7 +30043,11 @@@ msgstr "ប្រើ​ការ​គá
#: modules/video_output/msw/direct3d.c:61
msgid "Try to use hardware acceleration for subtitle/OSD blending."
++<<<<<<< HEAD
+msgstr "សាកល្បង​ប្រើ​ការ​បង្កើន​ល្បឿន​ផ្នែក​រឹង​សម្រាប់​បន្សំ​ចំណងជើង​រង/OSD ។"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/msw/direct3d.c:63
msgid "Recommended video output for Windows Vista and later versions"
@@@ -27252,9 -27072,6 +30300,12 @@@ msgid "
"Acceleration will thus be disabled. Performance may be degraded severely if "
"the resolution is large."
msgstr ""
++<<<<<<< HEAD
+"កម្មវិធី​បញ្ចា​បង្កើន​ល្បឿន​ការ​បង្ហាញ XVideo មិន​គាំទ្រ​គុណភាព​បង្ហាញ​​ដែល​បាន​ទាមទារ %ux%u ភីកសែល "
+"ហើយ​វា​បាន​ជំនួស​ដោយ %<PRIu32>x%<PRIu32> ភីកសែល។\n"
+"ការ​បង្កើន​ល្បឿន​នឹង​ážáŸ’រូវ​បាន​បិទ។ ការ​ដំណើរការ​អាច​យឺážâ€‹ážáŸ’លាំង បើ​គុណភាព​បង្ហាញ​ធំ។"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/yuv.c:41
msgid "device, fifo or filename"
@@@ -27508,7 -27325,7 +30559,11 @@@ msgstr "កម្មវិធី​វá
#: modules/visualization/vsxu.cpp:62 modules/visualization/vsxu.cpp:63
msgid "vsxu"
++<<<<<<< HEAD
+msgstr "vsxu"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/batch_window.html:28
msgid "#paste your VLM commands here"
@@@ -27530,11 -27347,11 +30585,19 @@@ msgstr "លទ្ធផល
#: share/lua/http/dialogs/create_stream.html:193
msgid "Subtitle codec"
++<<<<<<< HEAD
+msgstr "ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž…ំណងជើង​រង"
+
+#: share/lua/http/dialogs/create_stream.html:200
+msgid "Output\tmethod"
+msgstr "លទ្ធផល\tវិធីសាស្ážáŸ’ážš"
++=======
+ msgstr ""
+
+ #: share/lua/http/dialogs/create_stream.html:200
+ msgid "Output\tmethod"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:249
msgid "Multiplexer"
@@@ -27546,24 -27363,24 +30609,44 @@@ msgstr "វីដáŸáž¢áž¼ FPS
#: share/lua/http/dialogs/create_stream.html:297
msgid "MUX options"
++<<<<<<< HEAD
+msgstr "ជម្រើស​ទ្វáŸâ€‹áž‘ិស"
+
+#: share/lua/http/dialogs/create_stream.html:303
+msgid "Video scale"
+msgstr "មាážáŸ’រដ្ឋាន​វីដáŸáž¢áž¼"
++=======
+ msgstr ""
+
+ #: share/lua/http/dialogs/create_stream.html:303
+ msgid "Video scale"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:330
#: share/lua/http/dialogs/create_stream.html:374
msgid "Output port"
++<<<<<<< HEAD
+msgstr "ច្រក​លទ្ធផល"
+
+#: share/lua/http/dialogs/create_stream.html:338
+msgid "Output\tfile"
+msgstr "លទ្ធផល\tឯកសារ"
+
+#: share/lua/http/dialogs/create_stream.html:355
+msgid "Input media"
+msgstr "មáŸážŒáŸ€â€‹áž”ញ្ចូល"
++=======
+ msgstr ""
+
+ #: share/lua/http/dialogs/create_stream.html:338
+ msgid "Output\tfile"
+ msgstr ""
+
+ #: share/lua/http/dialogs/create_stream.html:355
+ msgid "Input media"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:367
msgid "Error:"
@@@ -27575,7 -27392,7 +30658,11 @@@ msgstr "គំរូ​រចនាបá
#: share/lua/http/dialogs/create_stream.html:390
msgid "File name"
++<<<<<<< HEAD
+msgstr "ឈ្មោះ​ឯកសារ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/equalizer_window.html:49
#: share/lua/http/mobile_equalizer.html:62
@@@ -27584,11 -27401,11 +30671,19 @@@ msgstr "អាំភ្លី​អáŸá
#: share/lua/http/dialogs/mosaic_window.html:104
msgid "Row border"
++<<<<<<< HEAD
+msgstr "ស៊ុម​ជួរដáŸáž€"
+
+#: share/lua/http/dialogs/mosaic_window.html:122
+msgid "Column border"
+msgstr "ស៊ុម​ជួរឈរ"
++=======
+ msgstr ""
+
+ #: share/lua/http/dialogs/mosaic_window.html:122
+ msgid "Column border"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/mosaic_window.html:133
msgid "Background"
@@@ -27621,23 -27438,23 +30716,43 @@@ msgstr "កម្មវិធី​ចá
#: share/lua/http/index.html:215
msgid "Hide / Show Library"
++<<<<<<< HEAD
+msgstr "បង្ហាញ/លាក់​បណ្ណាលáŸáž™"
+
+#: share/lua/http/index.html:216
+msgid "Hide / Show Viewer"
+msgstr "បង្ហាញ/លាក់​កម្មវិធី​មើល"
+
+#: share/lua/http/index.html:217
+msgid "Manage Streams"
+msgstr "គ្រប់គ្រង​ស្ទ្រីម"
+
+#: share/lua/http/index.html:218
+msgid "Track Synchronisation"
+msgstr "ការ​ធ្វើ​សមកាលកម្ម​បទ"
+
+#: share/lua/http/index.html:220
+msgid "VLM Batch Commands"
+msgstr "ពាក្យ​បញ្ជា​បាច់ VLM"
++=======
+ msgstr ""
+
+ #: share/lua/http/index.html:216
+ msgid "Hide / Show Viewer"
+ msgstr ""
+
+ #: share/lua/http/index.html:217
+ msgid "Manage Streams"
+ msgstr ""
+
+ #: share/lua/http/index.html:218
+ msgid "Track Synchronisation"
+ msgstr ""
+
+ #: share/lua/http/index.html:220
+ msgid "VLM Batch Commands"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:240 modules/gui/qt4/ui/vlm.h:298
msgid "Loop"
@@@ -27645,19 -27462,19 +30760,35 @@@ msgstr "រង្វិល​ជុំ
#: share/lua/http/index.html:242
msgid "Empty Playlist"
++<<<<<<< HEAD
+msgstr "បញ្ជី​ចាក់​ទទáŸ"
+
+#: share/lua/http/index.html:243
+msgid "Queue Selected"
+msgstr "បាន​ជ្រើស​ជួរ"
+
+#: share/lua/http/index.html:244
+msgid "Play Selected"
+msgstr "បាន​ជ្រើស​ចាក់"
+
+#: share/lua/http/index.html:245
+msgid "Refresh List"
+msgstr "ផ្ទុក​បញ្ជី​ឡើងវិញ"
++=======
+ msgstr ""
+
+ #: share/lua/http/index.html:243
+ msgid "Queue Selected"
+ msgstr ""
+
+ #: share/lua/http/index.html:244
+ msgid "Play Selected"
+ msgstr ""
+
+ #: share/lua/http/index.html:245
+ msgid "Refresh List"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:252
msgid "Loading flowplayer..."
@@@ -27710,7 -27527,7 +30841,11 @@@ msgstr "ដើម្បី​បញ្á
#: share/lua/http/index.html:278
msgid "Are you sure you wish to create the stream?"
++<<<<<<< HEAD
+msgstr "ážáž¾â€‹áž¢áŸ’នក​ពិážáž‡áž¶â€‹áž…ង់​បង្កើážâ€‹ážŸáŸ’ទ្រីម​មែន​ឬ?"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/about.h:287 modules/gui/qt4/ui/open.h:242
#: modules/gui/qt4/ui/podcast_configuration.h:100
@@@ -27719,7 -27536,7 +30854,11 @@@ msgstr "ប្រអប់
#: modules/gui/qt4/ui/about.h:288 modules/gui/qt4/ui/about.h:289
msgid "Update"
++<<<<<<< HEAD
+msgstr "ធ្វើ​បច្ចុប្បន្នភាព"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/equalizer.h:132 modules/gui/qt4/ui/open_disk.h:296
#: modules/gui/qt4/ui/open_net.h:96 modules/gui/qt4/ui/sprefs_audio.h:411
@@@ -27736,15 -27553,15 +30875,27 @@@ msgstr "ការ​កំណážáŸ‹â€‹á
#: modules/gui/qt4/ui/equalizer.h:137
msgid "0.00 dB"
++<<<<<<< HEAD
+msgstr "0.00 dB"
+
+#: modules/gui/qt4/ui/messages_panel.h:139
+msgid "&Verbosity:"
+msgstr "បរិយាយ៖"
+
+#: modules/gui/qt4/ui/messages_panel.h:140
+msgid "&Filter:"
+msgstr "ážáž˜áŸ’រង៖"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/ui/messages_panel.h:139
+ msgid "&Verbosity:"
+ msgstr ""
+
+ #: modules/gui/qt4/ui/messages_panel.h:140
+ msgid "&Filter:"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/messages_panel.h:141
msgid "&Save as..."
@@@ -27860,11 -27677,11 +31011,19 @@@ msgstr "អូឌីយ៉ូ និង
#: modules/gui/qt4/ui/open_file.h:143
msgid "Use a sub&title file"
++<<<<<<< HEAD
+msgstr "ប្រើ​ឯកសារ​ចំណងជើង​រង"
+
+#: modules/gui/qt4/ui/open_file.h:145
+msgid "Select the subtitle file"
+msgstr "ជ្រើស​ឯកសារ​ចំណងជើង​រង"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/ui/open_file.h:145
+ msgid "Select the subtitle file"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/open_file.h:149
msgid "Choose one or more media file to open"
@@@ -27892,7 -27709,7 +31051,11 @@@ msgstr "សូម​បញ្ចូល
#: modules/gui/qt4/ui/profiles.h:686
msgid "Profile edition"
++<<<<<<< HEAD
+msgstr "កំណែ​ប្រវážáŸ’ážáž·ážšáž¼áž”"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:687
msgid "MPEG-TS"
@@@ -27948,23 -27765,23 +31111,43 @@@ msgstr "AVI
#: modules/gui/qt4/ui/profiles.h:700
msgid "Features"
++<<<<<<< HEAD
+msgstr "លក្ážážŽáŸˆ"
+
+#: modules/gui/qt4/ui/profiles.h:702
+msgid "Streamable"
+msgstr "អាច​ស្ទ្រីម​បាន"
+
+#: modules/gui/qt4/ui/profiles.h:703
+msgid "Chapters"
+msgstr "ជំពូក"
+
+#: modules/gui/qt4/ui/profiles.h:706
+msgid "Menus"
+msgstr "ម៉ឺនុយ"
+
+#: modules/gui/qt4/ui/profiles.h:714
+msgid "Same as source"
+msgstr "ដូច​ប្រភព"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/ui/profiles.h:702
+ msgid "Streamable"
+ msgstr ""
+
+ #: modules/gui/qt4/ui/profiles.h:703
+ msgid "Chapters"
+ msgstr ""
+
+ #: modules/gui/qt4/ui/profiles.h:706
+ msgid "Menus"
+ msgstr ""
+
+ #: modules/gui/qt4/ui/profiles.h:714
+ msgid "Same as source"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:716
msgid " fps"
@@@ -27972,15 -27789,15 +31155,27 @@@ msgstr " fps
#: modules/gui/qt4/ui/profiles.h:717
msgid "Custom options"
++<<<<<<< HEAD
+msgstr "ជម្រើស​ផ្ទាល់ážáŸ’លួន"
+
+#: modules/gui/qt4/ui/profiles.h:718
+msgid "Quality"
+msgstr "គុណភាព"
+
+#: modules/gui/qt4/ui/profiles.h:719 modules/gui/qt4/ui/profiles.h:720
+msgid "Not Used"
+msgstr "មិន​បាន​ប្រើ"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/ui/profiles.h:718
+ msgid "Quality"
+ msgstr ""
+
+ #: modules/gui/qt4/ui/profiles.h:719 modules/gui/qt4/ui/profiles.h:720
+ msgid "Not Used"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:721 modules/gui/qt4/ui/profiles.h:740
msgid " kb/s"
@@@ -27988,15 -27805,15 +31183,27 @@@ msgstr " kb/s
#: modules/gui/qt4/ui/profiles.h:722 modules/gui/qt4/ui/profiles.h:742
msgid "Encoding parameters"
++<<<<<<< HEAD
+msgstr "ប៉ារ៉ាម៉ែážáŸ’រ​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠ"
+
+#: modules/gui/qt4/ui/profiles.h:725
+msgid "Frame size"
+msgstr "ទំហំ​ស៊ុម"
+
+#: modules/gui/qt4/ui/profiles.h:728 modules/gui/qt4/ui/profiles.h:731
+msgid "px"
+msgstr "ភីកសែល"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/ui/profiles.h:725
+ msgid "Frame size"
+ msgstr ""
+
+ #: modules/gui/qt4/ui/profiles.h:728 modules/gui/qt4/ui/profiles.h:731
+ msgid "px"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:741
msgid "Sample Rate"
@@@ -28004,7 -27821,7 +31211,11 @@@ msgstr "អážáŸ’រា​គំរូ
#: modules/gui/qt4/ui/sout.h:203
msgid "Set up media sources to stream"
++<<<<<<< HEAD
+msgstr "កំណážáŸ‹â€‹áž”្រភព​មáŸážŒáŸ€â€‹ážŠáž¾áž˜áŸ’បី​ស្ទ្រីម"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sout.h:205
msgid "Destination Setup"
@@@ -28012,7 -27829,7 +31223,11 @@@ msgstr "ការ​រៀបចំ​á
#: modules/gui/qt4/ui/sout.h:206
msgid "Select destinations to stream to"
++<<<<<<< HEAD
+msgstr "ជ្រើស​ទិសដៅ​ដែល​ážáŸ’រូវ​ស្ទ្រីម​ទៅ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sout.h:207
msgid ""
@@@ -28032,11 -27849,11 +31247,19 @@@ msgstr "បង្ហាញ​ក្នá
#: modules/gui/qt4/ui/sout.h:212
msgid "Transcoding Options"
++<<<<<<< HEAD
+msgstr "ជម្រើស​បម្លែង​ážáŸ’រឡប់"
+
+#: modules/gui/qt4/ui/sout.h:213
+msgid "Select and choose transcoding options"
+msgstr "ជ្រើស​ជម្រើស​បម្លែង​ážáŸ’រឡប់"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/ui/sout.h:213
+ msgid "Select and choose transcoding options"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sout.h:214
msgid "Activate Transcoding"
@@@ -28048,7 -27865,7 +31271,11 @@@ msgstr "ការ​រៀបចំ​á
#: modules/gui/qt4/ui/sout.h:216
msgid "Set up any additional options for streaming"
++<<<<<<< HEAD
+msgstr "រៀបចំ​ជម្រើស​បន្ážáŸ‚ម​សម្រាប់​ការ​ស្ទ្រីម"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sout.h:217
msgid "Miscellaneous Options"
@@@ -28124,7 -27941,7 +31351,11 @@@ msgstr "ការ​កំណážáŸ‹â€‹á
#: modules/gui/qt4/ui/sprefs_input.h:344
msgid "Hardware-accelerated decoding"
++<<<<<<< HEAD
+msgstr "ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž•áŸ’នែក​រឹង​ដែល​បាន​បន្ážáŸ‚ម​ល្បឿន"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_input.h:345
msgid "Skip H.264 in-loop deblocking filter"
@@@ -28204,7 -28021,7 +31435,11 @@@ msgstr "ផ្អាក​ការ​á
#: modules/gui/qt4/ui/sprefs_interface.h:524
msgid "Show media change popup:"
++<<<<<<< HEAD
+msgstr "បង្ហាញ​ប្រអប់​លáŸáž…ឡើង​នៃ​ការ​ផ្លាស់ប្ដូរ​មáŸážŒáŸ€áŸ–"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:525
msgid "Start in minimal view mode"
@@@ -28228,7 -28045,7 +31463,11 @@@ msgstr "ឯកសារ​ធនធាá
#: modules/gui/qt4/ui/sprefs_interface.h:531
msgid "Playlist and Instances"
++<<<<<<< HEAD
+msgstr "ធាážáž» និង​បញ្ជី​ចាក់"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:532
msgid "Album art download policy:"
@@@ -28264,7 -28081,7 +31503,11 @@@ msgstr "ធ្វើ​ឲ្យ​កá
#: modules/gui/qt4/ui/sprefs_interface.h:548
msgid "Operating System Integration"
++<<<<<<< HEAD
+msgstr "ការ​បញ្ចូល​ប្រពáŸáž“្ធ​ប្រážáž·áž”ážáŸ’ážáž·áž€áž¶ážš"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:549
msgid "File extensions association"
@@@ -28284,11 -28101,11 +31527,19 @@@ msgstr "បង្ហាញ​ចំណá
#: modules/gui/qt4/ui/sprefs_subtitles.h:290
msgid "Enable subtitles"
++<<<<<<< HEAD
+msgstr "បើក​ចំណងជើង​រង"
+
+#: modules/gui/qt4/ui/sprefs_subtitles.h:291
+msgid "Subtitle Language"
+msgstr "ភាសា​ចំណងជើង​រង"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:291
+ msgid "Subtitle Language"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:293
msgid "Default encoding"
@@@ -28296,7 -28113,7 +31547,11 @@@ msgstr "ការ​អ៊ិនកូá
#: modules/gui/qt4/ui/sprefs_subtitles.h:294
msgid "Subtitle effects"
++<<<<<<< HEAD
+msgstr "បែបផែន​ចំណងជើង​រង"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:300
msgid "Add a shadow"
@@@ -28408,7 -28225,7 +31663,11 @@@ msgstr "កំពុង​ដំណើá
#: modules/gui/qt4/ui/update.h:150
msgid "Do you want to download it?"
++<<<<<<< HEAD
+msgstr "ážáž¾â€‹áž¢áŸ’នក​ចង់​ទាញ​យក​វា​ឬ?"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/video_effects.h:1315
msgid "Essential"
@@@ -28498,7 -28315,7 +31757,11 @@@ msgstr "កញ្ចក់
#: modules/gui/qt4/ui/video_effects.h:1400
msgid "Anaglyph 3D"
++<<<<<<< HEAD
+msgstr "Anaglyph 3D"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:286
msgid "VLM configurator"
@@@ -28548,6 -28365,9 +31811,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "បញ្ជី​គ្រប់គ្រង​មáŸážŒáŸ€"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "បង្ហាញសáŸáž…ក្ážáž¸â€‹â€‹â€‹áž›áž˜áŸ’អិáž"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -28667,12 -28487,27 +31936,33 @@@
#~ msgid "Modules search path"
#~ msgstr "ផ្លូវ​ស្វែងរក​ម៉ូឌុល"
++<<<<<<< HEAD
++=======
+ #~ msgid "One instance when started from file"
+ #~ msgstr "ážœážáŸ’ážáž»â€‹áž˜áž½áž™â€‹áž“ៅ​ពáŸáž›â€‹áž”ាន​ចាប់ផ្ដើម​ពី​ឯកសារ"
+
+ #~ msgid "Enqueue items to playlist when in one instance mode"
+ #~ msgstr "ដាក់​ធាážáž»â€‹áž‡áž¶â€‹áž‡áž½ážšâ€‹áž‘ៅកាន់​បញ្ជី​ចាក់​ពáŸáž›â€‹áž“ៅ​ក្នុង​របៀប​វážáŸ’ážáž»â€‹ážŽáž¶áž˜áž½áž™"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Raise the interface above all other windows."
#~ msgstr "ដាក់​ចំណុច​ប្រទាក់​នៅ​ពីលើ​បង្អួច​ផ្សáŸáž„​ទាំងអស់ ។"
#~ msgid "Lower the interface below all other windows."
#~ msgstr "ដាក់​ចំណុច​ប្រទាក់​នៅ​ពីក្រោម​បង្អួច​ផ្សáŸáž„ទៀážâ€‹áž‘ាំងអស់ ។"
++<<<<<<< HEAD
++=======
+ #~ msgid "Normal/Repeat/Loop"
+ #~ msgstr "ធម្មážáž¶/ចាក់​ឡើងវិញ/រង្វិល​ជុំ"
+
+ #~ msgid "Toggle Normal/Repeat/Loop playlist modes"
+ #~ msgstr "បិទ​បើក​របៀប​បញ្ជី​ចាក់ ធម្មážáž¶/ចាក់​ឡើងវិញ/រង្វិល​ជុំ"
+
+ #~ msgid "Display OSD menu on top of video output"
+ #~ msgstr "បង្ហាញ​ម៉ឺនុយ OSD នៅ​ផ្នែក​ážáž¶áž„លើ​នៃ​លទ្ធផល​វីដáŸáž¢áž¼"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Do not display OSD menu on top of video output"
#~ msgstr "កុំ​បង្ហាញ​ម៉ឺនុយ OSD នៅ​ផ្នែក​ážáž¶áž„លើ​នៃ​លទ្ធផល​វីដáŸáž¢áž¼"
@@@ -28771,9 -28606,40 +32061,46 @@@
#~ msgid "PCM F64 BE"
#~ msgstr "PCM F64 BE"
++<<<<<<< HEAD
+#~ msgid "BluRay"
+#~ msgstr "BluRay"
+
++=======
+ #~ msgid "Blu-Ray Disc Input"
+ #~ msgstr "áž–áŸážáŸŒáž˜áž¶áž“​បញ្ចូល​ážáž¶ážŸ Blu-Ray"
+
+ #~ msgid "Bluray menus"
+ #~ msgstr "ម៉ឺនុយ Bluray"
+
+ #~ msgid "Use bluray menus. If disabled, the movie will start directly"
+ #~ msgstr "ប្រើ​ម៉ឺនុយ bluray ។ ប្រសិនបើ​បិទ ភាពយន្ážâ€‹áž“ឹង​ចាប់ផ្ដើម​ដោយ​ផ្ទាល់"
+
+ #~ msgid "BluRay"
+ #~ msgstr "BluRay"
+
+ #~ msgid "Blu-Ray Disc support (libbluray)"
+ #~ msgstr "គាំទ្រ​ážáž¶ážŸ Blu-Ray (libbluray)"
+
+ #~ msgid ""
+ #~ "This Blu-Ray Disc needs a library for AACS decoding, and your system does "
+ #~ "not have it."
+ #~ msgstr "ážáž¶ážŸ Blu-Ray ážáŸ’រូវ​ការ​​បណ្ណាលáŸáž™â€‹ážŸáž˜áŸ’រាប់​ការ​ឌិកូដ AACS ប្រពáŸáž“្ធ​របស់​អ្នក​គ្មាន​វា​ឡើយ ។"
+
+ #~ msgid ""
+ #~ "This Blu-Ray Disc needs a library for BD+ decoding, and your system does "
+ #~ "not have it."
+ #~ msgstr "ážáž¶ážŸ Blu-Ray ážáŸ’រូវ​ការ​បណ្ណាលáŸáž™â€‹ážŸáž˜áŸ’រាប់ BD+ ការ​ឌិកូដ ប្រពáŸáž“្ធ​របស់​អ្នក​គ្មាន​វា​ឡើយ ។"
+
+ #~ msgid "Blu-Ray error"
+ #~ msgstr "កំហុស Blu-Ray"
+
+ #~ msgid "collapse"
+ #~ msgstr "ážœáŸáž‰"
+
+ #~ msgid "expand"
+ #~ msgstr "ពង្រីក"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Teapot"
#~ msgstr "ប៉ាន់​ážáŸ‚"
@@@ -28906,6 -28772,43 +32233,46 @@@
#~ msgid "AltiVec memcpy"
#~ msgstr "AltiVec memcpy"
++<<<<<<< HEAD
++=======
+ #~ msgid "TCP address to use (default localhost)"
+ #~ msgstr "អាសយដ្ឋាន TCP ដែល​ážáŸ’រូវ​ប្រើ (លំនាំដើម localhost)"
+
+ #~ msgid ""
+ #~ "TCP address to use to communicate with the video part of the Bar Graph "
+ #~ "(default localhost).In the case of bargraph incrustation, use localhost."
+ #~ msgstr ""
+ #~ "អាសយដ្ឋាន TCP ដែល​ážáŸ’រូវ​ប្រើ​ដើម្បី​ទាក់ទង​ជាមួយ​ផ្នែក​វីដáŸáž¢áž¼â€‹áž“ៃ​ក្រាហ្វិក​របារ (លំនាំដើម "
+ #~ "localhost) ។ ក្នុង​ករណី​មាន​ការ​ហ៊ុមពáŸáž‘្ធ​​ក្រាហ្វិក​របារ សូម​ប្រើ localhost ។"
+
+ #~ msgid ""
+ #~ "TCP port to use to communicate with the video part of the Bar Graph "
+ #~ "(default 12345).Use the same port as the one used in the rc interface."
+ #~ msgstr ""
+ #~ "ច្រក TCP ដែល​ážáŸ’រូវ​ប្រើ​ដើម្បី​ទាក់ទង​ជា​មួយ​ផ្នែក​វីដáŸáž¢áž¼â€‹áž“ៃ​ក្រាហ្វិក​របារ (លំនាំដើម ១២៣៤៥) ។ ប្រើ​ច្រក​"
+ #~ "ដូចគ្នា​ទៅ​នឹង​ការ​ប្រើ​នៅ​ក្នុង​ចំណុចប្រទាក់ rc ។"
+
+ #~ msgid "Time window to use in ms (default 5000)"
+ #~ msgstr "បង្អួច​ពáŸáž›ážœáŸáž›áž¶â€‹ážŠáŸ‚ល​ážáŸ’រូវ​ប្រើ​គិážáž‡áž¶â€‹ មិ.វិ. (លំនាំដើម ៥០០០)"
+
+ #~ msgid "Minimum Audio level to raise the alarm (default 0.1)"
+ #~ msgstr "កម្រិážâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼â€‹áž¢áž”្បបរមា​ដែល​ážáŸ’រូវ​ឡើង​ដល់​ការ​ជូនដំណឹង (លំនាំដើម ០.១)"
+
+ #~ msgid "Force connection reset regularly (default 1)"
+ #~ msgstr "បង្ážáŸ†â€‹áž€áŸ†ážŽážáŸ‹â€‹áž€áž¶ážšâ€‹ážáž—្ជាប់​ឡើងវិញ​យ៉ាង​ទៀងទាážáŸ‹ (លំនាំដើម ១)"
+
+ #~ msgid "Feedback Gain"
+ #~ msgstr "ការ​ទទួល​បាន​មážáž·áž™áŸ„បល់"
+
+ #~ msgid ""
+ #~ "Channels available for audio output.If the input has more channels than "
+ #~ "the output, it will be down-mixed.This parameter is ignored when digital "
+ #~ "pass-through is active."
+ #~ msgstr ""
+ #~ "មាន​ឆានែល​សម្រាប់​អូឌីយ៉ូ​ចáŸáž‰ ។ ប្រសិនបើ​អូឌីយ៉ូ​ចូល​មាន​ច្រើន​ជាង​ឆានែល​អូឌីយ៉ូ​ចáŸáž‰ វា​នឹង​ážáŸ’រូវ​បាន​លាយ ។ កុំ​"
+ #~ "អើពើ​ប៉ារ៉ាម៉ែážáŸ’រ​នáŸáŸ‡ នៅ​ពáŸáž›â€‹ážŒáž¸áž‡áž¸ážáž›â€‹ážŸáž€áž˜áŸ’ម ។"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Choose a number corresponding to the number of an audio device, as listed "
#~ "in your 'Audio Device' menu. This device will then be used by default for "
@@@ -28914,6 -28817,13 +32281,16 @@@
#~ "ជ្រើស​លáŸážâ€‹ážŠáŸ‚ល​ទាក់ទង​នឹង​ចំនួន​ឧបករណáŸâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼ ដូច​ដែល​បាន​រាយ​នៅ​ក្នុង​ម៉ឺនុយ 'ឧបករណáŸâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼' របស់​អ្នក ។ ឧបករណáŸâ€‹"
#~ "áž“áŸáŸ‡â€‹áž“ឹង​ážáŸ’រូវ​បាន​ប្រើ​ជា​លំនាំដើម​សម្រាប់​ការ​ចាក់​សារ​អូឌីយ៉ូ​សារ​ážáŸ’មី ។"
++<<<<<<< HEAD
++=======
+ #~ msgid ""
+ #~ "You should configure your speaker layout with the \"Audio Midi Setup\" "
+ #~ "utility in /Applications/Utilities. Stereo mode is being used now."
+ #~ msgstr ""
+ #~ "អ្នក​គួរážáŸ‚​កំណážáŸ‹â€‹ážšáž…នា​សម្ពáŸáž“្ធ​ប្លង់​ធុងបាស​របស់​អ្នក​ជាមួយ​នឹង \"រៀបចំ​មីឌី​អូឌីយ៉ូ\" នៅ​ក្នុង /Applications/"
+ #~ "Utilities ។ ឥឡូវ​កំពុង​ប្រើ​របៀប​ស្ážáŸážšáŸ‰áŸáž¢áž¼ ។"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "3 Front 2 Rear"
#~ msgstr "ážáž¶áž„មុហ៣ ážáž¶áž„ក្រោយ ២"
@@@ -28929,11 -28839,61 +32306,79 @@@
#~ msgid "5.1"
#~ msgstr "៥.១"
++<<<<<<< HEAD
++=======
+ #~ msgid "Win32 waveOut extension output"
+ #~ msgstr "លទ្ធផល​ផ្នែក​បន្ážáŸ‚ម Win32 waveOut"
+
+ #~ msgid ""
+ #~ "FFmpeg can do error resilience.\n"
+ #~ "However, with a buggy encoder (such as the ISO MPEG-4 encoder from M$) "
+ #~ "this can produce a lot of errors.\n"
+ #~ "Valid values range from 0 to 4 (0 disables all errors resilience)."
+ #~ msgstr ""
+ #~ "FFmpeg អាច​ធ្វើឲ្យ​មាន​កំហុស​ការ​បážáŸ‹áž”ែន ។\n"
+ #~ "ទោះ​ជា​យ៉ាងណា ជា​មួយ​នឹង​​អ៊ិនកូឌáŸážšâ€‹áž€áŸ†áž ុស (ដូច​ជា​អ៊ិនកូឌáŸážš ISO MPEG-4 ពី M$) វា​អាច​បង្កើážâ€‹áž€áŸ†áž ុស​ជា​ច្រើន "
+ #~ "។\n"
+ #~ "ជួរ​ážáž˜áŸ’លៃ​ដែល​ážáŸ’រឹមážáŸ’រូវ​គឺ​ពី ០ទៅ ៤ (០បិទ​កំហុស​បážáŸ‹áž”ែន​ទាំងអស់) ។"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Only decode a low resolution version of the video. This requires less "
#~ "processing power"
#~ msgstr "ឌិកូដ​ážáŸ‚​កំណែ​គុណភាព​បង្ហាញ​ទាប​របស់​វីដáŸáž¢áž¼â€‹áž”៉ុណ្ណោះ ។ វា​ážáŸ’រូវការ​ážáž¶áž˜áž–ល​ដំណើរការ​ážáž·áž…"
++<<<<<<< HEAD
++#~ msgid "Jointly optimize both MVs in B-frames"
++#~ msgstr "បង្កើន​ប្រសិទ្ធភាព​រួមគ្នា​ MV ទាំង​ពី​នៅ​ក្នុង B-frames"
++
++#~ msgid ""
++#~ "Tune the settings for a particular type of source or situation. "
++#~ "Overridden by user settings."
++#~ msgstr ""
++#~ "បើក​ការ​កំណážáŸ‹â€‹ážŸáž˜áŸ’រាប់​ប្រភáŸáž‘​ជាក់លាក់​របស់​ប្រភព ឬ​ស្ážáž¶áž“ការណ០។ បាន​បដិសáŸáž’​ដោយ​ការកំណážáŸ‹â€‹ážšáž”ស់​អ្នកប្រើ ។"
++
++#~ msgid "Use preset as default settings. Overridden by user settings."
++#~ msgstr "ប្រើ​ការ​កំណážáŸ‹â€‹ážŸáŸ’ážšáŸáž…​ជា​លំនាំដើម ។ បាន​បដិសáŸáž’​ដោយ​ការកំណážáŸ‹â€‹ážšáž”ស់​អ្នកប្រើ ។"
++
++#~ msgid "fast"
++=======
+ #~ msgid ""
+ #~ "Specify the AAC audio profile to use for encoding the audio bitstream. It "
+ #~ "takes the following options: main, low, ssr (not supported) and ltp "
+ #~ "(default: main)"
+ #~ msgstr ""
+ #~ "បញ្ជាក់​ទម្រង់​អូឌីយ៉ូ AAC ដែល​ážáŸ’រូវ​ប្រើ​សម្រាប់​ការ​អ៊ិនកូដ​ស្ទ្រីម​ប៊ីážâ€‹ážšáž”ស់​អូឌីយ៉ូ ។ វា​​នឹង​យក​ជម្រើស​ដូច​ážáž¶áž„ក្រោម "
+ #~ "៖ main, low, ssr (មិន​គាំទ្រ) និង ltp (លំនាំដើម ៖ main)"
+
+ #~ msgid ""
+ #~ "It seems your FFMPEG (libavcodec) installation lacks the following "
+ #~ "encoder:\n"
+ #~ "%s.\n"
+ #~ "If you don't know how to fix this, ask for support from your "
+ #~ "distribution.\n"
+ #~ "\n"
+ #~ "This is not an error inside VLC media player.\n"
+ #~ "Do not contact the VideoLAN project about this issue.\n"
+ #~ msgstr ""
+ #~ "វា​ហាក់​ដូចជា​ការ​ដំឡើង FFMPEG (libavcodec) របស់​អ្នក ážáŸ’វះ​អ៊ិនកូឌáŸážšâ€‹ážŠáž¼áž…ážáž¶áž„ក្រោម ៖\n"
+ #~ "%s.\n"
+ #~ "ប្រសិន​បើ​អ្នក​មិន​ដឹង​ពី​របៀប​ជួសជុល​វា​ទ០សូម​សួររក​ការ​ជួយ​គាំទ្រ​ពី​អ្នក​ចែកចាយ​របស់​អ្នក ។\n"
+ #~ "\n"
+ #~ "វា​មិនមែន​ជា​កំហុស​នៅ​ក្នុង​កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC ទ០។\n"
+ #~ "សូម​កុំ​ទាក់ទង​ទៅកាន់​គម្រោង VideoLAN អំពី​បញ្ហា​នáŸáŸ‡â€‹áž¢áž¸ ។\n"
+
+ #~ msgid ""
+ #~ "This enables automatic detection of UTF-8 encoding within subtitles files."
+ #~ msgstr "វា​អនុញ្ញាážâ€‹áž€áž¶ážšâ€‹ážšáž€â€‹ážƒáž¾áž‰â€‹ážŸáŸ’ážœáŸáž™áž”្រវážáŸ’ážáž·â€‹ážšáž”ស់​ការ​អ៊ិនកូដ UTF-8 នៅ​ក្នុង​ឯកសារ​ចំណងជើង​រង ។"
+
+ #~ msgid ""
+ #~ "Sets maximum interval between IDR-frames.Larger values save bits, thus "
+ #~ "improving quality for a given bitrate at the cost of seeking precision."
+ #~ msgstr ""
+ #~ "កំណážáŸ‹â€‹áž…ន្លោះ​ពáŸáž›â€‹áž¢ážáž·áž”រមា រវាង IDR-frames ។ ážáž˜áŸ’លៃ​ដែល​ធំ​នឹង​រក្សាទុក​ជា​ប៊ីហដូច្នáŸáŸ‡â€‹áž€áž¶ážšâ€‹áž”ង្កើន​"
+ #~ "គុណភាព​សម្រាប់​អážáŸ’រាប៊ីážâ€‹ážŠáŸ‚ល​បាន​ផ្ដល់ នៅ​ážáž˜áŸ’លៃ​របស់​ភាព​ážáŸ’រឹមážáŸ’រូវ​នៃ​ការ​ស្វែងរក ។"
+
#~ msgid "Jointly optimize both MVs in B-frames"
#~ msgstr "បង្កើន​ប្រសិទ្ធភាព​រួមគ្នា​ MV ទាំង​ពី​នៅ​ក្នុង B-frames"
@@@ -28947,11 -28907,17 +32392,21 @@@
#~ msgstr "ប្រើ​ការ​កំណážáŸ‹â€‹ážŸáŸ’ážšáŸáž…​ជា​លំនាំដើម ។ បាន​បដិសáŸáž’​ដោយ​ការកំណážáŸ‹â€‹ážšáž”ស់​អ្នកប្រើ ។"
#~ msgid "fast"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgstr "លឿន​"
#~ msgid "slow"
#~ msgstr "យឺážâ€‹"
++<<<<<<< HEAD
++=======
+ #~ msgid "temporal"
+ #~ msgstr "លោកិយ"
+
+ #~ msgid "H.264/MPEG4 AVC encoder (x264)"
+ #~ msgstr "អ៊ិនកូឌáŸážš H.264/MPEG4 AVC (x264)"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Use the rotate video filter instead of transform"
#~ msgstr "ប្រើ​ážáž˜áŸ’រង​វីដáŸáž¢áž¼â€‹áž”ង្វិល​ជំនួស​ការ​ប្លែង"
@@@ -28997,13 -28963,47 +32452,56 @@@
#~ msgid "| @name mosaic-keep-aspect-ratio {0,1} . . .aspect ratio"
#~ msgstr "| @name mosaic-keep-aspect-ratio {0,1} . . .សមាមាážáŸ’ážš"
++<<<<<<< HEAD
+#~ msgid "Please provide one of the following parameters:"
+#~ msgstr "សូម​ផ្ដល់​នូវ​ប៉ារ៉ាម៉ែážáŸ’រ​មួយ​ដូច​ážáž¶áž„ក្រោម​ ៖"
+
++=======
+ #~ msgid "Playlist has only %d elements"
+ #~ msgstr "បញ្ជី​ចាក់​មានážáŸ‚​ធាážáž» %d ប៉ុណ្ណោះ"
+
+ #~ msgid "Please provide one of the following parameters:"
+ #~ msgstr "សូម​ផ្ដល់​នូវ​ប៉ារ៉ាម៉ែážáŸ’រ​មួយ​ដូច​ážáž¶áž„ក្រោម​ ៖"
+
+ #~ msgid ""
+ #~ "Because this AVI file index is broken or missing, seeking will not work "
+ #~ "correctly.\n"
+ #~ "VLC won't repair your file but can temporary fix this problem by building "
+ #~ "an index in memory.\n"
+ #~ "This step might take a long time on a large file.\n"
+ #~ "What do you want to do ?"
+ #~ msgstr ""
+ #~ "ដោយសារážáŸ‚​លិបិក្រម​​ឯកសារ​នáŸáŸ‡â€‹â€‹ážáž¼áž… ឬ​បាážáŸ‹ ធ្វើឲ្យ​ការ​ស្វែងរក​មិន​ដំណើរការ​ážáŸ’រឹមážáŸ’រូវ​ឡើយ ។\n"
+ #~ "VLC នឹង​​មិន​ជួសជុល​ឯកសារ​របស់​អ្នក​ទ០ប៉ុន្ážáŸ‚​​វា​អាច​ជួសជុល​បញ្ហា​នáŸáŸ‡â€‹áž‡áž¶â€‹áž”ណ្ដោះ​អាសន្ន​បាន ដោយ​ការ​បង្កើážâ€‹"
+ #~ "លិបិក្រម​នៅ​ក្នុង​អង្គ​ចងចាំ ។\n"
+ #~ "ជំហាន​នáŸáŸ‡â€‹áž¢áž¶áž…​ប្រើ​ពáŸáž›ážœáŸáž›áž¶â€‹áž…្រើន​ចំពោះ​ឯកសារ​ដែល​មាន​ទំហំ​ធំ ។\n"
+ #~ "ážáž¾â€‹áž¢áŸ’នក​ចង់​ធ្វើ​អ្វី ?"
+
+ #~ msgid "Christian rap"
+ #~ msgstr "Christian rap"
+
+ #~ msgid "Pop/funk"
+ #~ msgstr "Pop/funk"
+
+ #~ msgid "Rock & roll"
+ #~ msgstr "រ៉ក់ ážáž·áž“ រ៉ូល"
+
+ #~ msgid "Hard rock"
+ #~ msgstr "Hard rock"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Make"
#~ msgstr "បង្កើáž"
#~ msgid ""
++<<<<<<< HEAD
++=======
+ #~ "This is the desired frame rate when playing raw video streams. In the "
+ #~ "form 30000/1001 or 29.97"
+ #~ msgstr "áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž¢ážáŸ’រា​ស៊ុម​ដែល​ចង់​បាន​នៅ​ពáŸáž›â€‹áž…ាក់​ស្ទ្រីម​វីដáŸáž¢áž¼â€‹ážŠáž¾áž˜ ។ ក្នុង​ទម្រង់ 30000/1001 ឬ 29.97"
+
+ #~ msgid ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "Force the subtiles format. Valid values are : \"microdvd\", \"subrip\", "
#~ "\"subviewer\", \"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\", \"sami\", "
#~ "\"dvdsubtitle\", \"mpl2\", \"aqt\", \"pjs\", \"mpsub\", \"jacosub\", \"psb"
@@@ -29055,6 -29055,18 +32553,21 @@@
#~ msgstr ""
#~ "រូបភាព និង​អážáŸ’ážáž”ទ​ដែល​បាន​បង្ហាញ​ទាំងអស់ នឹង​ážáŸ’រូវ​បាន​បង្ហាញ​​នៅ​លើ framebuffer ážáŸ’ážšáž½ážâ€‹áž‚្នា ។"
++<<<<<<< HEAD
++=======
+ #~ msgid "VLC Debug Log (%s).rtfd"
+ #~ msgstr "កំណážáŸ‹â€‹áž áŸážáž»â€‹áž”ំបាážáŸ‹â€‹áž€áŸ†áž ុស VLC (%s).rtfd"
+
+ #~ msgid "Run VLC with dark or bright interface style"
+ #~ msgstr "ដំណើរការ VLC ជាមួយ​រចនាបáŸáž‘្ម​ចំណុច​ប្រទាក់​ភ្លឺ ឬ​ងងឹáž"
+
+ #~ msgid "By default, VLC will use the dark interface style."
+ #~ msgstr "ážáž¶áž˜â€‹áž›áŸ†áž“ាំដើម VLC នឹង​ប្រើ​រចនាបáŸáž‘្ម​ចំណុច​ប្រទាក់​ងងឹហ។"
+
+ #~ msgid "Use the native fullscreen mode on OS X Lion"
+ #~ msgstr "ប្រើ​របៀប​ពáŸáž‰â€‹áž¢áŸáž€áŸ’រង់​ដើម​នៅ​លើ OS X Lion"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "This input allows you to process input signals from QuickTime-compatible "
#~ "video devices.\n"
@@@ -29075,6 -29087,49 +32588,52 @@@
#~ msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážŸáž˜áŸ’រាប់​ប្រូកស៊ី HTTP"
#~ msgid ""
++<<<<<<< HEAD
++=======
+ #~ "Extend subtitles duration by this value.\n"
+ #~ "Set 0 to disable."
+ #~ msgstr ""
+ #~ "បន្ážáž™â€‹ážšáž™áŸˆáž–áŸáž›â€‹áž…ំណងជើង​រង​ážáž¶áž˜â€‹ážáž˜áŸ’លៃ​នáŸáŸ‡ ។\n"
+ #~ "កំណážáŸ‹â€‹ážœáž¶â€‹áž‘ៅ ០ដើម្បី​បិទ ។"
+
+ #~ msgid ""
+ #~ "Multiply subtitles duration by this value.\n"
+ #~ "Set 0 to disable."
+ #~ msgstr ""
+ #~ "បន្ážáŸ‚ម​រយៈពáŸáž›â€‹áž…ំណងជើង​រង​ážáž¶áž˜â€‹ážáž˜áŸ’លៃ​នáŸáŸ‡ ។\n"
+ #~ "កំណážáŸ‹â€‹ážœáž¶â€‹áž‘ៅ ០ដើម្បី​បិទ ។"
+
+ #~ msgid ""
+ #~ "Recalculate subtitles duration according\n"
+ #~ "to their content and this value.\n"
+ #~ "Set 0 to disable."
+ #~ msgstr ""
+ #~ "គណនា​ážáž·ážšážœáŸáž›áž¶â€‹áž…ំណងជើង​រង​ឡើងវិញ\n"
+ #~ "ដោយ​ផ្អែកលើ​ážáŸ’លឹមសារ​របស់​វា និង​ážáž˜áŸ’លៃ​នáŸáŸ‡ ។\n"
+ #~ "កំណážáŸ‹â€‹ážœáž¶â€‹áž‘ៅ ០ដើម្បី​បិទ ។"
+
+ #~ msgid ""
+ #~ "The chosen codecs are not compatible with each other. For example: It is "
+ #~ "impossibleto mix uncompressed audio with any video codec.\n"
+ #~ "\n"
+ #~ "Correct your selection and try again."
+ #~ msgstr ""
+ #~ "កូដិក​ដែល​បាន​ជ្រើស​គឺ​មិន​ឆប​គ្នា​ទ០។ ឧទាហរណ០៖ វា​មិន​អាច​លាយ​អូឌីយ៉ូ​ដែល​បាន​ពន្លា ជាមួយ​កូដិក​វីដáŸáž¢áž¼â€‹"
+ #~ "បានទ០។\n"
+ #~ "\n"
+ #~ "កែ​ជម្រើស​របស់​អ្នក រួច​ព្យាយាម​ម្ដងទៀហ។"
+
+ #~ msgid "TV (digital)"
+ #~ msgstr "ទូរទស្សន០(ឌីជីážáž›)"
+
+ #~ msgid "Icon View"
+ #~ msgstr "ទិដ្ឋភាព​រូបážáŸ†ážŽáž¶áž„"
+
+ #~ msgid "Warning: the key is already assigned to \""
+ #~ msgstr "ព្រមាន ៖ គ្រាប់ចុច​គឺ​ážáŸ’រូវ​បាន​កំណážáŸ‹â€‹ážšáž½áž…ហើយ​ទៅ \""
+
+ #~ msgid ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "<p><i>VLC media player</i> does <b>not</b> send or collect any "
#~ "information, even anonymously, about your usage.</p>\n"
#~ "<p>However, it can connect to the Internet in order to display <b>medias "
@@@ -29122,6 -29177,20 +32681,23 @@@
#~ msgid " by the VideoLAN Team.\n"
#~ msgstr "ដោយ​ក្រុម VideoLAN ។\n"
++<<<<<<< HEAD
++=======
+ #~ msgid "Please enter the URL or path to the media you want to play"
+ #~ msgstr "សូម​បញ្ចូល​ URL ឬ​ផ្លូវ​ទៅកាន់​មáŸážŒáŸ€â€‹ážŠáŸ‚ល​អ្នក​ចង់​ចាក់"
+
+ #~ msgid ""
+ #~ "This dialog will allow you to stream or convert your media for use "
+ #~ "locally, on your private network, or on the Internet.\n"
+ #~ "You should start by checking that source matches what you want your input "
+ #~ "to be and then press the \"Next\" button to continue.\n"
+ #~ msgstr ""
+ #~ "ប្រអប់​នáŸáŸ‡â€‹áž“ឹង​អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​ស្ទ្រីម​ ឬ​បម្លែង​មáŸážŒáŸ€â€‹ážšáž”ស់​អ្នក​ដើម្បី​ប្រើ​ក្នុង​មូលដ្ឋាន នៅ​លើ​បណ្ដាញ​ឯកជន​របស់​"
+ #~ "អ្នក ឬ​នៅ​លើ​អ៊ិនធឺណិហ។\n"
+ #~ "អ្នក​គួរ​ចាប់ផ្ដើម​ដោយ​ពិនិážáŸ’យ​ážáž¶â€‹ážáž¾â€‹áž”្រភព​ផ្គូផ្គង​ជាមួយ​អ្វី​ដែល​អ្នក​បាន​បញ្ចូល​ដែរ​ឬទ០បន្ទាប់​មក​ចុច​ប៊ូážáž»áž„ "
+ #~ "\"បន្ទាប់\" ដើម្បី​បន្ហ។\n"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "A single administration password is used to protect this interface. The "
#~ "default value is \"admin\"."
@@@ -29213,6 -29282,9 +32789,12 @@@
#~ msgid "Color used to display text in the XOSD output."
#~ msgstr "ពណ៌​ដែល​បាន​ប្រើ​ដើម្បី​បង្ហាញ​អážáŸ’ážáž”ទ​នៅ​ក្នុង​លទ្ធផល XOSD ។"
++<<<<<<< HEAD
++=======
+ #~ msgid "Blu-Ray"
+ #~ msgstr "Blu-Ray"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "UDP port to listen to for commands (show | enable <pid> | disable <pid>)."
#~ msgstr "ច្រក UDP ដែល​ážáŸ’រូវ​ប្រើ​ពាក្យ​បញ្ជា (បង្ហាញ | បើក <pid> | បិទ <pid>) ។"
@@@ -29223,6 -29295,9 +32805,12 @@@
#~ msgid "Only enable ES id at startup."
#~ msgstr "បើក​លáŸážâ€‹ážŸáž˜áŸ’គាល់ ES ážáŸ‚​នៅ​ពáŸáž›â€‹áž…ាប់ផ្ដើម​ប៉ុណ្ណោះ ។"
++<<<<<<< HEAD
++=======
+ #~ msgid "Select individual es to enable or disable from stream"
+ #~ msgstr "ជ្រើស ES ដាច់ដោយឡែក​ដើម្បី​បើក ឬ​បិទ​ចáŸáž‰áž–ី​ស្ទ្រីម"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Full paths of the files separated by colons."
#~ msgstr "ផ្លូវ​ពáŸáž‰áž›áŸáž‰â€‹ážšáž”ស់​ឯកសារ​ដែល​បំបែក​ដោយ​សញ្ញា​ចុច​ពីរ (:) ។"
@@@ -29335,9 -29410,37 +32923,43 @@@
#~ "Make one slot black. Other tiles can only be swapped with the black slot."
#~ msgstr "ធ្វើ​ឲ្យ​រន្ធ​មួយ​ážáŸ’មៅ ។ ក្រឡា​ផ្សáŸáž„ទៀážâ€‹áž¢áž¶áž…​ážáŸ’រូវ​បាន​ប្ដូរ​ដោយ​រន្ធ​ពណ៌​ážáŸ’មៅ ។"
++<<<<<<< HEAD
+#~ msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
+#~ msgstr "មួយ​ក្នុង​ចំណោម '៩០' '១៨០' '២៧០' 'hflip' និង 'vflip'"
+
++=======
+ #~ msgid ""
+ #~ "Directory path where images files should be saved.If not set, then images "
+ #~ "will be automatically saved in users homedir."
+ #~ msgstr ""
+ #~ "ផ្លូវ​ážážâ€‹ážŠáŸ‚ល​​ឯកសារ​រូបភាព​គួរ​ážáŸ’រូវ​បាន​រក្សាទុក ។ ប្រសិនបើ​មិន​បាន​កំណážáŸ‹â€‹áž‘០នោះ​រូបភាព​នឹង​ážáŸ’រូវ​បាន​រក្សាទុក​"
+ #~ "ក្នុង​ážážâ€‹áž•áŸ’ទះ​របស់​អ្នកប្រើ​ដោយ​ស្វáŸáž™áž”្រវážáŸ’ážáž· ។"
+
+ #~ msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
+ #~ msgstr "មួយ​ក្នុង​ចំណោម '៩០' '១៨០' '២៧០' 'hflip' និង 'vflip'"
+
+ #~ msgid "Try to use hardware acceleration for subtitles/OSD blending."
+ #~ msgstr "សាកល្បង​ប្រើ​ការ​បង្កើន​ល្បឿន​ផ្នែក​រឹង​សម្រាប់​បន្សំ​ចំណងជើង​រង/OSD ។"
+
+ #~ msgid ""
+ #~ "Your video output acceleration driver does not support the required "
+ #~ "resolution: %ux%u pixels. The maximum supported resolution is %<PRIu32>x"
+ #~ "%<PRIu32>.\n"
+ #~ "Video output acceleration will be disabled. However, rendering videos "
+ #~ "with overly large resolution may cause severe performance degration."
+ #~ msgstr ""
+ #~ "កម្មវិធី​បញ្ជា​បង្កើន​ល្បឿន​លទ្ធផល​វីដáŸáž¢áž¼â€‹ážšáž”ស់​អ្នក​មិន​គាំទ្រ​គុណភាព​បង្ហាញ​ដែល​បាន​ទាមទារ​នោះ​ទ០៖ %ux"
+ #~ "%u ភីកសែល ។ គុណភាព​បង្ហាញ​អប្បបរមា​ដែល​បាន​គាំទ្រ​គឺ %<PRIu32>x%<PRIu32> ។\n"
+ #~ "ការ​បង្កើន​ល្បឿន​លទ្ធផល​វីដáŸáž¢áž¼â€‹áž“ឹង​ážáŸ’រូវ​បានបិទ ។ ទោះ​យ៉ាងណា ការ​បង្ហាញ​វីដáŸáž¢áž¼â€‹ážŠáŸ‚ល​មាន​គុណភាព​បង្ហាញ​ធំ​"
+ #~ "áž–áŸáž€ អាច​ធ្វើឲ្យ​ដំណើរការ​យឺážâ€‹ ។"
+
+ #~ msgid "row border"
+ #~ msgstr "ស៊ុម​ជួរដáŸáž€"
+
+ #~ msgid "Are you sure you wish to create the stream ?"
+ #~ msgstr "ážáž¾â€‹áž¢áŸ’នក​ពិážáž‡áž¶â€‹áž…ង់​បង្កើážâ€‹ážŸáŸ’ទ្រីម​មែនឬ ?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "We would like to thank the whole VLC community, the testers, our users "
#~ "and the following people (and the missing ones...) for their "
@@@ -29380,6 -29483,15 +33002,18 @@@
#~ msgid "00000; "
#~ msgstr "00000; "
++<<<<<<< HEAD
++=======
+ #~ msgid "Use GPU accelerated decoding"
+ #~ msgstr "ប្រើ​ការ​ឌិកូដ GPU ដែល​បាន​បង្កើន​ល្បឿន"
+
+ #~ msgid "Enqueue files when in one instance mode"
+ #~ msgstr "ដាក់​ឯកសារ​ជា​ជួរ​ពáŸáž›â€‹áž“ៅ​ក្នុង​របៀប​វážáŸ’ážáž»â€‹áž˜áž½áž™"
+
+ #~ msgid "Do you want to download it ?"
+ #~ msgstr "ážáž¾â€‹áž¢áŸ’នក​ចង់​ទាញ​យក​វា​ដែរ​ឬទ០?"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
#~ "This is a ',' separated string, each objects should be prefixed by a '+' "
@@@ -29482,6 -29594,10 +33116,13 @@@
#~ msgid "dbus"
#~ msgstr "dbus"
++<<<<<<< HEAD
++=======
+ #, fuzzy
+ #~ msgid "Live Update"
+ #~ msgstr "បច្ចុប្បន្នភាព"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "One of \"u8\", \"s8\", \"u16\", \"s16\", \"u16_le\", \"s16_le\", \"u16_be"
#~ "\", \"s16_be\", \"fixed32\", \"float32\" or \"spdif\""
@@@ -29926,6 -30042,9 +33567,12 @@@
#~ msgid "Reload image file every n seconds."
#~ msgstr "ផ្ទុក​ឯកសារ​រូបភាព​ឡើងវិញ​នៅ​រៀងរាល់ n វិនាទី ។"
++<<<<<<< HEAD
++=======
+ #~ msgid "Consider width and height as maximum values."
+ #~ msgstr "ទទឹង កម្ពស់."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "This integer when viewed in binary is a debugging mask\n"
#~ "calls 1\n"
@@@ -29986,6 -30105,11 +33633,14 @@@
#~ msgid "Repair"
#~ msgstr "ជួសជុល"
++<<<<<<< HEAD
++=======
+ #~ msgid ""
+ #~ "Force the subtiles format. Use \"auto\", the set of supported values "
+ #~ "varies."
+ #~ msgstr "ស្វáŸáž™áž”្រវážáŸ’ážáž·."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Control word for the CSA encryption algorithm"
#~ msgstr "ážáŸ’ážšáž½ážáž–áž·áž“áž·ážáŸ’áž™"
@@@ -30054,6 -30178,9 +33709,12 @@@
#~ msgid "Add controls to the video window"
#~ msgstr "បន្ážáŸ‚ម"
++<<<<<<< HEAD
++=======
+ #~ msgid "Input Settings not saved"
+ #~ msgstr "បញ្ចូល ការ​កំណážáŸ‹"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid " State : Playing %s"
#~ msgstr " ស្ážáž¶áž“ភាព ៖ កំពុង​ចាក់ %s"
@@@ -30078,6 -30205,9 +33739,12 @@@
#~ msgid " Playlist (Manually added) "
#~ msgstr "បញ្ជី​ចាក់ "
++<<<<<<< HEAD
++=======
+ #~ msgid "&Update"
+ #~ msgstr "បច្ចុប្បន្នភាព"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Sca&le"
#~ msgstr "មាážáŸ’រដ្ឋាន"
@@@ -30134,6 -30264,9 +33801,12 @@@
#~ msgid "Growl UDP port on the Growl server."
#~ msgstr "UDP."
++<<<<<<< HEAD
++=======
+ #~ msgid "Simple XML Parser"
+ #~ msgstr "​ធម្មážáž¶"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "IPv4 SAP"
#~ msgstr "SAP"
@@@ -30308,404 -30441,16 +33981,414 @@@
#~ msgid "Crops a defined part of the image"
#~ msgstr "ច្រឹប​ផ្នែក​ដែល​បាន​កំណážáŸ‹â€‹ážšáž”ស់​រូបភាព"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "Show Details"
+#~ msgstr "សáŸáž…ក្ដី​លម្អិážâ€‹áž€áž¼ážŠáž·áž€"
+
+#, fuzzy
+#~ msgid "One instance when started from file"
+#~ msgstr "ប្រើ​ážáŸ‚​ធាážáž»â€‹áž˜áž½áž™â€‹áž”៉ុណ្ណោះ​ពáŸáž›â€‹áž…ាប់ផ្ដើម​ពី​កម្មវិធី​គ្រប់គ្រង​ឯកសារ"
+
+#, fuzzy
+#~ msgid "Enqueue items to playlist when in one instance mode"
+#~ msgstr "ដាក់​ធាážáž»â€‹áž‡áž¶â€‹áž‡áž½ážšâ€‹áž€áŸ’នុង​បញ្ជី​ចាក់​នៃ​របៀប​ធាážáž»â€‹áž˜áž½áž™"
+
+#, fuzzy
+#~ msgid "Normal/Repeat/Loop"
+#~ msgstr "ធម្មážáž¶/វិល​ជុំ/ចាក់​ឡើងវិញ"
+
+#, fuzzy
+#~ msgid "Toggle Normal/Repeat/Loop playlist modes"
+#~ msgstr "បិទ-បើក​របៀប​បញ្ជី​ចាក់​ធម្មážáž¶/វិល​ជុំ/ចាក់​ឡើងវិញ"
+
+#, fuzzy
+#~ msgid "Display OSD menu on top of video output"
+#~ msgstr "លទ្ធផល​វីដáŸáž¢áž¼ iOS OpenGL"
+
+#, fuzzy
+#~ msgid "Blu-Ray Disc Input"
+#~ msgstr "ការ​បញ្ចូល​ážáž¶ážŸ Blu-ray"
+
+#, fuzzy
+#~ msgid "Bluray menus"
+#~ msgstr "ម៉ឺនុយ Blu-ray"
+
+#, fuzzy
+#~ msgid "Use bluray menus. If disabled, the movie will start directly"
+#~ msgstr "ប្រើ​ម៉ឺនុយ Blu-ray ។ បើ​បិទ ភាពយន្ážâ€‹áž“ឹង​ចាប់ផ្ដើម​ដោយ​ផ្ទាល់"
+
+#, fuzzy
+#~ msgid "Blu-Ray Disc support (libbluray)"
+#~ msgstr "គាំទ្រ​ážáž¶ážŸ Blu-ray (libbluray)"
+
+#, fuzzy
+#~ msgid ""
+#~ "This Blu-Ray Disc needs a library for AACS decoding, and your system does "
+#~ "not have it."
+#~ msgstr ""
+#~ "ážáž¶ážŸ Blu-ray áž“áŸáŸ‡â€‹ážáŸ’រូវការ​បណ្ណាលáŸáž™â€‹ážŸáž˜áŸ’រាប់​ការ​ដោះ​លáŸážâ€‹áž€áž¼ážŠ AACS ហើយ​ប្រពáŸáž“្ធ​របស់​អ្នក​មិន​មាន។"
+
+#, fuzzy
+#~ msgid ""
+#~ "This Blu-Ray Disc needs a library for BD+ decoding, and your system does "
+#~ "not have it."
+#~ msgstr ""
+#~ "ážáž¶ážŸ Blu-ray áž“áŸáŸ‡â€‹ážáŸ’រូវការ​បណ្ណាលáŸáž™â€‹ážŸáž˜áŸ’រាប់​ការ​ដោះ​លáŸážâ€‹áž€áž¼ážŠ BD+ ហើយ​ប្រពáŸáž“្ធ​របស់​អ្នក​មិន​មាន។"
+
+#, fuzzy
+#~ msgid "Blu-Ray error"
+#~ msgstr "Blu-ray មាន​បញ្ហា"
+
+#, fuzzy
+#~ msgid "collapse"
+#~ msgstr "ážœáŸáž‰"
+
+#, fuzzy
+#~ msgid "expand"
+#~ msgstr "ពង្រីក"
+
+#, fuzzy
+#~ msgid "TCP address to use (default localhost)"
+#~ msgstr "អាសយដ្ឋាន TCP ដែល​ážáŸ’រូវ​ប្រើ"
+
+#, fuzzy
+#~ msgid ""
+#~ "TCP address to use to communicate with the video part of the Bar Graph "
+#~ "(default localhost).In the case of bargraph incrustation, use localhost."
+#~ msgstr ""
+#~ "អាសយដ្ឋាន TCP ដែល​ážáŸ’រូវ​ប្រើ​ដើម្បី​ទាក់ទង​ជាមួយ​ផ្នែក​វីដáŸáž¢áž¼â€‹áž“ៃ​របារ​ក្រាហ្វិក (លំនាំដើម "
+#~ "localhost)។ ក្នុង​ករណី​ដែល​របារ​ក្រាហ្វិក​ជាប់​ស្អិហសូម​ប្រើ localhost ។"
+
+#, fuzzy
+#~ msgid ""
+#~ "TCP port to use to communicate with the video part of the Bar Graph "
+#~ "(default 12345).Use the same port as the one used in the rc interface."
+#~ msgstr ""
+#~ "ច្រក​ TCP ដែល​ážáŸ’រូវ​ប្រើ​ដើម្បី​ទាក់ទង​ជាមួយ​ផ្នែក​វីដáŸáž¢áž¼â€‹áž“ៃ​របារ​ក្រាហ្វិក (លំនាំដើម 12345) ។ ប្រើ​"
+#~ "ដូចគ្នា​ជាមួយ​ច្រក​ដែល​បាន​ប្រើ​នៅ​ក្នុង​ចំណុច​ប្រទាក់ rc ។"
+
+#, fuzzy
+#~ msgid "Time window to use in ms (default 5000)"
+#~ msgstr "បង្អួច​ពáŸáž›ážœáŸáž›áž¶â€‹ážŠáŸ‚ល​ážáŸ’រូវ​ប្រើ​គិážáž‡áž¶â€‹ មិ.វិ."
+
+#, fuzzy
+#~ msgid "Minimum Audio level to raise the alarm (default 0.1)"
+#~ msgstr "កម្រិážâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼â€‹áž¢áž”្បបរមា​ដែល​ážáŸ’រូវ​ឲ្យ​កើážâ€‹áž˜áž¶áž“​ការ​ជូនដំណឹង"
+
+#, fuzzy
+#~ msgid "Force connection reset regularly (default 1)"
+#~ msgstr "ážáž˜áŸ’រូវ​ឲ្យ​​កំណážáŸ‹â€‹áž€áž¶ážšâ€‹ážáž—្ជាប់​ឡើងវិញ​យ៉ាង​ទៀងទាážáŸ‹"
+
+#, fuzzy
+#~ msgid "Feedback Gain"
+#~ msgstr "ការ​ទទួល​យក​មážáž·â€‹áž¢áŸ’នកប្រើ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Channels available for audio output.If the input has more channels than "
+#~ "the output, it will be down-mixed.This parameter is ignored when digital "
+#~ "pass-through is active."
+#~ msgstr ""
+#~ "ឆានែល​ដែល​អាច​ប្រើ​បាន​សម្រាប់​លទ្ធផល​អូឌីយ៉ូ។ បើ​ការ​បញ្ចូល​មាន​ច្រើន​ឆានែល​ជាង​ការ​បញ្ចáŸáž‰ នោះ​វា​នឹង​"
+#~ "លាយ​បន្ទាប។ ប៉ារ៉ាម៉ែážáŸ’រ​នáŸáŸ‡â€‹áž˜áž·áž“​ážáŸ’រូវ​បាន​អើពើ នៅ​ពáŸáž›â€‹ážŠáŸ‚ល​ការ​ឆ្លងកាážáŸ‹â€‹ážŒáž¸áž‡áž¸ážáž›â€‹ážŸáž€áž˜áŸ’ម។"
+
+#, fuzzy
+#~ msgid ""
+#~ "You should configure your speaker layout with the \"Audio Midi Setup\" "
+#~ "utility in /Applications/Utilities. Stereo mode is being used now."
+#~ msgstr ""
+#~ "អ្នក​គួរážáŸ‚​កំណážáŸ‹â€‹ážšáž…នា​សម្ពáŸáž“្ធ​ប្លង់​ធុងបាស​របស់​អ្នក​ជាមួយ​នឹង \"ការ​រៀបចំ​មីឌី​អូឌីយ៉ូ\" នៅក្នុង /"
+#~ "Applications/Utilities ។ VLC នឹង​បញ្ចáŸáž‰â€‹ážáŸ‚​ស្ážáŸážšáŸ‰áŸáž¢áž¼â€‹áž”៉ុណណ្ណោះ។"
+
+#, fuzzy
+#~ msgid "Win32 waveOut extension output"
+#~ msgstr "លទ្ធផល​អូឌីយ៉ូ WaveOut"
+
+#, fuzzy
+#~ msgid ""
+#~ "FFmpeg can do error resilience.\n"
+#~ "However, with a buggy encoder (such as the ISO MPEG-4 encoder from M$) "
+#~ "this can produce a lot of errors.\n"
+#~ "Valid values range from 0 to 4 (0 disables all errors resilience)."
+#~ msgstr ""
+#~ "libavcodec អា​មាន​កំហុស​បន្ážáž·áž…បន្ážáž½áž…។\n"
+#~ "ទោះជាយ៉ាងណា ជាមួយ​កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž€áŸ†áž ុស (មាន​ដូចជា​កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠ ISO MPEG-4 ពី M$) វា​"
+#~ "អាច​មាន​កំហុស​ជាច្រើន។\n"
+#~ "ជួរ​ážáž˜áŸ’លៃ​ážáŸ’រឹមážáŸ’រូវ​គឺ​ចាប់ពី 0 ទៅ 4 (0 គឺ​បិទ​កំហុស​បន្ážáž·áž…បន្ážáž½áž…​ទាំងអស់)។"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specify the AAC audio profile to use for encoding the audio bitstream. It "
+#~ "takes the following options: main, low, ssr (not supported) and ltp "
+#~ "(default: main)"
+#~ msgstr ""
+#~ "បញ្ជាក់​ទម្រង់​អូឌីយ៉ូ AAC ដែល​ážáŸ’រូវ​ប្រើ​សម្រាប់​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹ážŸáŸ’ទ្រីម​ប៊ីážâ€‹áž¢áž¼ážŒáž¸áž™áŸ‰áž¼áŸ” វា​មាន​ជម្រើស​ដូច​ážáž¶áž„ក្រោម៖ "
+#~ "ចម្បង, ទាប, ssr (មិន​គាំទ្រ), ltp, hev1, hev2 (លំនាំដើម៖ ទាប) hev1 ហើយ hev2 គឺ​"
+#~ "បច្ចុប្បន្ន​ážáŸ’រូវ​បាន​គាំទ្រ​ážáŸ‚​ជាមួយ libfdk-aac បាន​បើក libavcodec ប៉ុណ្ណោះ"
+
+#, fuzzy
+#~ msgid ""
+#~ "It seems your FFMPEG (libavcodec) installation lacks the following "
+#~ "encoder:\n"
+#~ "%s.\n"
+#~ "If you don't know how to fix this, ask for support from your "
+#~ "distribution.\n"
+#~ "\n"
+#~ "This is not an error inside VLC media player.\n"
+#~ "Do not contact the VideoLAN project about this issue.\n"
+#~ msgstr ""
+#~ "វា​ហាក់​ដូចជា​ការ​ដំឡើង Libav/FFmpeg (libavcodec) របស់​អ្នក​ážáŸ’វះ​កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹ážŠáž¼áž…​"
+#~ "ážáž¶áž„ក្រោម៖\n"
+#~ "%s​។\n"
+#~ "បើ​អ្នក​មិន​ដឹង​អំពី​របៀប​កែ​វា​ទ០អ្នក​អាច​សួរ​រក​ជំនួយ​ពី​ការ​ចែកចាយ​របស់​អ្នក។\n"
+#~ "\n"
+#~ "áž“áŸáŸ‡â€‹áž˜áž·áž“មែន​ជា​កំហុស​ážáž¶áž„ក្នុង​កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC áž‘áŸáŸ”\n"
+#~ "សូម​កុំ​ទាក់ទង​ម​ក​គម្រោង VideoLAN អំពី​បញ្ហា​នáŸáŸ‡áŸ”\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "This enables automatic detection of UTF-8 encoding within subtitles files."
+#~ msgstr "វា​នឹង​បើក​ការ​រក​ឃើញ​ស្វáŸáž™áž”្រវážáŸ’ážáž·â€‹áž“ៃ​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠ UTF-8 ដោយ​ប្រើ​ឯកសារ​ចំណងជើង​រង។"
+
+#, fuzzy
+#~ msgid ""
+#~ "Sets maximum interval between IDR-frames.Larger values save bits, thus "
+#~ "improving quality for a given bitrate at the cost of seeking precision."
+#~ msgstr ""
+#~ "កំណážáŸ‹â€‹áž…ន្លោះ​ពáŸáž›â€‹áž¢ážáž·áž”រមា​រវាង IDR-frames ។ ážáž˜áŸ’លៃ​ធំ​សន្សំសំចៃ​ប៊ីហដូច្នáŸáŸ‡â€‹áž”ង្កើន​គុណភាព​សម្រាប់​អážáŸ’រា​"
+#~ "ប៊ីážâ€‹ážŠáŸ‚ល​បាន​ផ្ដល់​នៅ​ážáž˜áŸ’លៃ​រក​ឃើញ​ជាក់លាក់។ ប្រើ -1 សម្រាប់​មិន​កំណážáŸ‹áŸ”"
+
+#, fuzzy
+#~ msgid "temporal"
+#~ msgstr "Temporal"
+
+#, fuzzy
+#~ msgid "H.264/MPEG4 AVC encoder (x264)"
+#~ msgstr "ផ្នែក H.264/MPEG-4 កម្មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠ 10/AVC (x264)"
+
+#, fuzzy
+#~ msgid "Playlist has only %d elements"
+#~ msgstr "បញ្ជី​ចាក់​មាន​ធាážáž»â€‹ážáŸ‚ %u ប៉ុណ្ណោះ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Because this AVI file index is broken or missing, seeking will not work "
+#~ "correctly.\n"
+#~ "VLC won't repair your file but can temporary fix this problem by building "
+#~ "an index in memory.\n"
+#~ "This step might take a long time on a large file.\n"
+#~ "What do you want to do ?"
+#~ msgstr ""
+#~ "ដោយសារážáŸ‚​លិបិក្រម​​ឯកសារ AVI áž“áŸáŸ‡â€‹â€‹ážáž¼áž… ឬ​បាážáŸ‹ នាំឲ្យ​ការ​ស្វែងរក​ដំណើរការ​មិន​ážáŸ’រឹមážáŸ’រូវ។\n"
+#~ "VLC នឹង​​មិន​ជួសជុល​ឯកសារ​របស់​អ្នក​ទ០ប៉ុន្ážáŸ‚​​វា​អាច​ជួសជុល​បញ្ហា​នáŸáŸ‡â€‹áž‡áž¶â€‹áž”ណ្ដោះ​អាសន្ន ដោយ​ការ​បង្កើážâ€‹"
+#~ "លិបិក្រម​នៅ​ក្នុង​អង្គ​ចងចាំ។\n"
+#~ "ជំហាន​នáŸáŸ‡â€‹áž¢áž¶áž…​ប្រើ​ពáŸáž›ážœáŸáž›áž¶â€‹áž™áž¼ážšâ€‹ážŸáž˜áŸ’រាប់​ឯកសារ​ដែល​មាន​ទំហំ​ធំ។\n"
+#~ "ážáž¾â€‹áž¢áŸ’នក​ចង់​ធ្វើ​អ្វី?"
+
+#, fuzzy
+#~ msgid "Christian rap"
+#~ msgstr "Christian Rap"
+
+#, fuzzy
+#~ msgid "Pop/funk"
+#~ msgstr "Pop/Funk"
+
+#, fuzzy
+#~ msgid "Rock & roll"
+#~ msgstr "Rock & Roll"
+
+#, fuzzy
+#~ msgid "Hard rock"
+#~ msgstr "Hard Rock"
+
+#, fuzzy
+#~ msgid ""
+#~ "This is the desired frame rate when playing raw video streams. In the "
+#~ "form 30000/1001 or 29.97"
+#~ msgstr "áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž¢ážáŸ’រា​ស៊ុម​ដែល​ចង់បាន​ពáŸáž›â€‹áž…ាក់​ស្ទ្រីម​វីដáŸáž¢áž¼â€‹ážŠáž¾áž˜áŸ” នៅ​ក្នុង​ទម្រង់ 30000/1001 ឬ 29.97"
+
+#, fuzzy
+#~ msgid "VLC Debug Log (%s).rtfd"
+#~ msgstr "កំណážáŸ‹â€‹áž áŸážáž»â€‹áž”ំបាážáŸ‹â€‹áž€áŸ†áž ុស VLC (%s).rtf"
+
+#, fuzzy
+#~ msgid "Run VLC with dark or bright interface style"
+#~ msgstr "ដំណើរការ VLC ជាមួយ​រចនាបáŸáž‘្ម​ចំណុចប្រទាក់​ងងឹáž"
+
+#, fuzzy
+#~ msgid "By default, VLC will use the dark interface style."
+#~ msgstr "ដំណើរការ VLC ជាមួយ​រចនាបáŸáž‘្ម​ចំណុចប្រទាក់​ងងឹáž"
+
+#, fuzzy
+#~ msgid "Use the native fullscreen mode on OS X Lion"
+#~ msgstr "ប្រើ​របៀប​ពáŸáž‰â€‹áž¢áŸáž€áŸ’រង់​ដើម"
+
+#, fuzzy
+#~ msgid ""
+#~ "Extend subtitles duration by this value.\n"
+#~ "Set 0 to disable."
+#~ msgstr ""
+#~ "បន្ážáŸ‚ម​រយៈពáŸáž›â€‹áž…ំណងជើង​ដោយ​ážáž˜áŸ’លៃ​នáŸáŸ‡áŸ”\n"
+#~ "កំណážáŸ‹â€‹áž‘ៅ ០ដើម្បី​បិទ។"
+
+#, fuzzy
+#~ msgid ""
+#~ "Multiply subtitles duration by this value.\n"
+#~ "Set 0 to disable."
+#~ msgstr ""
+#~ "បង្កើន​រយៈពáŸáž›â€‹áž…ំណងជើង​រង​ដោយ​ážáž˜áŸ’លៃ​នáŸáŸ‡áŸ”\n"
+#~ "កំណážáŸ‹â€‹áž‘ៅ ០ដើម្បី​បិទ។"
+
+#, fuzzy
+#~ msgid ""
+#~ "Recalculate subtitles duration according\n"
+#~ "to their content and this value.\n"
+#~ "Set 0 to disable."
+#~ msgstr ""
+#~ "គណនា​រយៈពáŸáž›â€‹áž…ំណងជើង​រង​ឡើងវិញ​ផ្អែកážáž¶áž˜\n"
+#~ "មាážáž·áž€áž¶â€‹ážšáž”ស់​វា និង​ážáž˜áŸ’លៃ​នáŸáŸ‡áŸ”\n"
+#~ "កំណážáŸ‹â€‹áž‘ៅ ០ដើម្បី​បិទ។"
+
+#, fuzzy
+#~ msgid ""
+#~ "The chosen codecs are not compatible with each other. For example: It is "
+#~ "impossibleto mix uncompressed audio with any video codec.\n"
+#~ "\n"
+#~ "Correct your selection and try again."
+#~ msgstr ""
+#~ "ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹ážŠáŸ‚ល​បាន​ជ្រើស​មិន​ឆបគ្នា​ទៅវិញ​ទៅមក​ទáŸáŸ” ឧទាហរណáŸáŸ– វា​មិន​អាច​លាយ​អូឌីយ៉ូ​ដែល​មិន​បង្ហាប់​"
+#~ "ជាមួយ​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹ážœáž¸ážŠáŸáž¢áž¼áŸ”\n"
+#~ "\n"
+#~ "កែ​ជម្រើស​របស់​អ្នក​រួច​ព្យាយាម​ម្ដងទៀážáŸ”"
+
+#, fuzzy
+#~ msgid "TV (digital)"
+#~ msgstr "ទូរទស្សនáŸ-ឌីជីážáž›"
+
+#, fuzzy
+#~ msgid "Icon View"
+#~ msgstr "មើល"
+
+#, fuzzy
+#~ msgid "Warning: the key is already assigned to \""
+#~ msgstr "ព្រមាន៖ គ្រាប់ចុច ឬ​បន្សំ​នáŸáŸ‡â€‹ážáŸ’រូវ​បាន​កំណážáŸ‹â€‹ážšáž½áž…ហើយ"
+
+#, fuzzy
+#~ msgid "Please enter the URL or path to the media you want to play"
+#~ msgstr "សូម​បញ្ចូល URL ឬ​ផ្លូវ​ទៅកាន់​មáŸážŒáŸ€â€‹ážŠáŸ‚ល​អ្នក​ចង់​ចាក់។"
+
+#, fuzzy
+#~ msgid ""
+#~ "This dialog will allow you to stream or convert your media for use "
+#~ "locally, on your private network, or on the Internet.\n"
+#~ "You should start by checking that source matches what you want your input "
+#~ "to be and then press the \"Next\" button to continue.\n"
+#~ msgstr ""
+#~ "អ្នកជំនួយការ​នáŸáŸ‡â€‹áž“ឹង​អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​ស្ទ្រីម ឬ​បម្លែង​មáŸážŒáŸ€â€‹ážšáž”ស់​អ្នក​សម្រាប់​ប្រើ​ក្នុង​មូលដ្ឋាន លើ​បណ្ដាញ​"
+#~ "ឯកជន​របស់​អ្នក ឬ​នៅ​លើ​អ៊ីនធឺណិážáŸ”\n"
+#~ "អ្នក​គួរážáŸ‚​ចាប់ផ្ដើម​ដោយ​ពិនិážáŸ’យមើល​ážáž¶â€‹áž”្រភព​នោះ​ផ្គូផ្គង​ជាមួយ​អ្វី​ដែល​អ្នក​បញ្ចូល​ដែរ​ឬទ០រួច​ចុច​ប៊ូážáž»áž„ "
+#~ "\"បន្ទាប់\" ដើម្បី​បន្ážáŸ”\n"
+
+#, fuzzy
+#~ msgid "Blu-Ray"
+#~ msgstr "Blu-ray"
+
+#, fuzzy
+#~ msgid "Select individual es to enable or disable from stream"
+#~ msgstr "ចុច​ដើម្បី​បើក ឬ​បិទ​ការ​ចាក់​ចៃដន្យ។"
+
+#, fuzzy
+#~ msgid ""
+#~ "Directory path where images files should be saved.If not set, then images "
+#~ "will be automatically saved in users homedir."
+#~ msgstr ""
+#~ "ផ្លូវ​ážážâ€‹ážŠáŸ‚ល​áŸáž€ážŸáž¶ážšâ€‹ážšáž¼áž”ភាព​ážáŸ’រូវ​រក្សាទុក។ បើ​មិន​បាន​កំណážáŸ‹â€‹áž‘០រូបភាព​នឹង​ážáŸ’រូវ​បាន​រក្សាទុក​នៅ​ក្នុង​ážážâ€‹áž•áŸ’ទះ​ដោយ​"
+#~ "ស្វáŸáž™áž”្រវážáŸ’ážáž·áŸ”"
+
+#, fuzzy
+#~ msgid "Try to use hardware acceleration for subtitles/OSD blending."
+#~ msgstr "សាកល្បង​ប្រើ​ការ​បង្កើន​ល្បឿន​ផ្នែក​រឹង​សម្រាប់​បន្សំ​ចំណងជើង​រង/OSD ។"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your video output acceleration driver does not support the required "
+#~ "resolution: %ux%u pixels. The maximum supported resolution is %<PRIu32>x"
+#~ "%<PRIu32>.\n"
+#~ "Video output acceleration will be disabled. However, rendering videos "
+#~ "with overly large resolution may cause severe performance degration."
+#~ msgstr ""
+#~ "កម្មវិធី​បញ្ចា​បង្កើន​ល្បឿន​ការ​បង្ហាញ XVideo មិន​គាំទ្រ​គុណភាព​បង្ហាញ​​ដែល​បាន​ទាមទារ %ux%u "
+#~ "ភីកសែល ហើយ​វា​បាន​ជំនួស​ដោយ %<PRIu32>x%<PRIu32> ភីកសែល។\n"
+#~ "ការ​បង្កើន​ល្បឿន​នឹង​ážáŸ’រូវ​បាន​បិទ។ ការ​ដំណើរការ​អាច​យឺážâ€‹ážáŸ’លាំង បើ​គុណភាព​បង្ហាញ​ធំ។"
+
+#, fuzzy
+#~ msgid "row border"
+#~ msgstr "ស៊ុម​ជួរដáŸáž€"
+
+#, fuzzy
+#~ msgid "Are you sure you wish to create the stream ?"
+#~ msgstr "ážáž¾â€‹áž¢áŸ’នក​ពិážáž‡áž¶â€‹áž…ង់​បង្កើážâ€‹ážŸáŸ’ទ្រីម​មែន​ឬ?"
+
+#, fuzzy
+#~ msgid "Use GPU accelerated decoding"
+#~ msgstr "ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž•áŸ’នែក​រឹង​ដែល​បាន​បន្ážáŸ‚ម​ល្បឿន"
+
+#, fuzzy
+#~ msgid "Enqueue files when in one instance mode"
+#~ msgstr "ដាក់​ធាážáž»â€‹áž‡áž¶â€‹áž‡áž½ážšâ€‹áž€áŸ’នុង​បញ្ជី​ចាក់​នៃ​របៀប​ធាážáž»â€‹áž˜áž½áž™"
+
+#, fuzzy
+#~ msgid "Do you want to download it ?"
+#~ msgstr "ážáž¾â€‹áž¢áŸ’នក​ចង់​ទាញ​យក​វា​ឬ?"
+
+#, fuzzy
+#~ msgid "Live Update"
+#~ msgstr "ធ្វើ​បច្ចុប្បន្នភាព"
+
+#, fuzzy
+#~ msgid "Consider width and height as maximum values."
+#~ msgstr "ចុច​ដើម្បី​ចាក់​សំឡáŸáž„​នៅ​កម្រិážâ€‹áž¢ážáž·áž”រមា។"
+
+#, fuzzy
+#~ msgid ""
+#~ "Force the subtiles format. Use \"auto\", the set of supported values "
+#~ "varies."
+#~ msgstr ""
+#~ "បង្ážáŸ†â€‹áž‘្រង់ទ្រាយ​ចំណងជើង​រង។ ការ​ជ្រើស \"ស្វáŸáž™áž”្រវážáŸ’ážáž·\" មាននáŸáž™ážáž¶â€‹ážšáž€â€‹ážƒáž¾áž‰â€‹ážŸáŸ’ážœáŸáž™áž”្រវážáŸ’ážáž· ហើយ​វា​ដំណើរការ​"
+#~ "ជានិច្ច។"
+
+#, fuzzy
+#~ msgid "Input Settings not saved"
+#~ msgstr "ការ​កំណážáŸ‹â€‹áž–áŸážáŸŒáž˜áž¶áž“​បញ្ចូល និង​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠ"
+
+#, fuzzy
+#~ msgid "&Update"
+#~ msgstr "ធ្វើ​បច្ចុប្បន្នភាព"
+
+#, fuzzy
+#~ msgid "Simple XML Parser"
+#~ msgstr "ចំណូលចិážáŸ’ážâ€‹áž’ម្មážáž¶"
+
+#, fuzzy
+#~ msgid "On Screen Display/Subtitle Settings not saved"
+#~ msgstr "ការ​កំណážáŸ‹â€‹áž…ំណងជើង​រង និង​ការ​បង្ហាញ​លើ​អáŸáž€áŸ’រង់"
++=======
+ #~ msgid "On Screen Display/Subtitle Settings not saved"
+ #~ msgstr "មិនបាន​រក្សាទុក​ការ​កំណážáŸ‹â€‹áž…ំណងជើង​/​ការ​បង្ហាញ​លើ​អáŸáž€áŸ’រង់"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
#~ "This file countains an optional CRL to prevent remote clients from using "
#~ "revoked certificates in TLS sessions."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "ឯកសារ​នáŸáŸ‡â€‹áž˜áž¶áž“ CRL ជា​ជម្រើស​ដើម្បី​ការពារ​ម៉ាស៊ីន​កូន​ពី​ការ​ប្រើ​វិញ្ញាបនបážáŸ’រ​ដក​ហូážâ€‹áž“ៅ​ក្នុង​សមáŸáž™ TLS ។"
++=======
+ #~ "ឯកសារ​នáŸáŸ‡â€‹áž˜áž¶áž“ CRL ជា​ជម្រើស​ដើម្បី​ការ​ពារ​ការ​លុប​ម៉ាស៊ីន​កូន​ចáŸáž‰áž–ី​ការ​ប្រើប្រាស់​វិញ្ញាបនបážáŸ’រ​ដកហូážâ€‹áž“ៅ​"
+ #~ "ក្នុង​សមáŸáž™ TLS ។"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Subtitles/OSD"
@@@ -30725,7 -30470,7 +34408,11 @@@
#, fuzzy
#~ msgid "CPU features"
++<<<<<<< HEAD
+#~ msgstr "លក្ážážŽáŸˆ"
++=======
+ #~ msgstr "ចាប់យក"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Chroma modules settings"
@@@ -30750,7 -30495,7 +34437,11 @@@
#, fuzzy
#~ msgid "Subtitle demuxer settings"
++<<<<<<< HEAD
+#~ msgstr "ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž¢ážáŸ’ážáž”ទ​ចំណង​ជើង​រង"
++=======
+ #~ msgstr "កម្មវិធី​បង្ហាញ​ចំណងជើង​រង​ដោយប្រើ libass"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
@@@ -30814,7 -30559,7 +34505,11 @@@
#, fuzzy
#~ msgid "Clone the image"
++<<<<<<< HEAD
+#~ msgstr "សម្អាážâ€‹ážŸáž¶ážš"
++=======
+ #~ msgstr "រូបភាព​ព្រួញ​កណ្ដុរ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Magnification"
@@@ -30839,7 -30584,7 +34534,11 @@@
#, fuzzy
#~ msgid "Default audio volume"
++<<<<<<< HEAD
+#~ msgstr "កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„​អូឌីយ៉ូ​ចំនួន​គážáŸ‹"
++=======
+ #~ msgstr "កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„​អូឌីយ៉ូ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
@@@ -30918,7 -30663,7 +34617,11 @@@
#, fuzzy
#~ msgid "Allow only one running instance when started from file."
++<<<<<<< HEAD
+#~ msgstr "ប្រើ​ážáŸ‚​ធាážáž»â€‹áž˜áž½áž™â€‹áž”៉ុណ្ណោះ​ពáŸáž›â€‹áž…ាប់ផ្ដើម​ពី​កម្មវិធី​គ្រប់គ្រង​ឯកសារ"
++=======
+ #~ msgstr "អនុញ្ញាážâ€‹ážŠáŸ†ážŽáž¾ážšáž€áž¶ážšâ€‹ážœážáŸ’ážáž»â€‹ážáŸ‚មួយ​ប៉ុណ្ណោះ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Leave fullscreen"
@@@ -30990,7 -30735,7 +34693,11 @@@
#, fuzzy
#~ msgid "BluRay Disc is corrupted."
++<<<<<<< HEAD
+#~ msgstr "ážáž¶ážŸ Blu-ray បាន​ážáž¼áž…។"
++=======
+ #~ msgstr "បាន​បោះបង់ (ážáž¼áž…)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "dc1394 input"
@@@ -31010,7 -30755,7 +34717,11 @@@
#, fuzzy
#~ msgid "Refresh list"
++<<<<<<< HEAD
+#~ msgstr "ផ្ទុក​បញ្ជី​ឡើងវិញ"
++=======
+ #~ msgstr "áž–áŸáž›ážœáŸáž›áž¶â€‹áž’្វើ​ឲ្យ​ស្រស់"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "VLC cannot open ANY capture device.Check the error log for details."
@@@ -31166,23 -30911,31 +34877,51 @@@
#, fuzzy
#~ msgid "TCP port to use (default 12345)"
++<<<<<<< HEAD
+#~ msgstr "ច្រក TCP ដែល​ážáŸ’រូវ​ប្រើ"
+
+#, fuzzy
+#~ msgid "Defines if BarGraph information should be sent (default 1)"
+#~ msgstr "កំណážáŸ‹â€‹ážáž¶â€‹ážáž¾â€‹áž–áŸážáŸŒáž˜áž¶áž“​ក្រាហ្វិក​របារ​គួរážáŸ’រូវ​បាន​ផ្ញើ ឬ​អážáŸ‹"
+
+#, fuzzy
+#~ msgid "Sends the barGraph information every n audio packets (default 4)"
+#~ msgstr "ផ្ញើ​ពáŸážáŸŒáž˜áž¶áž“​ក្រាហ្វិក​របារ​នៅ​រៀងរាល់ n កញ្ចប់​អូឌីយ៉ូ"
+
+#, fuzzy
+#~ msgid "Defines if silence alarm information should be sent (default 1)"
+#~ msgstr "កំណážáŸ‹â€‹ážáž¶â€‹ážáž¾â€‹áž–áŸážáŸŒáž˜áž¶áž“​ជូនដំណឹង​ស្ងាážáŸ‹â€‹áž‚ួរ​ážáŸ’រូវ​បាន​ផ្ញើ ឬ​អážáŸ‹"
+
+#, fuzzy
+#~ msgid "Time between two alarm messages in ms (default 2000)"
+#~ msgstr "រយៈពáŸáž›â€‹ážšážœáž¶áž„​សារ​ជូនដំណឹង​ពីរ​គិážáž‡áž¶ មិ.វិ."
++=======
+ #~ msgstr "កម្លាំង​ក្រូម៉ា​បណ្ដោះអាសន្ន (លំនាំដើម ៤.៥)"
+
+ #, fuzzy
+ #~ msgid "Defines if BarGraph information should be sent (default 1)"
+ #~ msgstr ""
+ #~ "កំណážáŸ‹â€‹ážáž¶â€‹ážáž¾â€‹áž–áŸážáŸŒáž˜áž¶áž“​ក្រាហ្វិក​របារ​គួរážáŸ‚​ážáŸ’រូវ​បាន​ផ្ញើ ឬ​អážáŸ‹ ។ ១ ​ប្រសិនបើ​ពáŸážáŸŒáž˜áž¶áž“​គួរážáŸ‚​ážáŸ’រូវ​បាន​ផ្ញើ បើ​មិន​"
+ #~ "ដូច្នោះ​ទ០០(លំនាំដើម ១) ។"
+
+ #, fuzzy
+ #~ msgid "Sends the barGraph information every n audio packets (default 4)"
+ #~ msgstr ""
+ #~ "កំណážáŸ‹â€‹áž—ាព​ញឹកញាប់​ដែល​ពáŸážáŸŒáž˜áž¶áž“​ក្រាហ្វិក​របារ​គួរážáŸ‚​ážáŸ’រូវ​បាន​ផ្ញើ ។ ផ្ញើ​ពáŸážáŸŒáž˜áž¶áž“​ក្រាហ្វិក​របារ​នៅ​រៀងរាល់ n "
+ #~ "កញ្ចប់​អូឌីយ៉ូ (លំនាំដើម ៤)"
+
+ #, fuzzy
+ #~ msgid "Defines if silence alarm information should be sent (default 1)"
+ #~ msgstr ""
+ #~ "កំណážáŸ‹â€‹ážáž¶â€‹ážáž¾â€‹áž–áŸážáŸŒáž˜áž¶áž“​ជូនដំណឹង​ស្ងាážáŸ‹â€‹áž‚ួរážáŸ‚​ážáŸ’រូវ​បាន​ផ្ញើ ឬ​អážáŸ‹ (លំនាំដើម ១) ។ ១ ​ប្រសិនបើ​ពáŸážáŸŒáž˜áž¶áž“​គួរážáŸ‚​ážáŸ’រូវ​"
+ #~ "បាន​ផ្ញើ បើ​មិន​ដូច្នោះ​ទ០០(លំនាំដើម ១) ។"
+
+ #, fuzzy
+ #~ msgid "Time between two alarm messages in ms (default 2000)"
+ #~ msgstr ""
+ #~ "áž–áŸáž›â€‹ážœáŸáž›áž¶â€‹ážšážœáž¶áž„​សារ​ជូនដំណឹង​ពីរ​គិážáž‡áž¶ មិ.វិ. ។ ážáž˜áŸ’លៃ​នáŸáŸ‡â€‹ážáŸ’រូវ​បាន​ប្រើ​ដើម្បី​ចៀសវាង​ážáž·ážáŸ’ážáž·áž—ាព​ការ​ជូនដំណឹង "
+ #~ "(លំនាំដើម ២០០០) ។"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Fixed point audio format conversions"
@@@ -31198,7 -30951,7 +34937,11 @@@
#, fuzzy
#~ msgid "Open Sound System"
++<<<<<<< HEAD
+#~ msgstr "លទ្ធផល​អូឌីយ៉ូ​ប្រពáŸáž“្ធ​សំឡáŸáž„​បើក​ចំហ"
++=======
+ #~ msgstr "ប្រភព​បើក​ចំហ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "OSS DSP device"
@@@ -31225,8 -30978,8 +34968,13 @@@
#~ "Force skipping of idct to speed up decoding for frame types(-1=None, "
#~ "0=Default, 1=B-frames, 2=P-frames, 3=B+P frames, 4=all frames)."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "ážáž˜áŸ’រូវ​ឲ្យ​រំលង idct ដើម្បី​បង្កើន​ល្បឿន​ការ​ដោះ​លáŸážâ€‹áž€áž¼ážŠâ€‹ážŸáž˜áŸ’រាប់​ប្រភáŸáž‘​ស៊ុម(-១=គ្មាន ០=លំនាំដើម ១=B-"
+#~ "frames ២=P-frames ៣=B+P frames ៤=ស៊ុម​ទាំងអស់)។"
++=======
+ #~ "ážáž˜áŸ’រូវ​ឲ្យ​រំលង​ស៊ុម​ដើម្បី​បង្កើន​ល្បឿន​ការ​ឌិកូដ (-១=គ្មាន ០=លំនាំដើម ១=B-frames ២=P-frames ៣=B"
+ #~ "+P frames ៤=ស៊ុម​ទាំងអស់) ។"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Low resolution decoding"
@@@ -31238,19 -30991,19 +34986,35 @@@
#, fuzzy
#~ msgid "Subtitles text encoding"
++<<<<<<< HEAD
+#~ msgstr "ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž¢ážáŸ’ážáž”ទ​ចំណង​ជើង​រង"
+
+#, fuzzy
+#~ msgid "Subtitles justification"
+#~ msgstr "ការ​ážáž˜áŸ’រឹម​ចំណងជើង​រង"
+
+#, fuzzy
+#~ msgid "UTF-8 subtitles autodetection"
+#~ msgstr "ការ​រក​ឃើញ​ចំណងជើង​រក​ស្វáŸáž™áž”្រវážáŸ’ážáž· UTF-8"
+
+#, fuzzy
+#~ msgid "Text subtitles decoder"
+#~ msgstr "កម្មវិធី​ដោះ​លáŸážâ€‹áž€áž¼ážŠâ€‹áž…ំណងជើង​រង​អážáŸ’ážáž”áž‘"
++=======
+ #~ msgstr "ឌិកូឌáŸážšâ€‹áž…ំណងជើង​រង DVB"
+
+ #, fuzzy
+ #~ msgid "Subtitles justification"
+ #~ msgstr "ផ្លាស់ទី​ចំណង​ជើង​រង​ឡើង​លើ"
+
+ #, fuzzy
+ #~ msgid "UTF-8 subtitles autodetection"
+ #~ msgstr "ផ្លូវ​ដែល​ážáŸ’រូវ​រក​ឃើញ​ចំណងជើង​រង​ដោយ​ស្វáŸáž™áž”្រវážáŸ’ážáž·"
+
+ #, fuzzy
+ #~ msgid "Text subtitles decoder"
+ #~ msgstr "ឌិកូឌáŸážšâ€‹áž…ំណងជើង​រង Teletext"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Direct MV prediction mode."
@@@ -31272,23 -31025,23 +35036,43 @@@
#, fuzzy
#~ msgid "spatial"
++<<<<<<< HEAD
+#~ msgstr "Spatial"
+
+#, fuzzy
+#~ msgid "Subtitle position %i px"
+#~ msgstr "ទីážáž¶áŸ†áž„​ចំណងជើង​រង %d px"
+
+#, fuzzy
+#~ msgid "Volume %d%%"
+#~ msgstr "កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„ %ld%%"
+
+#, fuzzy
+#~ msgid "| adev [X] . . . . . . . . . . . set/get audio device"
+#~ msgstr "| adev [device] . . . . . . . . set/get audio device"
+
+#, fuzzy
+#~ msgid "| strack [X] . . . . . . . . . set/get subtitles track"
+#~ msgstr "| strack [X] . . . . . . . . . set/get subtitle track"
++=======
+ #~ msgstr "Spatializer"
+
+ #, fuzzy
+ #~ msgid "Subtitle position %i px"
+ #~ msgstr "ផ្លាស់ទី​ចំណង​ជើង​រង​ឡើង​លើ"
+
+ #, fuzzy
+ #~ msgid "Volume %d%%"
+ #~ msgstr "បន្ážáž™â€‹áž€áž˜áŸ’ážšáž·ážâ€‹ážŸáŸ†áž¡áŸáž„"
+
+ #, fuzzy
+ #~ msgid "| adev [X] . . . . . . . . . . . set/get audio device"
+ #~ msgstr "| volume [X] . . . . . . . . . . កំណážáŸ‹/​យក​កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„​អូឌីយ៉ូ"
+
+ #, fuzzy
+ #~ msgid "| strack [X] . . . . . . . . . set/get subtitles track"
+ #~ msgstr "| atrack [X] . . . . . . . . . . . កំណážáŸ‹/​យក​បទ​អូឌីយ៉ូ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "| @name marq-x X . . . . . . . . . . . .offset from left"
@@@ -31352,51 -31105,51 +35136,99 @@@
#, fuzzy
#~ msgid "Classic rock"
++<<<<<<< HEAD
+#~ msgstr "Classic Rock"
+
+#, fuzzy
+#~ msgid "Death metal"
+#~ msgstr "Death Metal"
+
+#, fuzzy
+#~ msgid "Sound clip"
+#~ msgstr "ឃ្លីប​សំឡáŸáž„"
+
+#, fuzzy
+#~ msgid "Alternative rock"
+#~ msgstr "Alternative Rock"
+
+#, fuzzy
+#~ msgid "Instrumental pop"
+#~ msgstr "Instrumental Pop"
+
+#, fuzzy
+#~ msgid "Instrumental rock"
+#~ msgstr "Instrumental Rock"
+
+#, fuzzy
+#~ msgid "Southern rock"
+#~ msgstr "Southern Rock"
+
+#, fuzzy
+#~ msgid "New wave"
+#~ msgstr "New Wave"
+
+#, fuzzy
+#~ msgid "Acid punk"
+#~ msgstr "Acid Punk"
+
+#, fuzzy
+#~ msgid "Acid jazz"
+#~ msgstr "Acid Jazz"
+
+#, fuzzy
+#~ msgid "Dummy ifo demux"
+#~ msgstr "IFO មិន​ទ្វáŸâ€‹áž‘ិស​មិន​ល្អ"
+
+#, fuzzy
+#~ msgid "Text subtitles parser"
+#~ msgstr "កម្មវិធី​ញែក​ចំណងជើង​រង​អážáŸ’ážáž”áž‘"
++=======
+ #~ msgstr "ក្លាសីក"
+
+ #, fuzzy
+ #~ msgid "Death metal"
+ #~ msgstr "ទិន្ននáŸáž™áž˜áŸážáž¶â€‹áž€áž¶áž›áž”រិច្ឆáŸáž‘"
+
+ #, fuzzy
+ #~ msgid "Sound clip"
+ #~ msgstr "ការ​ពន្យារ​ពáŸáž›â€‹ážŸáŸ†áž¡áŸáž„"
+
+ #, fuzzy
+ #~ msgid "Alternative rock"
+ #~ msgstr "Alternative"
+
+ #, fuzzy
+ #~ msgid "Instrumental pop"
+ #~ msgstr "Instrumental"
+
+ #, fuzzy
+ #~ msgid "Instrumental rock"
+ #~ msgstr "Instrumental"
+
+ #, fuzzy
+ #~ msgid "Southern rock"
+ #~ msgstr "Soft rock"
+
+ #, fuzzy
+ #~ msgid "New wave"
+ #~ msgstr "សមáŸáž™â€‹ážáŸ’មី"
+
+ #, fuzzy
+ #~ msgid "Acid punk"
+ #~ msgstr "អាស៊ីáž"
+
+ #, fuzzy
+ #~ msgid "Acid jazz"
+ #~ msgstr "អាស៊ីáž"
+
+ #, fuzzy
+ #~ msgid "Dummy ifo demux"
+ #~ msgstr "ការ​បង្ហាញ​ពុម្ព​អក្សរ Dummy"
+
+ #, fuzzy
+ #~ msgid "Text subtitles parser"
+ #~ msgstr "កម្មវិធី​ញែក​ចំណងជើង​រង EBU STL"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Frames per second"
@@@ -31404,15 -31157,15 +35236,27 @@@
#, fuzzy
#~ msgid "Subtitles delay"
++<<<<<<< HEAD
+#~ msgstr "ការ​ពន្យារពáŸáž›â€‹áž…ំណងជើង​រង"
+
+#, fuzzy
+#~ msgid "Subtitles format"
+#~ msgstr "ទ្រង់ទ្រាយ​ចំណងជើង​រង"
+
+#, fuzzy
+#~ msgid "Subtitles description"
+#~ msgstr "សáŸáž…ក្ដី​ពណ៌នា​ចំណង​ជើង​រង"
++=======
+ #~ msgstr "ការ​ពន្យារ​​ពáŸáž›â€‹áž…ំណង​ជើង​រង"
+
+ #, fuzzy
+ #~ msgid "Subtitles format"
+ #~ msgstr "បទ​ចំណងជើង​រង"
+
+ #, fuzzy
+ #~ msgid "Subtitles description"
+ #~ msgstr "សáŸáž…ក្ដី​ពណ៌នា​ស្ទ្រីម"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Silent mode"
@@@ -31428,7 -31181,7 +35272,11 @@@
#, fuzzy
#~ msgid "Append"
++<<<<<<< HEAD
+#~ msgstr "រូបរាង"
++=======
+ #~ msgstr "បន្ážáŸ‚ម​​ážáž¶áž„ចុង​ទៅ​ឯកសារ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
@@@ -31507,7 -31260,7 +35355,11 @@@
#, fuzzy
#~ msgid "Compiled by %@ with %@"
++<<<<<<< HEAD
+#~ msgstr "បាន​ចង​ក្រង​ដោយ %s ជាមួយ %@"
++=======
+ #~ msgstr "បាន​ចងក្រោយ​ដោយ %s នៅ​លើ %s (%s)\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Automatically save the volume on exit"
@@@ -31523,11 -31276,11 +35375,19 @@@
#, fuzzy
#~ msgid "Subscreen left:"
++<<<<<<< HEAD
+#~ msgstr "អáŸáž€áŸ’រង់​រង​ážáž¶áž„ឆ្វáŸáž„"
+
+#, fuzzy
+#~ msgid "Subscreen top:"
+#~ msgstr "អáŸáž€áŸ’រង់​រង​ážáž¶áž„​លើ"
++=======
+ #~ msgstr "កម្ពស់​អáŸáž€áŸ’រង់​រង"
+
+ #, fuzzy
+ #~ msgid "Subscreen top:"
+ #~ msgstr "ទទឹង​អáŸáž€áŸ’រង់​រង"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Subscreen width:"
@@@ -31551,11 -31304,11 +35411,19 @@@
#, fuzzy
#~ msgid "Subtitles encoding"
++<<<<<<< HEAD
+#~ msgstr "ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž…ំណងជើង​រង"
+
+#, fuzzy
+#~ msgid "Subtitles alignment"
+#~ msgstr "ការ​ážáž˜áŸ’រឹម​ចំណងជើង​រង"
++=======
+ #~ msgstr "កូដិក​ចំណងជើង​រង"
+
+ #, fuzzy
+ #~ msgid "Subtitles alignment"
+ #~ msgstr "ការ​ážáž˜áŸ’រឹម​វីដáŸáž¢áž¼"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "SAP announce"
@@@ -31563,11 -31316,11 +35431,19 @@@
#, fuzzy
#~ msgid "RTSP announce"
++<<<<<<< HEAD
+#~ msgstr "ការប្រកាស RTSP"
+
+#, fuzzy
+#~ msgid "HTTP announce"
+#~ msgstr "ការប្រកាស HTTP"
++=======
+ #~ msgstr "ការ​ប្រកាស SAP"
+
+ #, fuzzy
+ #~ msgid "HTTP announce"
+ #~ msgstr "ការ​ប្រកាស SAP"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "HTML Playlist"
@@@ -31587,7 -31340,7 +35463,11 @@@
#, fuzzy
#~ msgid "Subtitles & On Screen Display Settings"
++<<<<<<< HEAD
+#~ msgstr "ការ​កំណážáŸ‹â€‹áž…ំណងជើង​រង និង​ការ​បង្ហាញ​លើ​អáŸáž€áŸ’រង់"
++=======
+ #~ msgstr "បើក On Screen Display (OSD)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Input & Codecs"
@@@ -31595,7 -31348,7 +35475,11 @@@
#, fuzzy
#~ msgid "Input & Codec settings"
++<<<<<<< HEAD
+#~ msgstr "ការ​កំណážáŸ‹â€‹áž–áŸážáŸŒáž˜áž¶áž“​បញ្ចូល និង​ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠ"
++=======
+ #~ msgstr "ការ​កំណážáŸ‹â€‹áž–áŸážáŸŒáž˜áž¶áž“​បញ្ចូល និង​កូដិក"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Enable Audio"
@@@ -31619,7 -31372,7 +35503,11 @@@
#, fuzzy
#~ msgid "Preferred Subtitle Language"
++<<<<<<< HEAD
+#~ msgstr "ភាសា​ចំណងជើង​រង​ដែល​ចូលចិážáŸ’áž"
++=======
+ #~ msgstr "ភាសា​អូឌីយ៉ូ​ដែល​ចូលចិážáŸ’áž"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Force Bold"
@@@ -31635,19 -31388,19 +35523,35 @@@
#, fuzzy
#~ msgid "Subtitle track syncronization:"
++<<<<<<< HEAD
+#~ msgstr "ការ​ធ្វើ​សមកាលកម្ម​បទ​ចំណងជើង​រង៖"
+
+#, fuzzy
+#~ msgid "Subtitles speed:"
+#~ msgstr "ល្បឿន​ចំណងជើង​រង៖"
+
+#, fuzzy
+#~ msgid "Subtitles duration factor:"
+#~ msgstr "កážáŸ’ážáž¶â€‹ážáž·ážšážœáŸáž›áž¶â€‹áž…ំណងជើង​រង៖"
+
+#, fuzzy
+#~ msgid "SAP Announce"
+#~ msgstr "ការប្រកាស SAP"
++=======
+ #~ msgstr "សមកាលកម្ម​បទ​អូឌីយ៉ូ ៖"
+
+ #, fuzzy
+ #~ msgid "Subtitles speed:"
+ #~ msgstr "ចំណង​ជើង​រង"
+
+ #, fuzzy
+ #~ msgid "Subtitles duration factor:"
+ #~ msgstr "កážáŸ’ážáž¶â€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž”រិមាណ I"
+
+ #, fuzzy
+ #~ msgid "SAP Announce"
+ #~ msgstr "ការ​ប្រកាស SAP"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Minimal Mac OS X OpenGL video output (opens a borderless window)"
@@@ -31723,19 -31476,19 +35627,35 @@@
#, fuzzy
#~ msgid " m Show/Hide metadata box"
++<<<<<<< HEAD
+#~ msgstr " M បង្ហាញ/លាក់​ប្រអប់​ទិន្ននáŸáž™â€‹áž˜áŸážáž¶"
+
+#, fuzzy
+#~ msgid " Volume : %u%%"
+#~ msgstr " កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„ ៖ %3ld%%"
+
+#, fuzzy
+#~ msgid "Previous media in the playlist, skip backward when keep-pressed"
+#~ msgstr "មáŸážŒáŸ€â€‹áž–ីមុន​ក្នុង​បញ្ជី​ចាក់ រំលង​ការ​ážáž¶ážšâ€‹â€‹ážáž™áž€áŸ’រោយ​ពáŸáž›â€‹áž”ាន​ចុច"
+
+#, fuzzy
+#~ msgid "Next media in the playlist, skip forward when keep-pressed"
+#~ msgstr "មáŸážŒáŸ€â€‹áž”ន្ទាប់​ក្នុង​បញ្ជី​ចាក់ រំលង​ការ​ážáž¶ážšâ€‹áž‘ៅមុážâ€‹áž–áŸáž›â€‹áž”ាន​ចុច"
++=======
+ #~ msgstr " L បង្ហាញ/លាក់​ប្រអប់​សារ"
+
+ #, fuzzy
+ #~ msgid " Volume : %u%%"
+ #~ msgstr " ប្រភព  ៖ %s"
+
+ #, fuzzy
+ #~ msgid "Previous media in the playlist, skip backward when keep-pressed"
+ #~ msgstr "មáŸážŒáŸ€â€‹áž–ី​មុន​នៅ​ក្នុង​បញ្ជី​ចាក់"
+
+ #, fuzzy
+ #~ msgid "Next media in the playlist, skip forward when keep-pressed"
+ #~ msgstr "មáŸážŒáŸ€â€‹áž”ន្ទាប់​នៅ​ក្នុង​បញ្ជី​ចាក់"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Show playlist"
@@@ -31743,7 -31496,7 +35663,11 @@@
#, fuzzy
#~ msgid "Open subtitles file"
++<<<<<<< HEAD
+#~ msgstr "បើក​ឯកសារ​ចំណងជើង​រង"
++=======
+ #~ msgstr "បើក​ចំណងជើង​រង"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Preamp\n"
@@@ -31771,7 -31524,7 +35695,11 @@@
#, fuzzy
#~ msgid "Detailed View"
++<<<<<<< HEAD
+#~ msgstr "បញ្ជី​លម្អិáž"
++=======
+ #~ msgstr "ទិដ្ឋភាព​មáŸážŒáŸ€"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "List View"
@@@ -31779,7 -31532,7 +35707,11 @@@
#, fuzzy
#~ msgid "PictureFlow View "
++<<<<<<< HEAD
+#~ msgstr "លំហូរ​រូបភាព"
++=======
+ #~ msgstr "រូបភាព​កើន​ឡើង ។"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Select an action to change the associated hotkey"
@@@ -31809,7 -31562,7 +35741,11 @@@
#, fuzzy
#~ msgid "Allow checking for VLC updates"
++<<<<<<< HEAD
+#~ msgstr "áž–áž·áž“áž·ážáŸ’យមើល​បច្ចុប្បន្នភាព VLC យ៉ាង​ទៀážáž‘ាážáŸ‹"
++=======
+ #~ msgstr "áž–áž·áž“áž·ážáŸ’យមើល​បច្ចុប្បន្នភាព VLC"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Save and Continue"
@@@ -31833,7 -31586,7 +35769,11 @@@
#, fuzzy
#~ msgid "&Convert / Save"
++<<<<<<< HEAD
+#~ msgstr "បម្លែង/រក្សាទុក"
++=======
+ #~ msgstr "បម្លែង / រក្សាទុក..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Subtitles Files"
@@@ -31865,11 -31618,11 +35805,19 @@@
#, fuzzy
#~ msgid "Hide VLC media player in taskbar"
++<<<<<<< HEAD
+#~ msgstr "លាក់​កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC ក្នុង​របារ​ភារកិច្ច"
+
+#, fuzzy
+#~ msgid "Show VLC media player"
+#~ msgstr "បង្ហាញ​កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC"
++=======
+ #~ msgstr "ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC"
+
+ #, fuzzy
+ #~ msgid "Show VLC media player"
+ #~ msgstr "កម្មវិធី​ចាក់​មáŸážŒáŸ€ VLC"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Advanced options"
@@@ -31913,7 -31666,7 +35861,11 @@@
#, fuzzy
#~ msgid "Automatically add new medias to ML"
++<<<<<<< HEAD
+#~ msgstr "ទៅ​យក​ពáŸážáŸŒáž˜áž¶áž“​មáŸážŒáŸ€â€‹ážŠáŸ„យ​ស្វáŸáž™áž”្រវážáŸ’ážáž·"
++=======
+ #~ msgstr "បន្ážáŸ‚ម​/​លុប​ស្ទ្រីម​ពáŸážáŸŒáž˜áž¶áž“​បញ្ចូល​ដោយ​ស្វáŸáž™áž”្រវážáŸ’ážáž·"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "X Screensaver disabler"
@@@ -31933,7 -31686,7 +35885,11 @@@
#, fuzzy
#~ msgid "Title format string"
++<<<<<<< HEAD
+#~ msgstr "ទ្រង់ទ្រាយ​ចំណងជើង​រង"
++=======
+ #~ msgstr "áž›áŸážâ€‹ážŸáž˜áŸ’គាល់​ទ្រង់ទ្រាយ XVideo"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "MSN Now-Playing"
@@@ -31961,7 -31714,7 +35917,11 @@@
#, fuzzy
#~ msgid "Decompression"
++<<<<<<< HEAD
+#~ msgstr "ការ​មិន​បង្ហាប់ LZMA"
++=======
+ #~ msgstr "ការ​បង្ហាប់​ážáŸ’សែកោង QP"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Command UDP port"
@@@ -32017,21 -31770,21 +35977,37 @@@
#, fuzzy
#~ msgid "Subtitles encoder"
++<<<<<<< HEAD
+#~ msgstr "កម្មវិធី​ដាក់​លáŸážáž€áž¼ážŠâ€‹áž…ំណងជើង​រង"
++=======
+ #~ msgstr "ឌិកូឌáŸážšâ€‹áž…ំណងជើង​រង DVB"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
#~ "This is the subtitles encoder module that will be used (and its "
#~ "associated options)."
++<<<<<<< HEAD
+#~ msgstr "áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž˜áŸ‰áž¼ážŒáž»áž›â€‹áž€áž˜áŸ’មវិធី​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž…ំណងជើង​រង​ដែល​នឹង​ážáŸ’រូវ​ប្រើ (និង​ជម្រើស​ពាក់ពáŸáž“្ធ​របស់​វា)"
+
+#, fuzzy
+#~ msgid "Destination subtitles codec"
+#~ msgstr "ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž…ំណងជើង​រង​ទិសដៅ"
+
+#, fuzzy
+#~ msgid "This is the subtitles codec that will be used."
+#~ msgstr "áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž€áž¶ážšâ€‹ážŠáž¶áž€áŸ‹â€‹áž›áŸážâ€‹áž€áž¼ážŠâ€‹áž…ំណងជើង​រង​ដែល​នឹង​ážáŸ’រូវ​ប្រើ។"
++=======
+ #~ msgstr "áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž˜áŸ‰áž¼ážŒáž»áž›â€‹áž¢áŸŠáž·áž“កូដ​វីដáŸáž¢áž¼ ដែល​នឹង​ážáŸ’រូវ​ប្រើ (និង​ជម្រើស​ដែល​បាន​ភ្ជាប់​របស់​វា) ។"
+
+ #, fuzzy
+ #~ msgid "Destination subtitles codec"
+ #~ msgstr "កូដិក​វីដáŸáž¢áž¼â€‹áž‘ិសដៅ"
+
+ #, fuzzy
+ #~ msgid "This is the subtitles codec that will be used."
+ #~ msgstr "áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž€áž¼ážŠáž·áž€â€‹ážœáž¸ážŠáŸáž¢áž¼ ដែល​នឹង​ážáŸ’រូវ​ប្រើ ។"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Edge Weightning"
@@@ -32067,7 -31820,7 +36043,11 @@@
#, fuzzy
#~ msgid "Number of lines for change"
++<<<<<<< HEAD
+#~ msgstr "ចំនួន​ចំណិážâ€‹áž€áŸ’នុង​មួយ​ស៊ុម"
++=======
+ #~ msgstr "ចំនួន​ឆានែល​អូឌីយ៉ូ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Number of non black pixels "
@@@ -32147,11 -31900,11 +36127,19 @@@
#, fuzzy
#~ msgid "Change subtitles delay"
++<<<<<<< HEAD
+#~ msgstr "ប្ដូរ​ការ​ពន្យារ​ចំណងជើង​រង"
+
+#, fuzzy
+#~ msgid "Enable desktop mode "
+#~ msgstr "បើក​របៀប​កម្មវិធី"
++=======
+ #~ msgstr "បង្កើន​​ការ​ពន្យារពáŸáž›â€‹áž…ំណងជើង​រង"
+
+ #, fuzzy
+ #~ msgid "Enable desktop mode "
+ #~ msgstr "បើក​របៀប​មáŸáž ្កាបាស់"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Windows GAPI video output"
@@@ -32171,11 -31924,11 +36159,19 @@@
#, fuzzy
#~ msgid "Subtitle Codec"
++<<<<<<< HEAD
+#~ msgstr "ការ​ដាក់​លáŸážâ€‹áž€áž¼ážŠâ€‹áž…ំណងជើង​រង"
+
+#, fuzzy
+#~ msgid "Output Method"
+#~ msgstr "លទ្ធផល\tវិធីសាស្ážáŸ’ážš"
++=======
+ #~ msgstr "កូដិក​ចំណងជើង​រង"
+
+ #, fuzzy
+ #~ msgid "Output Method"
+ #~ msgstr "វិធីសាស្ដ្រ​ចូលដំណើរការ​លទ្ធផល"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Video Bit Rate"
@@@ -32191,15 -31944,15 +36187,27 @@@
#, fuzzy
#~ msgid "MUX Options"
++<<<<<<< HEAD
+#~ msgstr "ជម្រើស​ទ្វáŸâ€‹áž‘ិស"
+
+#, fuzzy
+#~ msgid "Video Scale"
+#~ msgstr "មាážáŸ’រដ្ឋាន​វីដáŸáž¢áž¼"
+
+#, fuzzy
+#~ msgid "Output Port"
+#~ msgstr "ច្រក​លទ្ធផល"
++=======
+ #~ msgstr "ជម្រើស DMX"
+
+ #, fuzzy
+ #~ msgid "Video Scale"
+ #~ msgstr "ការ​ចាប់​យក​វីដáŸáž¢áž¼"
+
+ #, fuzzy
+ #~ msgid "Output Port"
+ #~ msgstr "ទ្រង់ទ្រាយ​លទ្ធផល"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Output Destination"
@@@ -32211,7 -31964,7 +36219,11 @@@
#, fuzzy
#~ msgid "Input Media"
++<<<<<<< HEAD
+#~ msgstr "មáŸážŒáŸ€â€‹áž”ញ្ចូល"
++=======
+ #~ msgstr "ស្ទ្រីម​ពáŸážáŸŒáž˜áž¶áž“​បញ្ចូល"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "File Name"
@@@ -32239,7 -31992,7 +36251,11 @@@
#, fuzzy
#~ msgid "column border"
++<<<<<<< HEAD
+#~ msgstr "ស៊ុម​ជួរឈរ"
++=======
+ #~ msgstr "លំដាប់​ធាážáž»"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "height"
@@@ -32255,7 -32008,7 +36271,11 @@@
#, fuzzy
#~ msgid "Verbosity:"
++<<<<<<< HEAD
+#~ msgstr "បរិយាយ៖"
++=======
+ #~ msgstr "ភាព​សម្បូរ​បែប"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Add a subtitles file"
@@@ -32267,7 -32020,7 +36287,11 @@@
#, fuzzy
#~ msgid "Select the subtitles file"
++<<<<<<< HEAD
+#~ msgstr "ជ្រើស​ឯកសារ​ចំណងជើង​រង"
++=======
+ #~ msgstr "ជ្រើស​​ឯកសារ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Destinations"
@@@ -32291,11 -32044,11 +36315,19 @@@
#, fuzzy
#~ msgid "Preferred subtitles language"
++<<<<<<< HEAD
+#~ msgstr "ភាសា​ចំណងជើង​រង​ដែល​ចូលចិážáŸ’áž"
+
+#, fuzzy
+#~ msgid "Subtitles effects"
+#~ msgstr "បែបផែន​ចំណងជើង​រង"
++=======
+ #~ msgstr "ភាសា​អូឌីយ៉ូ​ដែល​ចូលចិážáŸ’áž"
+
+ #, fuzzy
+ #~ msgid "Subtitles effects"
+ #~ msgstr "កូដិក​ចំណងជើង​រង"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Black slot"
@@@ -32573,7 -32326,7 +36605,11 @@@
#, fuzzy
#~ msgid "Create Stream"
++<<<<<<< HEAD
+#~ msgstr "បម្លែង និង​ស្ទ្រីម"
++=======
+ #~ msgstr "ស្ទ្រីម​លំនាំដើម"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Media File"
@@@ -32605,7 -32358,7 +36641,11 @@@
#, fuzzy
#~ msgid "Create New Stream"
++<<<<<<< HEAD
+#~ msgstr "បម្លែង និង​ស្ទ្រីម"
++=======
+ #~ msgstr "បង្កើážâ€‹áž‘ម្រង់​ážáŸ’មី"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Delete All Streams"
@@@ -32780,7 -32533,7 +36820,11 @@@
#, fuzzy
#~ msgid "Transponder FEC"
++<<<<<<< HEAD
+#~ msgstr "ផ្លាស់​កន្លែង"
++=======
+ #~ msgstr "បម្លែង​ážáŸ’រឡប់"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Transponder symbol rate in kHz"
@@@ -32823,7 -32576,7 +36867,11 @@@
#, fuzzy
#~ msgid "Certificate file"
++<<<<<<< HEAD
+#~ msgstr "មើល​វិញ្ញាបនបážáŸ’ážš"
++=======
+ #~ msgstr "ážáŸ’រឡប់​បញ្ឈរ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Private key file"
@@@ -33169,7 -32922,7 +37217,11 @@@
#, fuzzy
#~ msgid "Dummy S/PDIF audio mixer"
++<<<<<<< HEAD
+#~ msgstr "IFO មិន​ទ្វáŸâ€‹áž‘ិស​មិន​ល្អ"
++=======
+ #~ msgstr "ឧបករណáŸâ€‹áž‘្វáŸáž‘ិស Dummy/Raw"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Trivial audio mixer"
@@@ -33398,7 -33151,7 +37450,11 @@@
#, fuzzy
#~ msgid "Volume: %d%%"
++<<<<<<< HEAD
+#~ msgstr "កម្រិážâ€‹ážŸáŸ†áž¡áŸáž„ %ld%%"
++=======
+ #~ msgstr "បន្ážáž™â€‹áž€áž˜áŸ’ážšáž·ážâ€‹ážŸáŸ†áž¡áŸáž„"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Keep current Equalizer settings"
diff --combined po/kn.po
index f0d2f1c,d30b03e..c22291b
--- a/po/kn.po
+++ b/po/kn.po
@@@ -3,18 -3,16 +3,28 @@@
# This file is distributed under the same license as the VLC package.
#
# Translators:
++<<<<<<< HEAD
+# chaitra <chaitra.kulkarni2 at gmail.com>, 2013
# Karthik C <ckarthik91 at gmail.com>, 2013
+# karthiknatesh <karthik_natesh at live.com>, 2013
++=======
++# Karthik C <ckarthik91 at gmail.com>, 2013
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# msj2, 2013
# yogi <yogesh at karnatakaeducation.org.in>, 2013
msgid ""
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-08 08:17+0000\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-08-05 15:40+0000\n"
+ "Last-Translator: Karthik C <ckarthik91 at gmail.com>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Kannada (http://www.transifex.com/projects/p/vlc-trans/"
"language/kn/)\n"
"Language: kn\n"
@@@ -140,7 -138,7 +150,11 @@@ msgstr "ವಿವಿಧ ಶà³à²°à²µà²
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -275,7 -273,7 +289,11 @@@ msgstr "
#: include/vlc_config_cat.h:143
msgid "Access output"
++<<<<<<< HEAD
+msgstr "ಲà²à²¿à²¸à³à²µ ನಿರà³à²—ಮ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:145
msgid ""
@@@ -357,7 -355,7 +375,11 @@@ msgstr "ಮà³à²‚ದà³à²µà²°à³†à²¦ ಉ
#: include/vlc_config_cat.h:183
msgid "Advanced settings"
++<<<<<<< HEAD
+msgstr "ಉನà³à²¨à²¤ ಸಿದà³à²§à²¤à³†à²—ಳà³"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:188 modules/gui/macosx/open.m:133
#: modules/gui/macosx/open.m:597 modules/gui/macosx/simple_prefs.m:340
@@@ -412,7 -410,7 +434,11 @@@ msgstr "ಒಂದೠಅಥವಾ ಹà³
#: include/vlc_intf_strings.h:51
msgid "Select Directory"
++<<<<<<< HEAD
+msgstr "ಕಡತಕೋಶ ಆಯà³à²•à³† ಮಾಡಿ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:51
msgid "Select Folder"
@@@ -420,7 -418,7 +446,11 @@@ msgstr "
#: include/vlc_intf_strings.h:55
msgid "Media &Information"
++<<<<<<< HEAD
+msgstr "ಮಾಧà³à²¯à²® ಮತà³à²¤à³ ಮಾಹಿತಿ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:56
msgid "&Codec Information"
@@@ -447,10 -445,10 +477,17 @@@ msgid "&About
msgstr "&ಬಗà³à²—ೆ"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -462,7 -460,7 +499,11 @@@ msgstr "
#: include/vlc_intf_strings.h:67
msgid "Information..."
++<<<<<<< HEAD
+msgstr "ಮಾಹಿತಿ..."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:68
msgid "Create Directory..."
@@@ -474,7 -472,7 +515,11 @@@ msgstr "
#: include/vlc_intf_strings.h:70
msgid "Show Containing Directory..."
++<<<<<<< HEAD
+msgstr "ಹೊ೦ದಿರà³à²µ ಕಡತವನà³à²¨à³ ತೋರಿಸà³"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:71
msgid "Show Containing Folder..."
@@@ -489,17 -487,17 +534,29 @@@ msgid "Save...
msgstr "ಉಳಿಸà³"
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "ಎಲà³à²²à²µà²¨à³à²¨à³ ಪà³à²¨à²°à²¾à²µà²°à³à²¤à²¿à²¸à³"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "ಒಂದನà³à²¨à³ ಪà³à²¨à²°à²¾à²µà²°à³à²¤à²¿à²¸à³"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -579,7 -577,7 +636,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "ನಿಷà³à²•à³à²°à²¿à²¯à²—ೊಳಿಸಿ"
@@@ -1024,15 -1022,15 +1085,27 @@@ msgstr "Up
#: src/config/keys.c:116 modules/gui/macosx/MainMenu.m:469
msgid "Volume Down"
++<<<<<<< HEAD
+msgstr "ಧà³à²µà²¨à²¿ ಇಳಿಸà³"
+
+#: src/config/keys.c:117
+msgid "Volume Mute"
+msgstr "ಧà³à²µà²¨à²¿ ಸà³à²¤à²—ಿತಗೊಳಿಸà³"
+
+#: src/config/keys.c:118 modules/gui/macosx/MainMenu.m:468
+msgid "Volume Up"
+msgstr "ಧà³à²µà²¨à²¿ à²à²°à²¿à²¸à³"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:117
+ msgid "Volume Mute"
+ msgstr ""
+
+ #: src/config/keys.c:118 modules/gui/macosx/MainMenu.m:468
+ msgid "Volume Up"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:119
msgid "Zoom In"
@@@ -1118,7 -1116,7 +1191,11 @@@ msgstr "%s [%s %d]
#: src/libvlc-module.c:564 modules/gui/macosx/MainMenu.m:370
#: modules/gui/macosx/MainMenu.m:371
msgid "Program"
++<<<<<<< HEAD
+msgstr "ತಂತà³à²°à²¾à²‚ಶ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/es_out.c:1336 src/input/es_out.c:1338
msgid "Scrambled"
@@@ -1238,20 -1236,20 +1315,36 @@@ msgstr "
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1275,7 -1273,7 +1368,11 @@@ msgstr "ಕಲೆಗಾರ
#: src/input/meta.c:57 modules/demux/mp4/mp4.c:1079
#: modules/gui/macosx/MainMenu.m:72
msgid "Genre"
++<<<<<<< HEAD
+msgstr "ಪà³à²°à²•à²¾à²°"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/meta.c:58 modules/mux/asf.c:60
msgid "Copyright"
@@@ -1642,7 -1640,7 +1739,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1724,7 -1722,7 +1825,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "ಯಾವà³à²¦à²¿à²²à³à²²"
@@@ -1748,7 -1746,7 +1853,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -1938,7 -1936,7 +2047,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "ಸದಾ ಮೇಲಿರಲಿ"
@@@ -1989,7 -1987,7 +2102,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -1998,7 -1996,7 +2115,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2054,7 -2052,7 +2175,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2223,7 -2221,7 +2348,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2351,24 -2349,24 +2480,44 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
msgid "Default"
++<<<<<<< HEAD
+msgstr "ಪೂರà³à²µà²¨à²¿à²¯à³†à³‚ೕಜಿತ"
+
+#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
+#: modules/gui/qt4/components/extended_panels.cpp:1024
+#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
+msgid "Enable"
+msgstr "ಸಕà³à²°à²¿à²¯à²—ೊಳಿಸà³"
++=======
+ msgstr ""
+
+ #: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
+ #: modules/gui/qt4/components/extended_panels.cpp:1024
+ #: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
+ msgid "Enable"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:542
msgid "MTU of the network interface"
@@@ -2667,7 -2665,7 +2816,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3479,7 -3477,7 +3632,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "ನಿರà³à²²à²•à³à²·à²¿à²¸à²¿"
@@@ -3503,8 -3501,8 +3660,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3584,10 -3582,10 +3746,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3600,10 -3598,10 +3769,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "ಹಿಂದಿನ"
@@@ -3612,9 -3610,9 +3788,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3849,9 -3847,9 +4031,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4265,7 -4263,7 +4453,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4462,12 -4460,12 +4654,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr ""
@@@ -5223,7 -5221,7 +5424,11 @@@ msgstr "ಕತà³à²¤à²°à²¿à²¸à³
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7519,7 -7517,7 +7724,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8251,7 -8249,7 +8460,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9362,7 -9360,7 +9575,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9393,7 -9391,7 +9610,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9401,30 -9399,30 +9622,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10590,46 -10588,46 +10835,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10637,61 -10635,61 +10910,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10821,7 -10819,7 +11130,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12608,10 -12606,10 +12921,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -12716,8 -12714,8 +13036,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13053,9 -13051,9 +13378,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -14933,7 -14931,7 +15264,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15112,7 -15110,7 +15447,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15200,9 -15198,9 +15539,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr ""
@@@ -15341,7 -15339,7 +15686,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15361,7 -15359,7 +15710,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15371,7 -15369,7 +15724,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15391,84 -15389,84 +15748,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15504,7 -15502,7 +15932,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15687,8 -15685,8 +16119,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -15781,36 -15779,36 +16218,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15962,7 -15960,7 +16431,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16091,7 -16089,7 +16564,11 @@@ msgstr "
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr ""
@@@ -16176,15 -16174,15 +16653,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16200,30 -16198,30 +16689,56 @@@ msgstr "
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16232,7 -16230,7 +16747,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16460,7 -16458,7 +16979,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -16631,7 -16629,7 +17154,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -16860,12 -16858,12 +17387,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17042,129 -17040,125 +17577,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17177,35 -17171,35 +17820,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19143,20 -19137,20 +19816,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22459,45 -22453,45 +23148,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22506,93 -22500,93 +23231,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -26850,8 -26844,9 +27655,14 @@@ msgid "Default caching policy
msgstr ""
#: modules/gui/qt4/ui/sprefs_interface.h:514
++<<<<<<< HEAD
+msgid "Menus language:"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Menus language:"
+ msgstr "à²à²¾à²·à³†"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:515
msgid "Look and feel"
diff --combined po/ko.po
index 009770d,f94c025..925f8f8
--- a/po/ko.po
+++ b/po/ko.po
@@@ -13,7 -13,7 +13,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-10-22 12:32+0000\n"
"Last-Translator: sheppaul <sheppaul at naver.com>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -142,7 -142,7 +146,11 @@@ msgstr "기타 오디오 ì„¤ì • ë° ëª¨
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -480,10 -480,10 +488,17 @@@ msgid "&About
msgstr "ì •ë³´(&A)"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -522,17 -522,17 +537,29 @@@ msgid "Save...
msgstr "ì €ìž¥..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "ì „ì²´ 반복"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "한개 반복"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -638,7 -638,7 +665,11 @@@ msgstr "최대 필터수(%u) ì— ë„달
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "사용 안함"
@@@ -1335,21 -1335,21 +1366,37 @@@ msgstr "í”„ë ˆìž„ ë ˆì´íŠ¸
msgid "Decoded format"
msgstr "ë””ì½”ë”©ëœ í˜•ì‹"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "ìž…ë ¥ì„ ì—´ 수 없습니다"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "ìž…ë ¥ì„ ì—´ 수 없습니다"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLCì—ì„œ MRL '%s'ì„(를) ì—´ 수 없습니다. ìžì„¸í•œ ë‚´ìš©ì€ ë¡œê·¸ë¥¼ 확ì¸í•˜ì„¸ìš”."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLCì—ì„œ ìž…ë ¥ 형ì‹ì„ ì¸ì‹í• 수 없습니다."
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLCì—ì„œ ìž…ë ¥ 형ì‹ì„ ì¸ì‹í• 수 없습니다."
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1775,7 -1775,7 +1822,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1860,7 -1860,7 +1911,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "ì—†ìŒ"
@@@ -1890,7 -1890,7 +1945,11 @@@ msgstr "
"VLC ì´ ì‚¬ìš©í•˜ëŠ” 비디오 ì¶œë ¥ ë°©ì‹ ìž…ë‹ˆë‹¤. 기본 ë™ìž‘ì€ ìžë™ì 으로 최ì ì¸ ë°©ì‹"
"ì´ ì„ íƒë©ë‹ˆë‹¤. "
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "비디오 사용하기"
@@@ -2094,7 -2094,7 +2153,11 @@@ msgstr "
"기능). VLC는 기본ì 으로 ì´ê²ƒì„ ì‚¬ìš©í•˜ë ¤ê³ ì‹œë„합니다."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "í•ìƒ 위ì—"
@@@ -2145,7 -2145,7 +2208,11 @@@ msgstr "n 밀리초 후 마우스 커ì„
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2154,7 -2154,7 +2221,11 @@@ msgstr "ë””ì¸í„°ë ˆì´ìŠ¤
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "ë””ì¸í„°ë ˆì´ìŠ¤ 모드"
@@@ -2212,7 -2212,7 +2283,11 @@@ msgstr "
"비활ë™ìœ¼ë¡œ ì¸í•´ 컴퓨터가 대기모드가 ë˜ëŠ”ê²ƒì„ ë°©ì§€í•˜ê¸°ìœ„í•´ ëª¨ë“ ìž¬ìƒí•˜ëŠ” ë™ì•ˆ "
"ì „ì› ê´€ë¦¬ ë°ëª¬ ì œí•œ."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "윈ë„ìš° 꾸미기"
@@@ -2407,7 -2407,7 +2482,11 @@@ msgstr "
"(1:1) ì„ ê°€ì§€ê³ ìžˆìŠµë‹ˆë‹¤. 16:9 í™”ë©´ì˜ ëª¨ë‹ˆí„°ë¼ë©´, ë¹„ìœ¨ì„ ìœ ì§€í•˜ê¸° 위해 ì´ ë¶€"
"ë¶„ì„ 4:3으로 ë³€ê²½ì´ í•„ìš”í• ìˆ˜ 있습니다."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "í”„ë ˆìž„ 건너뛰기"
@@@ -2548,12 -2548,12 +2627,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2561,7 -2561,7 +2649,11 @@@ msgid "Default
msgstr "기본"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2896,7 -2896,7 +2988,11 @@@ msgid "You can completely disable the s
msgstr "ìžë§‰ 처리를 ì™„ì „ížˆ ë¹„í™œì„±í™”í• ìˆ˜ 있습니다."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3821,7 -3821,7 +3917,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "ì´ ì„¤ì •ì€ \"단축키\"ë¡œ ì•Œê³ ìžˆëŠ” ì „ì— VLC 키 ë°”ì¸ë”©ìž…니다."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "무시"
@@@ -3847,8 -3847,8 +3947,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3928,10 -3928,10 +4033,17 @@@ msgid "Slower (fine)
msgstr "ëŠë¦¬ê²Œ (조금)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3944,10 -3944,10 +4056,17 @@@ msgid "Select the hotkey to use to ski
msgstr "재ìƒëª©ë¡ì—ì„œ ë‹¤ìŒ í•ëª©ìœ¼ë¡œ ë„˜ê¹€ì— ì‚¬ìš©í• ë‹¨ì¶•í‚¤ ì„ íƒ."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "ì´ì „"
@@@ -3956,9 -3956,9 +4075,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "재ìƒëª©ë¡ì—ì„œ ì´ì „ í•ëª©ìœ¼ë¡œ ë„˜ê¹€ì— ì‚¬ìš©í• ë‹¨ì¶•í‚¤ ì„ íƒ."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4193,9 -4193,9 +4318,15 @@@ msgid "Select the key to decrease audi
msgstr "오디오 ìŒëŸ‰ ì¤„ì¼ í‚¤ ì„ íƒ."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "ìŒì†Œê±°"
@@@ -4609,7 -4609,7 +4740,11 @@@ msgstr "사용가능한 오디오 장ì¹
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "스냅샷"
@@@ -4812,12 -4812,12 +4947,21 @@@ msgstr "다운로드중...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "취소"
@@@ -5579,7 -5579,7 +5723,11 @@@ msgstr "잘ë¼ë‚´ê¸°
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "화면 비율"
@@@ -8016,7 -8016,7 +8164,11 @@@ msgstr "스í¬ë¦° ìž…ë ¥
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "스í¬ë¦°"
@@@ -8761,7 -8761,7 +8913,11 @@@ msgstr "최대 ìŒëŸ‰ #
msgid "Volume Set"
msgstr "ìŒëŸ‰ ì„¤ì •"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9927,7 -9927,7 +10083,11 @@@ msgstr "ì„œë¼ìš´ë“œ 7.1
msgid "ALSA audio output"
msgstr "ALSA 오디오 ì¶œë ¥"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "오디오 ì¶œë ¥ 실패"
@@@ -9960,7 -9960,7 +10120,11 @@@ msgstr "AudioQueue (iOS / Mac OS) 오ë”
msgid "Android AudioTrack audio output"
msgstr "안드로ì´ë“œ AudioTrack 오디오 ì¶œë ¥"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "iOSì˜ AudioUnit ì¶œë ¥"
@@@ -9968,21 -9968,21 +10132,37 @@@
msgid "Last audio device"
msgstr "마지막 오디오 장치"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit ì¶œë ¥"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit ì¶œë ¥"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"ì„ íƒëœ 오디오 ì¶œë ¥ 장치가 다른 í”„ë¡œê·¸ëž¨ì— ì˜í•´ ë…ì ì 으로 사용중입니다."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "오디오 장치가 ì„¤ì •ë˜ì§€ ì•ŠìŒ"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "오디오 장치가 ì„¤ì •ë˜ì§€ ì•ŠìŒ"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -9990,11 -9990,11 +10170,19 @@@ msgstr "
"/ì‘ìš© 프로그램/ìœ í‹¸ë¦¬í‹° ì˜ \"오디오 미디 ì„¤ì •\" 으로 스피터 ë ˆì´ì•„ì›ƒì˜ í™˜ê²½"
"ì„ ì„¤ì •í•´ì•¼ 합니다. VLC는 ìŠ¤íŠ¸ë ˆì˜¤ë§Œ ì¶œë ¥í• ê²ƒìž…ë‹ˆë‹¤."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "시스템 사운드 ì¶œë ¥ 장치"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "시스템 사운드 ì¶œë ¥ 장치"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (ì¸ì½”ë”©ëœ ì¶œë ¥)"
@@@ -11253,46 -11253,46 +11441,74 @@@ msgstr "그림ìž
msgid "Outline"
msgstr "ì™¸ê³½ì„ "
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "ê²€ì€ìƒ‰"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "회색"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "ì€ìƒ‰"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "í°ìƒ‰"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "ê³ ë™ìƒ‰"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "빨간색"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11300,61 -11300,61 +11516,97 @@@ msgid "Fuchsia
msgstr "ìží™ìƒ‰"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "노란색"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "황ë¡ìƒ‰"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "녹색"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Teal"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lime"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "ë³´ë¼ìƒ‰"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "남색"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "파란색"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11499,7 -11499,7 +11751,11 @@@ msgstr "ìžë§‰ (ê³ ê¸‰)
msgid "Subtitle renderers using libass"
msgstr "libass 를 사용하는 ìžë§‰ ë Œë”러"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "글꼴 ìºì‰¬ ìƒì„±"
@@@ -13458,10 -13458,10 +13714,17 @@@ msgid "Fast
msgstr "ë¹ ë¥´ê²Œ"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "보통"
@@@ -13569,8 -13569,8 +13832,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus ì œì–´ ì¸í„°íŽ˜ì´ìŠ¤"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13919,9 -13919,9 +14187,15 @@@ msgstr "초기화
msgid "Opening"
msgstr "열기"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "ì¼ì‹œì¤‘지"
@@@ -15850,7 -15850,7 +16124,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG ì „ì†¡ 스트림 디먹서"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "문ìžë‹¤ì¤‘방송"
@@@ -16037,7 -16037,7 +16315,11 @@@ msgid "VLC media player Help
msgstr "VLC 미디어 재ìƒê¸° ë„움ë§"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "ì¸ë±ìŠ¤"
@@@ -16125,9 -16125,9 +16407,15 @@@ msgstr "새 í”„ë¡œíŒŒì¼ ì´ë¦„ì„ ìž…ë
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "ì €ìž¥"
@@@ -16270,7 -16270,7 +16558,11 @@@ msgstr "ìž…ë ¥ì„ ì°¾ì„수 ì—†ìŒ
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "책갈피를 ì‚¬ìš©í•˜ë ¤ë©´ ìŠ¤íŠ¸ë¦¼ì´ ìž¬ìƒì¤‘ì´ê±°ë‚˜ ì¼ì‹œì¤‘지ì´ì–´ì•¼ 합니다."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "시간으로 ì´ë™í•˜ê¸°"
@@@ -16290,7 -16290,7 +16582,11 @@@ msgstr "현재 미디어를 재ìƒí•˜ê±
msgid "Backward"
msgstr "뒤로"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16302,7 -16302,7 +16598,11 @@@ msgstr "
msgid "Forward"
msgstr "앞으로"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16326,23 -16326,15 +16626,35 @@@ msgstr "ì „ì²´í™”ë©´ 모드 í† ê¸€í•˜ê¸
msgid "Click to enable fullscreen video playback."
msgstr "ì „ì²´í™”ë©´ 비디오 재ìƒì„ í™œì„±í™”í•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "현재 미디어를 뒤로 ê³„ì† ê±´ë„ˆë›°ë ¤ë©´ í´ë¦í•œ ìƒíƒœë¥¼ ìœ ì§€í•˜ì„¸ìš”."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "현재 미디어를 ê³„ì† ì•žìœ¼ë¡œ ê±´ë„ˆë›°ë ¤ë©´ í´ë¦í•œ ìƒíƒœë¥¼ ìœ ì§€í•˜ì„¸ìš”."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "재ìƒì„ ì •ì§€í•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "재ìƒëª©ë¡ ë³´ì´ê¸°/ê°ì¶”기"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "재ìƒì„ ì •ì§€í•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "재ìƒëª©ë¡ ë³´ì´ê¸°/ê°ì¶”기"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -16350,12 -16342,12 +16662,20 @@@ msgstr "
"비디오 ì¶œë ¥ê³¼ 재ìƒëª©ë¡ì„ ì „í™˜í•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”. ë©”ì¸ ì°½ì— ë™ì˜ìƒ ìž¬ìƒ ì¤‘ì´ ì•„"
"니면, ìž¬ìƒ ëª©ë¡ì„ 숨길 수 있ë„ë¡ í•´ ì¤ë‹ˆë‹¤."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "반복"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -16363,15 -16355,15 +16683,27 @@@ msgstr "
"반복 모드를 ë³€ê²½í•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”. 세가지 ìƒíƒœê°€ 있습니다: í•œ ê°œ 반복, ì „ë¶€ "
"반복, ë„기"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "셔플"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "무작위 재ìƒì„ 활성화하거나 ë¹„í™œì„±í™”í•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”."
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "셔플"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "무작위 재ìƒì„ 활성화하거나 ë¹„í™œì„±í™”í•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”."
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -16379,38 -16371,46 +16711,77 @@@ msgstr "
"ë³¼ë¥¨ì„ ë³€ê²½í•˜ê¸° 위해서 ì´ ìŠ¬ë¼ì´ë”를 ì‚¬ìš©í•˜ë ¤ë©´ ë²„íŠ¼ì„ ëˆ„ë¥¸ ìƒíƒœë¡œ 마우스를 "
"움ì§ì—¬ 보세요."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "ìŒì†Œê±°ë¥¼ 하거나 í•´ì œí•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "ìµœê³ ë³¼ë¥¨"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "오디오를 최대 볼륨으로 재ìƒí•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "ìŒì†Œê±°ë¥¼ 하거나 í•´ì œí•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "ìµœê³ ë³¼ë¥¨"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "오디오를 최대 볼륨으로 재ìƒí•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "효과"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
"ì´í€„ë¼ì´ì ¸ì™€ 추가 필터를 ë‹´ê³ ìžˆëŠ” 오디오 효과 패ë„ì„ ë³´ë ¤ë©´ í´ë¦í•˜ì„¸ìš”."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "ì´ì „ 재ìƒëª©ë¡ í•ëª©ìœ¼ë¡œ ì´ë™í•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "ë‹¤ìŒ ìž¬ìƒëª©ë¡ í•ëª©ìœ¼ë¡œ ì´ë™í•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”"
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "ì´ì „ 재ìƒëª©ë¡ í•ëª©ìœ¼ë¡œ ì´ë™í•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "ë‹¤ìŒ ìž¬ìƒëª©ë¡ í•ëª©ìœ¼ë¡œ ì´ë™í•˜ë ¤ë©´ í´ë¦í•˜ì„¸ìš”"
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "현재 미디어를 뒤로 ê³„ì† ê±´ë„ˆë›°ë ¤ë©´ í´ë¦í•œ ìƒíƒœë¥¼ ìœ ì§€í•˜ì„¸ìš”."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "현재 미디어를 ê³„ì† ì•žìœ¼ë¡œ ê±´ë„ˆë›°ë ¤ë©´ í´ë¦í•œ ìƒíƒœë¥¼ ìœ ì§€í•˜ì„¸ìš”."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "변환 & 스트림하기"
@@@ -16446,7 -16446,7 +16817,11 @@@ msgstr "ì¶œë ¥ 위치 ì„ íƒí•˜ê¸°
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16635,8 -16635,8 +17010,13 @@@ msgid "A SDP export is requested, but n
msgstr "SDP 내보내기가 필요합니다만 ì–´ë–¤ ì£¼ì†Œë„ ì œê³µë˜ì§€ 않습니다."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "ì‚¬ìš©ìž ì§€ì •"
@@@ -16735,36 -16735,36 +17115,68 @@@ msgstr "ì–´ë–¤ 다른 ì •ë³´ë„ í¬í•¨í
msgid "Don't ask again"
msgstr "다시 묻지 않기"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "VLC 미디어 재ìƒ"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "ì¶©ëŒ ë¡œê·¸ë¥¼ ì°¾ì„수 ì—†ìŒ"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "VLC 미디어 재ìƒ"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "ì¶©ëŒ ë¡œê·¸ë¥¼ ì°¾ì„수 ì—†ìŒ"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "계ì†"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "ì´ì „ 충ëŒì˜ ì–´ë–¤ í”ì ë„ ë°œê²¬í•˜ì§€ 못했습니다."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "ì´ì „ í™˜ê²½ì„¤ì •ì„ ì‚ì œí• ê¹Œìš”?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "ì´ì „ ë²„ì „ì˜ VLC í™˜ê²½ì„¤ì • 파ì¼ì„ 발견했습니다."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "휴지통으로 ì´ë™ ë° VLC 재실행"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "ì´ì „ 충ëŒì˜ ì–´ë–¤ í”ì ë„ ë°œê²¬í•˜ì§€ 못했습니다."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "ì´ì „ í™˜ê²½ì„¤ì •ì„ ì‚ì œí• ê¹Œìš”?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "ì´ì „ ë²„ì „ì˜ VLC í™˜ê²½ì„¤ì • 파ì¼ì„ 발견했습니다."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "휴지통으로 ì´ë™ ë° VLC 재실행"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC 디버그 로그 (%s).rtf"
@@@ -16936,7 -16936,7 +17348,11 @@@ msgid "
msgstr ""
"ì´ ì˜µì…˜ì€ ì¸í„°íŽ˜ì´ìŠ¤ê°€ 다양한 ê²½ìš°ì— ì•„ì´ì½˜ì„ 바꿀 수 있ë„ë¡ í—ˆìš©í•©ë‹ˆë‹¤."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "화면 비율 ìž ê¸ˆ"
@@@ -17067,7 -17067,7 +17483,11 @@@ msgstr "VLC 숨기기
msgid "Hide Others"
msgstr "다른 창 숨기기"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "ëª¨ë‘ ë³´ê¸°"
@@@ -17152,15 -17152,15 +17572,27 @@@ msgstr "트랙 ë™ê¸°í™”
msgid "A→B Loop"
msgstr "A→B 순환"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "재ìƒí›„ 종료"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "한단계 앞으로"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "재ìƒí›„ 종료"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "한단계 앞으로"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "한단계 뒤로"
@@@ -17176,30 -17176,30 +17608,56 @@@ msgstr "ìŒëŸ‰ 줄ì´ê¸°
msgid "Audio Device"
msgstr "오디오 장치"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "ì ˆë°˜ í¬ê¸°"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "보통 í¬ê¸°"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "2ë°° í¬ê¸°"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "í™”ë©´ì— ë§žì¶”ê¸°"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "ì ˆë°˜ í¬ê¸°"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "보통 í¬ê¸°"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "2ë°° í¬ê¸°"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "í™”ë©´ì— ë§žì¶”ê¸°"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "í•ìƒ 맨 ì•ž"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "ì „ì²´í™”ë©´ 비디오 장치"
@@@ -17208,7 -17208,7 +17666,11 @@@
msgid "Post processing"
msgstr "후처리"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "ìžë§‰ íŒŒì¼ ì¶”ê°€..."
@@@ -17446,7 -17446,7 +17908,11 @@@ msgid "Play another media synchronously
msgstr "다른 미디어를 ë™ì‹œì— 재ìƒí•©ë‹ˆë‹¤"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "ì„ íƒ..."
@@@ -17630,7 -17630,7 +18096,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "ìžë§‰ ì¸ì½”딩"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "글꼴 í¬ê¸°"
@@@ -17859,12 -17859,12 +18329,20 @@@ msgstr "메타 ì €ìž¥ì¤‘ 오류
msgid "VLC was unable to save the meta data."
msgstr "VLC ê°€ 메타 ë°ì´í„°ë¥¼ ì €ìž¥í• ìˆ˜ 없습니다."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "í™˜ê²½ì„¤ì •"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "ëª¨ë‘ ì´ˆê¸°í™”"
@@@ -18043,130 -18043,125 +18521,238 @@@ msgstr "재ìƒëª©ë¡ í•ëª©ì´ 바뀔 ë
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "VLC 재ìƒì¤‘ì— iTunes ì¼ì‹œì¤‘지하기"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "기본 ì¸ì½”딩"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "ë””ìŠ¤í”Œë ˆì´ ì„¤ì •"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "기본 ì¸ì½”딩"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "ë””ìŠ¤í”Œë ˆì´ ì„¤ì •"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "글꼴색"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "글꼴"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "ìžë§‰ 언어"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "ìžë§‰ 언어"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "ì„ í˜¸í•˜ëŠ” ìžë§‰ 언어"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OSD 사용하기"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OSD 사용하기"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "불투명ë„"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "굵게"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "굵게"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "ì™¸ê³½ì„ ìƒ‰ìƒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "ì™¸ê³½ì„ ë‘께"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "ì „ì²´í™”ë©´ 모드시 ê²€ì€ í™”ë©´"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "ì „ì²´í™”ë©´ 모드시 ê²€ì€ í™”ë©´"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "ë””ìŠ¤í”Œë ˆì´"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "ì¶œë ¥ 모듈"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "비디오 스냅샷"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "í´ë”"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "형ì‹"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "ì ‘ë‘ì–´"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "순차 번호 부여"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "마지막 í™•ì¸ ì‹œê°: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "ì•„ì§ í™•ì¸í•˜ì§€ 않았습니다."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "ì¶œë ¥ 모듈"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "비디오 스냅샷"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "í´ë”"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "형ì‹"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "ì ‘ë‘ì–´"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "순차 번호 부여"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "마지막 í™•ì¸ ì‹œê°: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "ì•„ì§ í™•ì¸í•˜ì§€ 않았습니다."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "가장 ë‚®ì€ ëŒ€ê¸°ì‹œê°„"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "ë‚®ì€ ëŒ€ê¸°ì‹œê°„"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "ë†’ì€ ëŒ€ê¸°ì‹œê°„"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "ë” ë†’ì€ ëŒ€ê¸°ì‹œê°„"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "í™˜ê²½ì„¤ì • 초기화"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18187,20 -18182,20 +18773,37 @@@ msgstr "
"\n"
"계ì†í•˜ì‹œê² 습니까?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "비디오 ìŠ¤ëƒ…ìƒ·ì„ ì €ìž¥í• í´ë”를 ì„ íƒí•˜ì„¸ìš”."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "ì„ íƒ"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "녹화가 ì €ìž¥ë í´ë”나 파ì¼ëª…ì„ ì„ íƒí•˜ì„¸ìš”"
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "비디오 ìŠ¤ëƒ…ìƒ·ì„ ì €ìž¥í• í´ë”를 ì„ íƒí•˜ì„¸ìš”."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "ì„ íƒ"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "녹화가 ì €ìž¥ë í´ë”나 파ì¼ëª…ì„ ì„ íƒí•˜ì„¸ìš”"
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18208,16 -18203,16 +18811,29 @@@ msgstr "
"Press new keys for\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "ìž˜ëª»ëœ ì¡°í•©"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "ìœ ê°ìŠ¤ëŸ½ê²Œë„, ì´ í‚¤ëŠ” 단축키로 등ë¡í• 수 없습니다."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "ìž˜ëª»ëœ ì¡°í•©"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "ìœ ê°ìŠ¤ëŸ½ê²Œë„, ì´ í‚¤ëŠ” 단축키로 등ë¡í• 수 없습니다."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "ì´ ì¡°í•©ì€ \"%@\" ë¡œ ì´ë¯¸ 사용중입니다."
@@@ -20281,20 -20276,20 +20897,36 @@@ msgstr "ì„ íƒëœ í”„ë¡œíŒŒì¼ ì‚ì œ
msgid "Create a new profile"
msgstr "새 í”„ë¡œíŒŒì¼ ë§Œë“¤ê¸°"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "만들기"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "ì´ ë¨¹ì„œëŠ” VLCê°€ ì§ì ‘ ì œê³µí•˜ì§€ 않습니다: 없는 것 같네요."
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " í”„ë¡œíŒŒì¼ ì´ë¦„ ì—†ìŒ"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr "ì´ ë¨¹ì„œëŠ” VLCê°€ ì§ì ‘ ì œê³µí•˜ì§€ 않습니다: 없는 것 같네요."
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " í”„ë¡œíŒŒì¼ ì´ë¦„ ì—†ìŒ"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "í”„ë¡œíŒŒì¼ ì´ë¦„ì„ ì„¤ì •í•´ì•¼ 합니다."
@@@ -23796,23 -23791,23 +24428,43 @@@ msgstr "스트림 ì¶œë ¥ 트랜스코ë”
msgid "Overlays/Subtitles"
msgstr "ì˜¤ë²„ë ˆì´/ìžë§‰"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "ê³ ì •í 글꼴"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "ì‚¬ìš©í• ê¸€ê¼´ì˜ ê¸€ê¼´ 패밀리"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "ì‚¬ìš©í• ê¸€ê¼´ì˜ ê¸€ê¼´ 파ì¼"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "글꼴 í¬ê¸° (픽셀 단위)"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "ê³ ì •í 글꼴"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "ì‚¬ìš©í• ê¸€ê¼´ì˜ ê¸€ê¼´ 패밀리"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "ì‚¬ìš©í• ê¸€ê¼´ì˜ ê¸€ê¼´ 파ì¼"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "글꼴 í¬ê¸° (픽셀 단위)"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23821,23 -23816,23 +24473,39 @@@ msgstr "
"ì´ê²ƒì€ 비디오ìƒì— ë Œë”ë§ë ê¸€ê¼´ì˜ ê¸°ë³¸ í¬ê¸°ìž…니다. 0 ì´ì™¸ì˜ 다른 ê°’ì„ ì„¤ì •í•˜"
"ë©´, ì´ ì˜µì…˜ì€ ìƒëŒ€ì ì¸ ê¸€ê¼´ í¬ê¸°ë¥¼ ë¬´ì‹œí• ê²ƒìž…ë‹ˆë‹¤."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "í…스트 투명ë„"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "í…스트 투명ë„"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
"ë¹„ë””ì˜¤ì— ë Œë”ë§ë ë¬¸ìž ë¶ˆíˆ¬ëª…ë„ (투명ë„ì˜ ë°˜ëŒ€). 0 = 투명, 255 = ì™„ì „ 불투명."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "í…스트 기본 색ìƒ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23850,12 -23845,12 +24518,20 @@@ msgstr "
"#FF0000 = 빨간색, #00FF00 = 녹색, #FFFF00 = 노란색 (빨간색 + 녹색), #FFFFFF "
"= 하얀색"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "ìƒëŒ€ì ì¸ ê¸€ê¼´ í¬ê¸°"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -23864,59 -23859,59 +24540,111 @@@ msgstr "
"ì´ê²ƒì€ 비디오ìƒì— ë Œë”ë§ë ê¸€ê¼´ì˜ ìƒëŒ€ì ì¸ ê¸°ë³¸ í¬ê¸°ìž…니다. ì ˆëŒ€ì ì¸ ê¸€ê¼´ í¬"
"기로 ì„¤ì •í•˜ë©´, ìƒëŒ€ì ì¸ í¬ê¸°ëŠ” 무시ë 것입니다."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "ë°°ê²½ 불투명ë„"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "ë°°ê²½ 색ìƒ"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "ì™¸ê³½ì„ íˆ¬ëª…ë„"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "ê·¸ë¦¼ìž íˆ¬ëª…ë„"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "ê·¸ë¦¼ìž ìƒ‰ìƒ"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "ê·¸ë¦¼ìž ê°ë„"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "ê·¸ë¦¼ìž ê±°ë¦¬"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "ë°°ê²½ 불투명ë„"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "ë°°ê²½ 색ìƒ"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "ì™¸ê³½ì„ íˆ¬ëª…ë„"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "ê·¸ë¦¼ìž íˆ¬ëª…ë„"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "ê·¸ë¦¼ìž ìƒ‰ìƒ"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "ê·¸ë¦¼ìž ê°ë„"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "ê·¸ë¦¼ìž ê±°ë¦¬"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "매우 ìž‘ìŒ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "ìž‘ìŒ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "í¼"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "매우 í¼"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "YUVP ë Œë”러 사용"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "YUVP ë Œë”러 사용"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -23924,23 -23919,23 +24652,43 @@@ msgstr "
"\"paletized YUV\" 를 ì´ìš©í•´ ê¸€ê¼´ì„ ë Œë”ë§í•©ë‹ˆë‹¤. ì´ ì˜µì…˜ì€ DVB ìžë§‰ìœ¼ë¡œ ì¸ì½”"
"ë”©í• ë•Œë§Œ 필요합니다."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "얇게"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "ë‘ê»ê²Œ"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "í…스트 ë Œë”러"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 í°íŠ¸ ë Œë”러"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "얇게"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "ë‘ê»ê²Œ"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "í…스트 ë Œë”러"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 í°íŠ¸ ë Œë”러"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/ky.po
index 6c55707,7a67367..523cc87
--- a/po/ky.po
+++ b/po/ky.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-05-04 08:00+0000\n"
"Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
"Language-Team: Kirgyz (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -133,7 -133,7 +137,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -440,10 -440,10 +448,17 @@@ msgid "&About
msgstr "Программа &жөнүндө"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -482,17 -482,17 +497,29 @@@ msgid "Save...
msgstr "Сактоо..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr ""
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr ""
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -572,7 -572,7 +599,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "өчүрүү"
@@@ -1229,20 -1229,20 +1260,36 @@@ msgstr "Кадр жыштыгы
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1633,7 -1633,7 +1680,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1715,7 -1715,7 +1766,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "жок"
@@@ -1739,7 -1739,7 +1794,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -1929,7 -1929,7 +1988,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr ""
@@@ -1980,7 -1980,7 +2043,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -1989,7 -1989,7 +2056,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2045,7 -2045,7 +2116,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2214,7 -2214,7 +2289,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2342,12 -2342,12 +2421,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2355,7 -2355,7 +2443,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2658,7 -2658,7 +2750,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3470,7 -3470,7 +3566,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3494,8 -3494,8 +3594,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3575,10 -3575,10 +3680,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3591,10 -3591,10 +3703,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Мурунку"
@@@ -3603,9 -3603,9 +3722,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3840,9 -3840,9 +3965,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Үнүн өчүрүү"
@@@ -4256,7 -4256,7 +4387,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Сүрөт"
@@@ -4453,12 -4453,12 +4588,21 @@@ msgstr "Жүктөп алынууда .
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Жокко чыгаруу"
@@@ -5214,7 -5214,7 +5358,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7510,7 -7510,7 +7658,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Ðкран"
@@@ -8242,7 -8242,7 +8394,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9353,7 -9353,7 +9509,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9384,7 -9384,7 +9544,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9392,30 -9392,30 +9556,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10581,46 -10581,46 +10769,74 @@@ msgstr "Көлөкө
msgid "Outline"
msgstr "контур"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "кара"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "боз"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "күмүш"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "ак"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "кочкул кызыл"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "кызыл"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10628,61 -10628,61 +10844,97 @@@ msgid "Fuchsia
msgstr "кызгылт"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Ñары"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Ñаргыч жашыл"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "жашыл"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "бирюза"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "кара кочкул"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "көк"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10812,7 -10812,7 +11064,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12602,10 -12602,10 +12858,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "кадимкидей"
@@@ -12710,8 -12710,8 +12973,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13047,9 -13047,9 +13315,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -14927,7 -14927,7 +15201,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15106,7 -15106,7 +15384,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15194,9 -15194,9 +15476,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Сактоо"
@@@ -15335,7 -15335,7 +15623,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15355,7 -15355,7 +15647,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15365,7 -15365,7 +15661,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15385,84 -15385,84 +15685,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Кайталоо"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Ðффекттер"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15498,7 -15498,7 +15869,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15681,8 -15681,8 +16056,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -15775,36 -15775,36 +16155,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Улантуу"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15956,7 -15956,7 +16368,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16085,7 -16085,7 +16501,11 @@@ msgstr "VLC'ни жашыруу
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Баарын көрÑÓ©Ñ‚Ò¯Ò¯"
@@@ -16170,15 -16170,15 +16590,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16194,30 -16194,30 +16626,56 @@@ msgstr "
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16226,7 -16226,7 +16684,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16454,7 -16454,7 +16916,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Тандоо..."
@@@ -16625,7 -16625,7 +17091,11 @@@ msgstr "к/Ñек
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Ðрип өлчөмү"
@@@ -16854,12 -16854,12 +17324,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "ЫраÑтоолор"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Баарын түшүрүү"
@@@ -17036,129 -17036,125 +17514,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Ðрип Ñ‚Ò¯ÑÒ¯"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Контур Ñ‚Ò¯ÑÒ¯"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Контур калыңдыгы"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "КөрÑÓ©Ñ‚Ò¯Ò¯"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Папка"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Формат"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "ПрефикÑ"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Папка"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Формат"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "ПрефикÑ"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17171,35 -17167,35 +17757,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Тандоо"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Тандоо"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19137,20 -19133,20 +19753,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Жаратуу"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22453,45 -22449,45 +23085,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22500,93 -22496,93 +23168,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Фон Ñ‚Ò¯ÑÒ¯"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Контур тунуктугу"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Фон Ñ‚Ò¯ÑÒ¯"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Контур тунуктугу"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/lg.po
index 048de03,6cfae63..0bf8149
--- a/po/lg.po
+++ b/po/lg.po
@@@ -7,7 -7,7 +7,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc 1.1.8\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2011-05-02 18:38+0200\n"
"Last-Translator: James Olweny <sjolweny85 at yahoo.co.uk>\n"
"Language-Team: Ganda\n"
@@@ -143,7 -143,7 +147,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -469,10 -469,10 +477,17 @@@ msgid "&About
msgstr "&Ebikwata"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -511,17 -511,17 +526,29 @@@ msgid "Save...
msgstr "Tereka..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Ddamu Byona"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Ddamu Kimu"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -602,7 -602,7 +629,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Disable"
msgstr "Sobozesa"
@@@ -1317,20 -1317,20 +1348,36 @@@ msgstr "Ebeyi yo`Lugo
msgid "Decoded format"
msgstr "Bikwate"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1745,7 -1745,7 +1792,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1834,7 -1834,7 +1885,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Tteri"
@@@ -1859,7 -1859,7 +1914,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Nsobozesa Vidiyo"
@@@ -2060,7 -2060,7 +2119,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Kibera wagulu"
@@@ -2113,7 -2113,7 +2176,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2122,7 -2122,7 +2189,11 @@@ msgstr "Ddeinterlace
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Embera Ddeinterlace"
@@@ -2180,7 -2180,7 +2251,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Entegeka ye ddirisa"
@@@ -2363,7 -2363,7 +2438,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Buka ego"
@@@ -2497,12 -2497,12 +2576,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2510,7 -2510,7 +2598,11 @@@ msgid "Default
msgstr "Ky`enkalakalira"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2833,7 -2833,7 +2925,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3694,7 -3694,7 +3790,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Obutafayo"
@@@ -3721,8 -3721,8 +3821,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3809,10 -3809,10 +3914,17 @@@ msgid "Slower (fine)
msgstr "Mpola nyo (yee)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3825,10 -3825,10 +3937,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Ekiyise"
@@@ -3837,9 -3837,9 +3956,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4091,9 -4091,9 +4216,15 @@@ msgid "Select the key to decrease audi
msgstr "Londa fayiro ku tereka"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Sirika"
@@@ -4559,7 -4559,7 +4690,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Ekifananyi"
@@@ -4773,12 -4773,12 +4908,21 @@@ msgstr "Wanula Ebyogerezako
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Sazaamu"
@@@ -5553,7 -5553,7 +5697,11 @@@ msgstr "Ebirime
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "Egyero ye kimpimo"
@@@ -8036,7 -8036,7 +8184,11 @@@ msgstr "Ekwata ye Biyingizidwa mu Sikul
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Sikulini"
@@@ -8849,7 -8849,7 +9001,11 @@@ msgstr "
msgid "Volume Set"
msgstr "Obungi"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10031,7 -10031,7 +10187,11 @@@ msgstr "Eddoboozzi lya Dolby:
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "Fayiro za Malobozi"
@@@ -10067,7 -10067,7 +10227,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "Entegeka za Maloboozi"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "Entegeka za Maloboozi"
@@@ -10077,32 -10077,32 +10241,56 @@@
msgid "Last audio device"
msgstr "Ekikozesidwa Eddobozzi"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
++=======
+ #: modules/audio_output/auhal.c:578
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio device is not configured"
msgstr "Erinnya lye kikozesedwa eddobozzi"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Entegeka za Maloboozi"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -11344,46 -11344,46 +11532,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Kiddugavu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Gule"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Kalawuli"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Jjeru"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Maluni"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Emyufu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11391,61 -11391,61 +11607,97 @@@ msgid "Fuchsia
msgstr "Fukyasiya"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Kyevvu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Kakyugwa"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Kiragala"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Telu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Liyimu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Papo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Navi"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Bululu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11583,7 -11583,7 +11835,11 @@@ msgstr "Goberera obuntu bwe mitwe
msgid "Subtitle renderers using libass"
msgstr "Enkusike ye mitwe yokubiri"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13452,10 -13452,10 +13708,17 @@@ msgid "Fast
msgstr "Mubwagu"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Kilamu"
@@@ -13573,8 -13573,8 +13836,13 @@@ msgid "D-Bus control interface
msgstr "Qt enkolagano"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13938,9 -13938,9 +14206,15 @@@ msgstr "
msgid "Opening"
msgstr "Ggulawo"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Nyimirira"
@@@ -15937,7 -15937,7 +16211,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG Etabuza Ebingobberera"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Wereza ekiwandiiko"
@@@ -16130,7 -16130,7 +16408,11 @@@ msgid "VLC media player Help
msgstr "VLC enyimbiso eyamba"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Enamba"
@@@ -16225,9 -16225,9 +16507,15 @@@ msgstr "Nyigiza erinnya wotereka fayir
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Tereka"
@@@ -16373,7 -16373,7 +16661,11 @@@ msgid "The stream must be playing or pa
msgstr ""
"Ekigobeberera kina kuba kizanya oba kinyimirira kulwo bulambe kunkola. "
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Buuka Kukuma Budde"
@@@ -16394,7 -16394,7 +16686,11 @@@ msgstr "
msgid "Backward"
msgstr "Dda Emabenga"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16405,7 -16405,7 +16701,11 @@@ msgstr "
msgid "Forward"
msgstr "Dda Mumaso"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16426,89 -16426,89 +16726,160 @@@ msgstr "Sikulini Edugavu mu Sikulini eg
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "Londa fayiro ku tereka"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "Laga olukalala lwe nyimba"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "Ddamu:"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "Londa fayiro ku tereka"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "Eddoboozi Tini"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Ebivaamu"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -16550,7 -16550,7 +16921,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16752,8 -16752,8 +17127,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Edabika"
@@@ -16846,37 -16846,37 +17226,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "VLC enyimbiso"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Teri Kasanyirizo koku Sanawo akazzuuse "
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Teri Kasanyirizo koku Sanawo akazzuuse "
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Weyogerenyo"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Ttensobede kuzzuula ekirese okusanawo okuyise."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Jjamu ebyagalwa bikadde?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Tuzzuude fayiro ze kyika kya VLC`s ezagalwa ekadde."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Genda Ku Bisanyidwawo era Otongoze buto VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Ttensobede kuzzuula ekirese okusanawo okuyise."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Jjamu ebyagalwa bikadde?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Tuzzuude fayiro ze kyika kya VLC`s ezagalwa ekadde."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Genda Ku Bisanyidwawo era Otongoze buto VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC Okulongoosa Akasanyirizo (%s).rtfd"
@@@ -17034,7 -17034,7 +17446,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Ggalawo Egyero ye Kimpomo"
@@@ -17175,7 -17175,7 +17591,11 @@@ msgstr "Kweka VLC
msgid "Hide Others"
msgstr "Kweka Ebilala"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Laga Byona"
@@@ -17266,15 -17266,15 +17686,27 @@@ msgstr "&Goberera Ekweka
msgid "A→B Loop"
msgstr "A->B Kwedigana"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "vvawo oluvanyuma lwo Zzemabega"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Dda Mumaso"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "vvawo oluvanyuma lwo Zzemabega"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Dda Mumaso"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Dda Emabenga"
@@@ -17290,30 -17290,30 +17722,56 @@@ msgstr "Kendeeza Kuuugi
msgid "Audio Device"
msgstr "Ekikozesidwa Eddobozzi"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Obunene Mukitundu"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Kilamu Mubunene"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Obunene Mirundi ebiri"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Kittuse ku Sikulini"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Obunene Mukitundu"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Kilamu Mubunene"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Obunene Mirundi ebiri"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Kittuse ku Sikulini"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Kibera ku Gulu"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Sikulini yona nga akantu ka vidiyo"
@@@ -17322,7 -17322,7 +17780,11 @@@
msgid "Post processing"
msgstr "Ekolako ya luvunyuma"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Fayiro ye Mitwe yokubiri"
@@@ -17563,7 -17563,7 +18025,11 @@@ msgid "Play another media synchronously
msgstr "Zanya enyimbiso eddala kimu ku kimu"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Londa..."
@@@ -17750,7 -17750,7 +18216,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Enkusike ye mitwe yokubiri"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Obunene bwe nukuta"
@@@ -17982,12 -17982,12 +18452,20 @@@ msgstr "Ensobi mu tereka bwino
msgid "VLC was unable to save the meta data."
msgstr "VLC tesobode kutereka bwino."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Ebyagalidwa"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Okuza bupya Byona"
@@@ -18171,134 -18171,129 +18649,242 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Nyimiriza okuzanya emabega"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Enkusike Yekalira"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Laga Entegeka"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Enkusike Yekalira"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Laga Entegeka"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
#, fuzzy
msgid "Font color"
msgstr "Lagi ye Nukuta"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Ennukta"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Obutundu bwe Mitwe mu Limi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Obutundu bwe mitwe ye limi eyagalwa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Sobozesa OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Sobozesa OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Ekipima ekitangala"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "Kyusa langi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Sikulini Edugavu mu Sikulini egjuvu elabirilwawo"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Sikulini Edugavu mu Sikulini egjuvu elabirilwawo"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Laga"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Enfulumya essomo"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Ebirabidwako bya vidiyo"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Eterekero lya fayiro"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Tereza"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Eziddibwako"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Okulamba mu mittendera"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Okukebera okusembeyo ku: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Tteri ekikeberwa nga kinkolerwa kati."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Enfulumya essomo"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Ebirabidwako bya vidiyo"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Eterekero lya fayiro"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Tereza"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Eziddibwako"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Okulamba mu mittendera"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Okukebera okusembeyo ku: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Tteri ekikeberwa nga kinkolerwa kati."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Empuuliziganya ya wansiyo"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Empuuliziganya ya wansi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Empuuliziganya ya wagulu"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Empuuliziganya ya waguluyo"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Okuza bupya Ebyagalwa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18311,21 -18306,21 +18897,38 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Londa eterekero lya fayiro wo tereka obufananyi bwa vidiyo zo."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Londa"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Londa eterekero lya fayiro wo tereka obufananyi bwa vidiyo zo."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Londa"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the directory or filename where the records will be stored."
msgstr "Kuva kumu wotereka fayiro elondedwa."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18333,17 -18328,17 +18936,30 @@@ msgstr "
"Koona amapesa amapya kulwa\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Ekibina tekiriyo"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Ekibina tekiriyo"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"Kyewunyisa, amapesa gano tega nyizika okwekanya amapesa amabbi agokumpi."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Ekibina kino kyatwalindwa dda ne \"%@\"."
@@@ -20377,21 -20372,21 +20993,37 @@@ msgstr "Sagula ebikwatako ebilonde
msgid "Create a new profile"
msgstr "Tondawo ebikwatako ebipya"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Tondawo"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid " Profile Name Missing"
msgstr "Erinnya ly`Ebikukwatako"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Oyina kutekawo erinnya lya ebikwatako."
@@@ -23902,47 -23897,47 +24534,83 @@@ msgstr "Esengeeja etondedwawo enfulumiz
msgid "Overlays/Subtitles"
msgstr "Laga obutundu bwe mitwe ya vidiyo"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font size in pixels"
msgstr "Obunene bwe nnukuta, pikizo"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "Ekipima ekitangala"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23951,98 -23946,98 +24619,178 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "Egyero ze kimpimo kya vidiyo"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "Enkola y`enkalakalira yokumpi "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "Ekipima ekitangala"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "ELangi ye nnukuta"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Smaller"
msgstr "Eddoboozi Tini"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/lt.po
index 664b864,4bb73b1..0151778
--- a/po/lt.po
+++ b/po/lt.po
@@@ -5,14 -5,13 +5,23 @@@
# Translators:
# Baltix kūrėjas <mantas at akl.lt>, 2013
# Mindaugas <embar at super.lt>, 2009-2013
++<<<<<<< HEAD
+# jawnuolis <jawnuolis at gmail.com>, 2013
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-10 21:03+0000\n"
+"Last-Translator: jawnuolis <jawnuolis at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-09-22 08:17+0000\n"
+ "Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Lithuanian (http://www.transifex.com/projects/p/vlc-trans/"
"language/lt/)\n"
"Language: lt\n"
@@@ -141,7 -140,7 +150,11 @@@ msgstr "Kitos garso nuostatos ir moduli
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -484,10 -483,10 +497,17 @@@ msgid "&About
msgstr "&Apie"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -526,17 -525,17 +546,29 @@@ msgid "Save...
msgstr "Įrašyti..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Kartoti viskÄ…"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Kartoti vienÄ…"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -642,7 -641,7 +674,11 @@@ msgstr "Pasiektas didžiausias filtrų
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "IÅ¡jungta"
@@@ -1345,20 -1344,20 +1381,36 @@@ msgstr "Kadrų dažnis
msgid "Decoded format"
msgstr "IÅ¡koduotas formatas"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Jūsų įvestis negali būti atverta"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Jūsų įvestis negali būti atverta"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC negali atverti MRL „%s“. Daugiau detalių rasite žurnale."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC negali atpažinti įvesties formato"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC negali atpažinti įvesties formato"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1700,7 -1699,7 +1752,11 @@@ msgstr "
#: src/libvlc-module.c:138
msgid "Audio gain"
++<<<<<<< HEAD
+msgstr "Garso stiprinimas"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:140
msgid "This linear gain will be applied to outputted audio."
@@@ -1787,7 -1786,7 +1843,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1874,7 -1873,7 +1934,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Nieko"
@@@ -1904,7 -1903,7 +1968,11 @@@ msgstr "
"Tai VLC naudojamas vaizdo išvesties būdas. Numatytuoju atveju automatiškai "
"pasirenkamas geriausias galimas būdas."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Įgalinti vaizdą"
@@@ -2115,7 -2114,7 +2183,11 @@@ msgstr "
"nutylÄ—jimÄ…."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Visada viršuje"
@@@ -2168,7 -2167,7 +2240,11 @@@ msgstr "Slėpti pelės žymeklį ir vis
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2177,7 -2176,7 +2253,11 @@@ msgstr "Å alinti perÄ—jimÄ…
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "PerÄ—jimo Å¡alinimo modulis"
@@@ -2235,7 -2234,7 +2315,11 @@@ msgstr "
"Uždraudžia energijos valdymo tarnybos veiklą bet kokio grojimo metu. "
"Naudojama siekiant išvengti kompiuterio darbo sustabdymo dėl neveiklumo."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Langų apipavidalinimai"
@@@ -2439,7 -2438,7 +2523,11 @@@ msgstr "
"turi kvadratinius taškus (pikselius). Jei turite 16:9 ekraną, jums "
"tikriausiai reikėtų nustatyti 4:3 tam, kad būtų išlaikytas santykis."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Praleisti kadrus"
@@@ -2582,12 -2581,12 +2670,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2595,7 -2594,7 +2692,11 @@@ msgid "Default
msgstr "Numatytasis"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2923,7 -2922,7 +3024,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3824,7 -3823,7 +3929,11 @@@ msgstr "
"Tai VLC reagavimo į bendrų klavišų paspaudimus nuostatos, jie vadinami "
"„sparÄiaisiais klaviÅ¡ais“."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Nepaisyti"
@@@ -3848,8 -3847,8 +3957,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3929,10 -3928,10 +4043,17 @@@ msgid "Slower (fine)
msgstr "Truputį lÄ—Äiau"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3946,10 -3945,10 +4067,17 @@@ msgstr "
"Pasirinkite spartųjį klaviÅ¡Ä… perÄ—jimui prie sekanÄio kÅ«rinio grojaraÅ¡tyje."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Atgal"
@@@ -3959,9 -3958,9 +4087,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"Pasirinkite spartųjį klavišą perėjimui prie ankstesnio kūrinio grojaraštyje."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4196,9 -4195,9 +4330,15 @@@ msgid "Select the key to decrease audi
msgstr "Pasirinkite klavišą garsumo lygio sumažinimui."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Nutildyti"
@@@ -4615,7 -4614,7 +4755,11 @@@ msgstr "Eiti per galimus garso įrengin
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Nuotrauka"
@@@ -4821,12 -4820,12 +4965,21 @@@ msgstr "AtsiunÄiama ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Atšaukti"
@@@ -5590,7 -5589,7 +5743,11 @@@ msgstr "Apkirpimas
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Santykis"
@@@ -7950,7 -7949,7 +8107,11 @@@ msgstr "Ekrano įvestis
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Ekranas"
@@@ -8693,7 -8692,7 +8854,11 @@@ msgstr "PaskutinÄ—s dalies Nr.
msgid "Volume Set"
msgstr "Dalių rinkinys"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9820,7 -9819,7 +9985,11 @@@ msgstr "Erdvinis garsas 7.1
msgid "ALSA audio output"
msgstr "ALSA garso išvestis"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Garso išvesties klaida"
@@@ -9851,7 -9850,7 +10020,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9859,30 -9858,30 +10032,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit išvestis"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit išvestis"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Garso įrenginys nesukonfigūruotas"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Garso įrenginys nesukonfigūruotas"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Įkodavimo išvestis)"
@@@ -11069,46 -11068,46 +11266,74 @@@ msgstr "Šešėlis
msgid "Outline"
msgstr "Kontūras"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Juoda"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Pilka"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "SidabrinÄ—"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Balta"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Kaštoninė"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Raudona"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11116,61 -11115,61 +11341,97 @@@ msgid "Fuchsia
msgstr "Fuksijos"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Geltona"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "AlyvinÄ—"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Žalia"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Žalsvai mėlyna"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Gelsvai žalsva"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "VioletinÄ—"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Tamsiai mÄ—lyna"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "MÄ—lyna"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11311,7 -11310,7 +11572,11 @@@ msgstr "Subtitrai (sudÄ—tingiau)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Kuriamas šriftų podėlis"
@@@ -13103,10 -13102,10 +13368,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Vidutinis"
@@@ -13214,8 -13213,8 +13486,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus valdymo sÄ…saja"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13552,9 -13551,9 +13829,15 @@@ msgstr "Ruošiamasi
msgid "Opening"
msgstr "Atveriama"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pristabdyti"
@@@ -15452,7 -15451,7 +15735,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG perkeliamo srauto išpynimo metodas"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletekstas"
@@@ -15631,7 -15630,7 +15918,11 @@@ msgid "VLC media player Help
msgstr "VLC leistuvės žinynas"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Turinys"
@@@ -15719,9 -15718,9 +16010,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Įrašyti"
@@@ -15865,7 -15864,7 +16162,11 @@@ msgstr "Įvestis nerasta
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Žymelės veikia grojamam arba pristabdytam srautui."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Šokti į laiką"
@@@ -15885,7 -15884,7 +16186,11 @@@ msgstr "
msgid "Backward"
msgstr "Atgal"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15895,7 -15894,7 +16200,11 @@@ msgstr "
msgid "Forward"
msgstr "Toliau"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15915,84 -15914,84 +16224,155 @@@ msgstr "Viso ekrano veiksena
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Rodyti arba slėpti grojaraštį"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Rodyti arba slėpti grojaraštį"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Kartoti"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Maišyti"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Maišyti"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Norėdami įjungti/išjungti garsą, spragtelėkite."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Visas garsas"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Norėdami įjungti/išjungti garsą, spragtelėkite."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Visas garsas"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efektai"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Norėdami pereiti prie ankstesnio kūrinio grojaraštyje – spragtelėkite."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Norėdami pereiti prie tolesnio kūrinio grojaraštyje – spragtelėkite."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Norėdami pereiti prie ankstesnio kūrinio grojaraštyje – spragtelėkite."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Norėdami pereiti prie tolesnio kūrinio grojaraštyje – spragtelėkite."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16028,7 -16027,7 +16408,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16213,8 -16212,8 +16597,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Pasirinktinis"
@@@ -16315,36 -16314,36 +16704,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "Nebeklausti"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "VLC leistuvÄ—"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Nerasta jokio pranešimo apie nulūžimą"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "VLC leistuvÄ—"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Nerasta jokio pranešimo apie nulūžimą"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Tęsti"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Nepavyko aptikti jokio paskutinio nulūžimo pėdsako."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Pašalinti seną konfigūraciją?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Mes ką tik aptikome senesnės VLC versijos nustatymų failą."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Perkelti į šiukšlinę ir iš naujo paleisti VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Nepavyko aptikti jokio paskutinio nulūžimo pėdsako."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Pašalinti seną konfigūraciją?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Mes ką tik aptikome senesnės VLC versijos nustatymų failą."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Perkelti į šiukšlinę ir iš naujo paleisti VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16509,7 -16508,7 +16930,11 @@@ msgstr "
"Ši parinktis leidžia sąsajai įvairiomis progomis automatiškai keisti savo "
"ženkliuką."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Išlaikyti santykį"
@@@ -16638,7 -16637,7 +17063,11 @@@ msgstr "SlÄ—pti VLC
msgid "Hide Others"
msgstr "SlÄ—pti kitus"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "ViskÄ… rodyti"
@@@ -16723,15 -16722,15 +17152,27 @@@ msgstr "Takelių sinchronizavimas
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "IÅ¡eiti baigus groti"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Toliau"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "IÅ¡eiti baigus groti"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Toliau"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Atgal"
@@@ -16747,30 -16746,30 +17188,56 @@@ msgstr "Patylinti
msgid "Audio Device"
msgstr "Garso įrenginys"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "PusÄ—"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Tikrasis dydis"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dvigubas"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Pritaikyti prie ekrano"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "PusÄ—"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Tikrasis dydis"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dvigubas"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Pritaikyti prie ekrano"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Įrenginys vaizdui per visą ekraną"
@@@ -16779,7 -16778,7 +17246,11 @@@
msgid "Post processing"
msgstr "Galutinis apdorojimas"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Pridėti titrų failą..."
@@@ -17007,7 -17006,7 +17478,11 @@@ msgid "Play another media synchronously
msgstr "Kartu groti kitą kūrinį"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Pasirinkti..."
@@@ -17189,7 -17188,7 +17664,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Å rifto dydis"
@@@ -17418,12 -17417,12 +17897,20 @@@ msgstr "Įrašant metaduomenis įvyko k
msgid "VLC was unable to save the meta data."
msgstr "VLC negali įrašyti metaduomenų."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Parinktys"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "ViskÄ… atstatyti"
@@@ -17600,129 -17599,125 +18087,237 @@@ msgstr "Įgalinti Growl pranešimus (pa
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Numatytoji koduotÄ—"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Rodymo nuostatos"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Numatytoji koduotÄ—"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Rodymo nuostatos"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Å rifto spalva"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Å riftas"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Įgalinti ERP"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Įgalinti ERP"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Nepermatomumas"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Juodas ekranas viso ekrano veiksenoje"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Juodas ekranas viso ekrano veiksenoje"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Rodymas"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "IÅ¡vesties moduliai"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Vaizdo nuotraukos"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Aplankas"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Tipas"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Failo pavadinimo pradžia"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Nuoseklus numeravimas"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Paskutinį kartą tikrinta: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Dar netikrinta."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "IÅ¡vesties moduliai"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Vaizdo nuotraukos"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Aplankas"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Tipas"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Failo pavadinimo pradžia"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Nuoseklus numeravimas"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Paskutinį kartą tikrinta: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Dar netikrinta."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Trumpiausias užlaikymas"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Trumpas užlaikymas"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Ilgas užlaikymas"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Ilgiausias užlaikymas"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "ParinkÄių atstatymas"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17744,20 -17739,20 +18339,37 @@@ msgstr "
"\n"
"Norite tęsti?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Pasirinkite aplanką vaizdo nuotraukų įrašymui."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Pasirinkite"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Nurodykite aplanką arba failo pavadinimą, kur bus saugomi įrašai."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Pasirinkite aplanką vaizdo nuotraukų įrašymui."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Pasirinkite"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Nurodykite aplanką arba failo pavadinimą, kur bus saugomi įrašai."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -17765,17 -17760,17 +18377,30 @@@ msgstr "
"Nauja klavišų kombinacija\n"
"„%@“"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Negalima kombinacija"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Negalima kombinacija"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"Apgailestaujame, šie klavišai negali būti naudojami kaip spartieji klavišai."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "„%@“ jau naudoja šią klavišų kombinaciją."
@@@ -19761,20 -19756,20 +20386,36 @@@ msgstr "Pašalinti pasirinktą profilį
msgid "Create a new profile"
msgstr "Sukurti naują profilį"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Sukurti"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Profilis nepavadintas"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Profilis nepavadintas"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Jūs privalote pavadinti profilį."
@@@ -23169,34 -23164,34 +23810,62 @@@ msgstr "Perkoduoti srauto išvertį
msgid "Overlays/Subtitles"
msgstr "Subtitrai"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Naudotina šriftų šeima"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Å rifto dydis, pikseliais"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Naudotina šriftų šeima"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Å rifto dydis, pikseliais"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -23204,12 -23199,12 +23873,20 @@@ msgstr "
"Nepermatomumas (skaidrumo priešingybė) teksto, kuris bus vaizduojamas "
"ekrane. 0 = skaidru, 255 = visiškas nepermatomumas."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Numatytoji teksto spalva"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23222,93 -23217,93 +23899,173 @@@ msgstr "
"žaliai, likę du – mėlynai. #000000 = juoda, #FF0000 = raudona, #00FF00 = "
"žalia, #FFFF00 = geltona (raudona + žalia), #FFFFFF = balta"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Santykinis Å¡rifto dydis"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Fono dengiamumas"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Fono spalva"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Šešėlio dengiamumas"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Šešėlio spalva"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Fono dengiamumas"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Fono spalva"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Šešėlio dengiamumas"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Šešėlio spalva"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Mažesnis"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Mažas"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Didelis"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Didesnis"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Naudoti YUVP vaizdavimÄ…"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Naudoti YUVP vaizdavimÄ…"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Teksto vaizdavimas"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 šriftų vaizdavimas"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Teksto vaizdavimas"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 šriftų vaizdavimas"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -28024,6 -28019,9 +28781,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Multimedijos tvarkytuvės sąrašas"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Rodyti detales"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -29871,10 -29869,6 +30634,13 @@@
#~ msgstr "Galite pasirinkti numatytÄ…jÄ… perÄ—jimo Å¡alinimo veiksenÄ…"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Kodavimo detalÄ—s"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Add a subtitle file"
#~ msgstr "Naudoti &titrų failą"
diff --combined po/lv.po
index 18f488c,cf0f506..5020832
--- a/po/lv.po
+++ b/po/lv.po
@@@ -7,7 -7,7 +7,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2006-08-26 15:56+0000\n"
"Last-Translator: jogijs <e.blumbergs at gmail.com>\n"
"Language-Team: Latvian <lv at li.org>\n"
@@@ -140,7 -140,7 +144,11 @@@ msgstr "DažÄdi audio iestatÄ«jumi un
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -502,10 -502,10 +510,17 @@@ msgid "&About
msgstr "AutomÄtiski"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -550,17 -550,17 +565,29 @@@ msgid "Save...
msgstr ""
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr ""
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr ""
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -645,7 -645,7 +672,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Atspējot"
@@@ -1347,20 -1347,20 +1378,36 @@@ msgstr "
msgid "Decoded format"
msgstr "Saskarnes"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1768,7 -1768,7 +1815,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1853,7 -1853,7 +1904,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr ""
@@@ -1877,7 -1877,7 +1932,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -2068,7 -2068,7 +2127,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr ""
@@@ -2120,7 -2120,7 +2183,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2129,7 -2129,7 +2196,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
#, fuzzy
msgid "Deinterlace mode"
@@@ -2187,7 -2187,7 +2258,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2361,7 -2361,7 +2436,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2491,12 -2491,12 +2570,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2504,7 -2504,7 +2592,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2815,7 -2815,7 +2907,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3637,7 -3637,7 +3733,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3664,8 -3664,8 +3764,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3748,10 -3748,10 +3853,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3764,10 -3764,10 +3876,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr ""
@@@ -3776,9 -3776,9 +3895,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4014,9 -4014,9 +4139,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4446,7 -4446,7 +4577,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4644,12 -4644,12 +4779,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr ""
@@@ -5423,7 -5423,7 +5567,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "Audio"
@@@ -7872,7 -7872,7 +8020,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8673,7 -8673,7 +8825,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9845,7 -9845,7 +10001,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "Celiņa (stream) izvade."
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "Izvades moduļi"
@@@ -9881,7 -9881,7 +10041,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "Celiņa (stream) izvade."
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "Audio iestatījumi"
@@@ -9891,31 -9891,31 +10055,55 @@@
msgid "Last audio device"
msgstr "Piekļuves filtri"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Piekļuves filtri"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -11149,26 -11149,26 +11337,42 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
#, fuzzy
msgid "Silver"
msgstr "Filtri"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
@@@ -11176,21 -11176,21 +11380,33 @@@
msgid "White"
msgstr "Nosaukums"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11198,21 -11198,21 +11414,33 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11220,40 -11220,40 +11448,64 @@@
msgid "Green"
msgstr "Stils"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11394,7 -11394,7 +11646,11 @@@ msgstr "Subtitri/OSD
msgid "Subtitle renderers using libass"
msgstr "Subtitri/OSD"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13256,10 -13256,10 +13512,17 @@@ msgid "Fast
msgstr "Datums"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -13375,8 -13375,8 +13638,13 @@@ msgid "D-Bus control interface
msgstr "Saskarņu pÄrvaldÄ«ba"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13736,9 -13736,9 +14004,15 @@@ msgstr "
msgid "Opening"
msgstr "Piekļuves filtri"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Pause"
msgstr "Datums"
@@@ -15732,7 -15732,7 +16006,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Teletext"
msgstr "Subtitri/OSD"
@@@ -15933,7 -15933,7 +16211,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -16033,9 -16033,9 +16315,15 @@@ msgstr "Subtitri/OSD
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
#, fuzzy
msgid "Save"
@@@ -16183,7 -16183,7 +16471,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -16204,7 -16204,7 +16496,11 @@@ msgstr "
msgid "Backward"
msgstr "Saraksts"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16214,7 -16214,7 +16510,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16235,90 -16235,90 +16535,161 @@@ msgstr "Saskarnes
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "Saraksts"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "Saraksts"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "Video kodeki"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "Noklusētais audio skaļums"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
#, fuzzy
msgid "Effects"
msgstr "Video kodeki"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr "Saraksts"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -16359,7 -16359,7 +16730,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16563,8 -16563,8 +16938,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
#, fuzzy
msgid "Custom"
@@@ -16664,38 -16664,38 +17044,70 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "Saraksts"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Remove old preferences?"
msgstr "VLC uzstÄdÄ«jumi"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16851,7 -16851,7 +17263,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Lock Aspect Ratio"
msgstr "Audio"
@@@ -16993,7 -16993,7 +17409,11 @@@ msgstr "
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show All"
msgstr "Saraksts"
@@@ -17094,16 -17094,16 +17514,28 @@@ msgstr "
msgid "A→B Loop"
msgstr "Pieteikties"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Quit after Playback"
msgstr "Saraksts"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -17122,30 -17122,30 +17554,56 @@@ msgstr "Noklusētais audio skaļums
msgid "Audio Device"
msgstr "Piekļuves filtri"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Fullscreen Video Device"
msgstr "Video kodeki"
@@@ -17155,7 -17155,7 +17613,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Subtitri/OSD"
@@@ -17404,7 -17404,7 +17866,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -17591,7 -17591,7 +18057,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr "Subtitri/OSD"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -17852,13 -17852,13 +18322,21 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
#, fuzzy
msgid "Preferences"
msgstr "VLC uzstÄdÄ«jumi"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -18057,143 -18057,138 +18535,251 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Saraksts"
+
+#: modules/gui/macosx/simple_prefs.m:377
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Default Encoding"
msgstr "Saskarnes"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:378
++=======
+ #: modules/gui/macosx/simple_prefs.m:377
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Display Settings"
msgstr "Video iestatījumi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
#, fuzzy
msgid "Font color"
msgstr "Saskarņu pÄrvaldÄ«ba"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Subtitri/OSD"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Subtitri/OSD"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Enable OSD"
msgstr "Iespējot audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Force bold"
msgstr "Piespiedu kÄrtas mono audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "Saskarņu pÄrvaldÄ«ba"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
#, fuzzy
msgid "Display"
msgstr "Video iestatījumi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Output module"
msgstr "Izvades moduļi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
++=======
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Video snapshots"
msgstr "Video iestatījumi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
++=======
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Folder"
msgstr "Filtri"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
#, fuzzy
msgid "Reset Preferences"
msgstr "VLC uzstÄdÄ«jumi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18206,36 -18201,36 +18792,66 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Invalid combination"
msgstr "Meta-informÄcija"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -20322,21 -20317,21 +20938,37 @@@ msgstr "Subtitri/OSD
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
#, fuzzy
msgid "Create"
msgstr "Bitreits"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "You must set a name for the profile."
msgstr "Subtitri/OSD"
@@@ -23918,46 -23913,46 +24550,82 @@@ msgstr "Celiņa (stream) izvade.
msgid "Overlays/Subtitles"
msgstr "Subtitri/OSD"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "Apraksts"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23966,97 -23961,97 +24634,177 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "Noklusētais audio skaļums"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "Saskarņu pÄrvaldÄ«ba"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Large"
msgstr "Valoda (Language)"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text renderer"
msgstr "CD-Text KÄrtotÄjs"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/mk.po
index 5266bcb,d2cb2aa..30a1235
--- a/po/mk.po
+++ b/po/mk.po
@@@ -7,7 -7,7 +7,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc 1.0.2-git\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2009-09-14 22:55+0100\n"
"Last-Translator: Goce Manevski <Goce92 at live.com>\n"
"Language-Team: Macedonian\n"
@@@ -130,7 -130,7 +134,11 @@@ msgstr "Разновидни звучн
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -455,10 -455,10 +463,17 @@@ msgid "&About
msgstr "&За VLC"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -500,17 -500,17 +515,29 @@@ msgid "Save...
msgstr "Меморирај..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr ""
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr ""
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -593,7 -593,7 +620,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr ""
@@@ -1274,20 -1274,20 +1305,36 @@@ msgstr "
msgid "Decoded format"
msgstr "&Информации за кодек"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1681,7 -1681,7 +1728,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1764,7 -1764,7 +1815,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr ""
@@@ -1788,7 -1788,7 +1843,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -1978,7 -1978,7 +2037,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr ""
@@@ -2029,7 -2029,7 +2092,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2038,7 -2038,7 +2105,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2094,7 -2094,7 +2165,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2263,7 -2263,7 +2338,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2391,12 -2391,12 +2470,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2404,7 -2404,7 +2492,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2710,7 -2710,7 +2802,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3524,7 -3524,7 +3620,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3548,8 -3548,8 +3648,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3630,10 -3630,10 +3735,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3646,10 -3646,10 +3758,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr ""
@@@ -3658,9 -3658,9 +3777,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3895,9 -3895,9 +4020,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4317,7 -4317,7 +4448,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4514,12 -4514,12 +4649,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr ""
@@@ -5277,7 -5277,7 +5421,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7607,7 -7607,7 +7755,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8351,7 -8351,7 +8503,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9473,7 -9473,7 +9629,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9505,7 -9505,7 +9665,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "Звучни кодеци"
@@@ -9515,31 -9515,31 +9679,55 @@@
msgid "Last audio device"
msgstr "Звучни кодеци"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Главни прилагодувања за звучни излезни модули."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10713,46 -10713,46 +10901,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10760,61 -10760,61 +10976,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10944,7 -10944,7 +11196,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12751,10 -12751,10 +13007,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -12861,8 -12861,8 +13124,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13203,9 -13203,9 +13471,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -15103,7 -15103,7 +15377,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15282,7 -15282,7 +15560,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15372,9 -15372,9 +15654,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr ""
@@@ -15515,7 -15515,7 +15803,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15535,7 -15535,7 +15827,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15545,7 -15545,7 +15841,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15565,86 -15565,86 +15865,157 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "Звучна лиÑта"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "Ðе повторувај"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -15683,7 -15683,7 +16054,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15877,8 -15877,8 +16252,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -15971,36 -15971,36 +16351,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16152,7 -16152,7 +16564,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16283,7 -16283,7 +16699,11 @@@ msgstr "
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr ""
@@@ -16371,15 -16371,15 +16791,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16395,30 -16395,30 +16827,56 @@@ msgstr "
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16427,7 -16427,7 +16885,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Превод"
@@@ -16659,7 -16659,7 +17121,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -16837,7 -16837,7 +17303,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr "Превод"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -17068,12 -17068,12 +17538,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17253,131 -17253,127 +17731,239 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Звучни канали"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Звучни канали"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17390,35 -17386,35 +17976,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19387,20 -19383,20 +20003,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22747,45 -22743,45 +23379,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22794,93 -22790,93 +23462,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/ml.po
index 39fce63,223c61e..ad2a2a4
--- a/po/ml.po
+++ b/po/ml.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-05-04 07:53+0000\n"
"Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -137,7 -137,7 +141,11 @@@ msgstr "പലവക ശബàµà´¦ à´•àµ
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -448,10 -448,10 +456,17 @@@ msgid "&About
msgstr "à´žà´™àµà´™à´³àµ†à´•àµà´±à´¿à´šàµà´šàµâ€Œ"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -490,17 -490,17 +505,29 @@@ msgid "Save...
msgstr "സേവàµâ€Œ..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "à´Žà´²àµà´²à´¾à´‚ ആവരàµâ€à´¤àµà´¤à´¿à´•àµà´•àµà´•"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "ഇതൠമാതàµà´°à´‚ ആവരàµâ€à´¤àµà´¤à´¿à´•àµà´•àµà´•"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -580,7 -580,7 +607,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "à´¦àµà´°àµâ€à´¬à´²à´ªàµ†à´Ÿàµà´¤àµà´¤àµà´•"
@@@ -1240,20 -1240,20 +1271,36 @@@ msgstr "à´«àµà´°àµ†à´¯à´¿à´‚ റേറ
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "നിങàµà´™à´³àµâ€ തനàµà´¨à´¤àµ à´¤àµà´±à´•àµà´•à´¾à´¨àµâ€ പറàµà´±àµà´¨àµà´¨à´¿à´²àµà´²"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "നിങàµà´™à´³àµâ€ തനàµà´¨à´¤àµ à´¤àµà´±à´•àµà´•à´¾à´¨àµâ€ പറàµà´±àµà´¨àµà´¨à´¿à´²àµà´²"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "വീഎലàµâ€à´¸àµ€à´•àµà´•àµ MRL '%s' à´¤àµà´±à´•àµà´•à´¾à´¨àµâ€ പറàµà´±àµà´¨àµà´¨à´¿à´²àµà´². à´•àµà´±à´¿à´ªàµà´ªàµ നോകàµà´•à´¿à´¯à´¾à´²àµâ€ വിശദാ൦ശങàµà´™à´³àµâ€ അറിയാം"
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "നിങàµà´™à´³àµâ€ തനàµà´¨à´¤àµ à´Žà´¨àµà´¤à´¾à´£àµ à´Žà´¨àµà´¨àµ വീഎലàµâ€à´¸àµ€à´•àµà´•àµ മനസàµà´¸à´¿à´²à´¾à´•àµà´•à´¾à´¨àµâ€ പറàµà´±àµà´¨àµà´¨à´¿à´²àµà´²"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "നിങàµà´™à´³àµâ€ തനàµà´¨à´¤àµ à´Žà´¨àµà´¤à´¾à´£àµ à´Žà´¨àµà´¨àµ വീഎലàµâ€à´¸àµ€à´•àµà´•àµ മനസàµà´¸à´¿à´²à´¾à´•àµà´•à´¾à´¨àµâ€ പറàµà´±àµà´¨àµà´¨à´¿à´²àµà´²"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1644,7 -1644,7 +1691,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1726,7 -1726,7 +1777,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr ""
@@@ -1750,7 -1750,7 +1805,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -1941,7 -1941,7 +2000,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "à´Žà´ªàµà´ªàµ‹à´³àµà´‚ à´®àµà´•à´³à´¿à´²àµâ€ നിലàµâ€à´•àµà´•àµà´•"
@@@ -1992,7 -1992,7 +2055,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2001,7 -2001,7 +2068,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2057,7 -2057,7 +2128,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2226,7 -2226,7 +2301,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2354,12 -2354,12 +2433,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2367,7 -2367,7 +2455,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2670,7 -2670,7 +2762,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3482,7 -3482,7 +3578,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3506,8 -3506,8 +3606,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3587,10 -3587,10 +3692,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3603,10 -3603,10 +3715,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "à´®àµà´¨àµâ€à´ªàµà´³àµà´³à´¤àµ"
@@@ -3615,9 -3615,9 +3734,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3852,9 -3852,9 +3977,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4268,7 -4268,7 +4399,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4465,12 -4465,12 +4600,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr ""
@@@ -5226,7 -5226,7 +5370,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7522,7 -7522,7 +7670,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8254,7 -8254,7 +8406,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9365,7 -9365,7 +9521,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9396,7 -9396,7 +9556,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9404,30 -9404,30 +9568,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10593,46 -10593,46 +10781,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10640,61 -10640,61 +10856,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10824,7 -10824,7 +11076,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12612,10 -12612,10 +12868,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -12720,8 -12720,8 +12983,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13057,9 -13057,9 +13325,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -14938,7 -14938,7 +15212,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15117,7 -15117,7 +15395,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15205,9 -15205,9 +15487,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr ""
@@@ -15346,7 -15346,7 +15634,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "സമയതàµà´¤à´¿à´²àµ‡à´•àµà´•àµ പോവàµà´•"
@@@ -15366,7 -15366,7 +15658,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15376,7 -15376,7 +15672,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15396,84 -15396,84 +15696,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15509,7 -15509,7 +15880,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15692,8 -15692,8 +16067,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -15786,36 -15786,36 +16166,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15967,7 -15967,7 +16379,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16096,7 -16096,7 +16512,11 @@@ msgstr "
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr ""
@@@ -16181,15 -16181,15 +16601,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16205,30 -16205,30 +16637,56 @@@ msgstr "ശബàµà´¦à´‚ à´•àµà´±à´¯àµ
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "à´šà´¿à´¤àµà´°à´‚ à´®àµà´´àµà´µà´¨àµâ€ à´¸àµà´•àµà´°àµ€à´¨à´¿à´²à´¾à´•àµà´•à´¿ കാണàµà´•"
@@@ -16237,7 -16237,7 +16695,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16465,7 -16465,7 +16927,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -16636,7 -16636,7 +17102,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -16865,12 -16865,12 +17335,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17047,129 -17047,125 +17525,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17182,35 -17178,35 +17768,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19148,20 -19144,20 +19764,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22464,45 -22460,45 +23096,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22511,93 -22507,93 +23179,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/mn.po
index e02bd33,0d12874..c4bc044
--- a/po/mn.po
+++ b/po/mn.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-05-04 07:53+0000\n"
"Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
"Language-Team: Mongolian (Mongolia) (http://www.transifex.com/projects/p/vlc-"
@@@ -137,7 -137,7 +141,11 @@@ msgstr "Дууны буÑад тохиÑ
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -455,10 -455,10 +463,17 @@@ msgid "&About
msgstr "Тухай"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -497,17 -497,17 +512,29 @@@ msgid "Save...
msgstr "Хадгалах..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Бүгдийг давтах"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "ÐÑгийг давтах"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -587,7 -587,7 +614,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Хаах"
@@@ -1245,20 -1245,20 +1276,36 @@@ msgstr "
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1649,7 -1649,7 +1696,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1731,7 -1731,7 +1782,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Үгүй"
@@@ -1755,7 -1755,7 +1810,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Видео идÑвхтÑй"
@@@ -1945,7 -1945,7 +2004,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Байнга наад талд"
@@@ -1996,7 -1996,7 +2059,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2005,7 -2005,7 +2072,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2061,7 -2061,7 +2132,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Цонхны чимÑглÑлүүд"
@@@ -2230,7 -2230,7 +2305,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "ХүрÑÑнүүд алгаÑах"
@@@ -2358,12 -2358,12 +2437,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2371,7 -2371,7 +2459,11 @@@ msgid "Default
msgstr "Ðнхдагч"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2674,7 -2674,7 +2766,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3486,7 -3486,7 +3582,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "ÐлгаÑах"
@@@ -3510,8 -3510,8 +3610,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3591,10 -3591,10 +3696,17 @@@ msgid "Slower (fine)
msgstr "Удаан (таатай)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3607,10 -3607,10 +3719,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Өмнөх"
@@@ -3619,9 -3619,9 +3738,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3856,9 -3856,9 +3981,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "ЧимÑÑгүй"
@@@ -4272,7 -4272,7 +4403,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Зураг авалт"
@@@ -4471,12 -4471,12 +4606,21 @@@ msgstr "Татаж байна ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Болих"
@@@ -5232,7 -5232,7 +5376,11 @@@ msgstr "Танах
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "ҮзÑгдÑÑ… харьцаа"
@@@ -7528,7 -7528,7 +7676,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "ДÑлгÑц"
@@@ -8260,7 -8260,7 +8412,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9371,7 -9371,7 +9527,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Дууны гаргалт бүтÑлгүйтÑв"
@@@ -9402,7 -9402,7 +9562,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9410,30 -9410,30 +9574,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10599,46 -10599,46 +10787,74 @@@ msgstr "СүүдÑÑ€
msgid "Outline"
msgstr "ХүрÑÑÑ‚Ñй"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Хар"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Саарал"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Мөнгөлөг"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Цагаан"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "ХүрÑн"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Улаан"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10646,61 -10646,61 +10862,97 @@@ msgid "Fuchsia
msgstr "Тод Ñгаан"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Шар"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Бараандуу ногоон"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Ðогоон"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Хөх ногоон"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Шар ногоон"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Ягаан"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Гүн хөх"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Ð¥Ó©Ñ…"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10830,7 -10830,7 +11082,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12622,10 -12622,10 +12878,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Ð¥Ñвийн"
@@@ -12730,8 -12730,8 +12993,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13067,9 -13067,9 +13335,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "ЗавÑарлах"
@@@ -14948,7 -14948,7 +15222,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15127,7 -15127,7 +15405,11 @@@ msgid "VLC media player Help
msgstr "VLC дамжуулга тоглуулагчийн ТуÑламж"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15215,9 -15215,9 +15497,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Хадгалах"
@@@ -15356,7 -15356,7 +15644,11 @@@ msgstr "Оролт олдÑонгүй
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Очих цаг"
@@@ -15376,7 -15376,7 +15668,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15386,7 -15386,7 +15682,11 @@@ msgstr "
msgid "Forward"
msgstr "Урагш"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15406,84 -15406,84 +15706,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Ðффектүүд"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15519,7 -15519,7 +15890,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15702,8 -15702,8 +16077,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "ТуÑгай"
@@@ -15796,36 -15796,36 +16176,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "ҮргÑлжлүүлÑÑ…"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Хуучин тохиргоонуудыг уÑтгах уу?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Хуучин тохиргоонуудыг уÑтгах уу?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15977,7 -15977,7 +16389,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "ҮзÑÑ… харьцааг түгжих"
@@@ -16106,7 -16106,7 +16522,11 @@@ msgstr "VLC-г нуух
msgid "Hide Others"
msgstr "БуÑдыг нуух"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Бүгдийг харуулах"
@@@ -16191,15 -16191,15 +16611,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "ТоглоÑны дараа гарах"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Урагшлах алхам"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "ТоглоÑны дараа гарах"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Урагшлах алхам"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Ухрах алхам"
@@@ -16215,30 -16215,30 +16647,56 @@@ msgstr "Дуу Ñуллах
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "ХагаÑаар"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Ð¥Ñвийн Ñ…ÑмжÑÑ"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Давхраар"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "ДÑлгÑцÑнд дүүргÑÑ…"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "ХагаÑаар"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Ð¥Ñвийн Ñ…ÑмжÑÑ"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Давхраар"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "ДÑлгÑцÑнд дүүргÑÑ…"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "БүтÑн дÑлгÑцийн Видео төхөөрөмж"
@@@ -16247,7 -16247,7 +16705,11 @@@
msgid "Post processing"
msgstr "БоловÑруулалтын дараа"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16475,7 -16475,7 +16937,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Сонгох..."
@@@ -16646,7 -16646,7 +17112,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Ò®Ñгийн Ñ…ÑмжÑÑ"
@@@ -16875,12 -16875,12 +17345,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Тохиргоонууд"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Бүгдийг ÑÑргÑÑÑ…"
@@@ -17057,129 -17057,125 +17535,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Харуулах тохируулгууд"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Харуулах тохируулгууд"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Ò®Ñгийн өнгө"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Ò®ÑÑг"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OSD идÑвхтÑй"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OSD идÑвхтÑй"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Харанхуй"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "ДÑлгÑц"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Гаргах модуль"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Видео агшин авах"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "ХавтаÑ"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Тогтнол"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Угтвар"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "ДараалÑан дугаарлалт"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Гаргах модуль"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Видео агшин авах"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "ХавтаÑ"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Тогтнол"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Угтвар"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "ДараалÑан дугаарлалт"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Бага давтамж"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Багавтар давтамж"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Өндөрдүү давтамж"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Өндөр давтамж"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Тохируулгууд ÑÑргÑÑÑ…"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17192,35 -17188,35 +17778,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Сонгох"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Сонгох"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Буруу хоÑлол"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Буруу хоÑлол"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19161,20 -19157,20 +19777,36 @@@ msgstr "СонгоÑон төрхийÐ
msgid "Create a new profile"
msgstr "Ð¨Ð¸Ð½Ñ Ñ‚Ó©Ñ€Ñ… Ò¯Ò¯ÑгÑÑ…"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Ò®Ò¯ÑгÑÑ…"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Төрхийн нÑрийг орхиÑон байна"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Төрхийн нÑрийг орхиÑон байна"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Та төрийн нÑрийг Ñонгох шаардлагатай."
@@@ -22477,45 -22473,45 +23109,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "ЦÑг дÑÑ… Ò¯Ñгийн Ñ…ÑмжÑÑ"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "ЦÑг дÑÑ… Ò¯Ñгийн Ñ…ÑмжÑÑ"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "БичвÑрийн анхдагч өнгө"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22524,93 -22520,93 +23192,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Хамааралтай Ò¯ÑÑгийн Ñ…ÑмжÑÑ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Ð¥ÑÑ‚ жижиг"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Жижиг"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Том"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Ð¥ÑÑ‚ том"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/mr.po
index 1979171,fdf17a6..fe81c5e
--- a/po/mr.po
+++ b/po/mr.po
@@@ -10,7 -10,7 +10,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-10-02 05:55+0000\n"
"Last-Translator: suraj.kawade\n"
"Language-Team: Marathi (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -140,7 -140,7 +144,11 @@@ msgstr "संकीरà¥à¤£ धà¥à¤µ
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -453,10 -453,10 +461,17 @@@ msgid "&About
msgstr "VLC विषयी"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -495,17 -495,17 +510,29 @@@ msgid "Save...
msgstr "जतन करा..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "सरà¥à¤µà¤¾à¤‚ची पà¥à¤¨à¤°à¤¾à¤µà¥ƒà¤¤à¥à¤¤à¥€ करा"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "à¤à¤•à¤¾à¤šà¥€ पà¥à¤¨à¤°à¤¾à¤µà¥ƒà¤¤à¥à¤¤à¥€ करा"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -585,7 -585,7 +612,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "बंद करा"
@@@ -1245,20 -1245,20 +1276,36 @@@ msgstr "फà¥à¤°à¥‡à¤® दर
msgid "Decoded format"
msgstr "डीकोडे केलेले सà¥à¤µà¤°à¥‚प"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "आपले इनपà¥à¤Ÿ उघडू शकत नाही"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "आपले इनपà¥à¤Ÿ उघडू शकत नाही"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "MRL '%s उघडले जाऊ शकत नाही.अधिक माहितीसाठी लॉग पहा."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC आदान पà¥à¤°à¤•à¤¾à¤° ओळखू शकत नाही."
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC आदान पà¥à¤°à¤•à¤¾à¤° ओळखू शकत नाही."
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1649,7 -1649,7 +1696,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1731,7 -1731,7 +1782,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "काही नाही"
@@@ -1755,7 -1755,7 +1810,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "चितà¥à¤°à¤«à¥€à¤¤ सà¥à¤°à¥ करा"
@@@ -1945,7 -1945,7 +2004,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "नेहमी वर ठेवा"
@@@ -1996,7 -1996,7 +2059,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2005,7 -2005,7 +2072,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2061,7 -2061,7 +2132,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "विंडो सजावट"
@@@ -2230,7 -2230,7 +2305,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "फà¥à¤°à¥‡à¤® राहू दà¥à¤¯à¤¾"
@@@ -2358,12 -2358,12 +2437,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2371,7 -2371,7 +2459,11 @@@ msgid "Default
msgstr "मूळ"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2674,7 -2674,7 +2766,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3486,7 -3486,7 +3582,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "दà¥à¤°à¥à¤²à¤•à¥à¤· करा"
@@@ -3510,8 -3510,8 +3610,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3591,10 -3591,10 +3696,17 @@@ msgid "Slower (fine)
msgstr "जलद(फाईन)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3607,10 -3607,10 +3719,17 @@@ msgid "Select the hotkey to use to ski
msgstr "पà¥à¤²à¥‡à¤²à¤¿à¤¸à¥à¤Ÿà¤šà¥‡ पà¥à¤¢à¥€à¤² गाणे राखणà¥à¤¯à¤¾à¤¸à¤¾à¤ ी हॉट-कि चा वापर करा."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "मागील"
@@@ -3619,9 -3619,9 +3738,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "पà¥à¤²à¥‡à¤²à¤¿à¤¸à¥à¤Ÿà¤šà¥‡ मागील गाणे राखणà¥à¤¯à¤¾à¤¸à¤¾à¤ ी हॉट-कि चा वापर करा."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3856,9 -3856,9 +3981,15 @@@ msgid "Select the key to decrease audi
msgstr "संगीत आवाजकमी करणà¥à¤¯à¤¾à¤¸à¤¾à¤ ी कि निवडा."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "मूक"
@@@ -4272,7 -4272,7 +4403,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "चितà¥à¤° बनवा"
@@@ -4471,12 -4471,12 +4606,21 @@@ msgstr "डाउनलोड करी
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "रदà¥à¤¦ करा"
@@@ -5232,7 -5232,7 +5376,11 @@@ msgstr "फोडा
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "दृशà¥à¤¯ गà¥à¤£à¥‹à¤¤à¥à¤¤à¤°"
@@@ -7539,7 -7539,7 +7687,11 @@@ msgstr "सà¥à¤•à¥à¤°à¥€à¤¨ आदा
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "सà¥à¤•à¥à¤°à¥€à¤¨"
@@@ -8271,7 -8271,7 +8423,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9382,7 -9382,7 +9538,11 @@@ msgstr "सराउंड 7.1
msgid "ALSA audio output"
msgstr "ALSA धà¥à¤µà¤¨à¥€ आउटपà¥à¤Ÿ"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "संगीत पà¥à¤°à¤¦à¤¾à¤¨ अयशसà¥à¤µà¥€"
@@@ -9415,7 -9415,7 +9575,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9423,30 -9423,30 +9587,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10612,46 -10612,46 +10800,74 @@@ msgstr "सावली
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Black"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Gray"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Silver"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "White"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Maroon"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Red"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10659,61 -10659,61 +10875,97 @@@ msgid "Fuchsia
msgstr "Fuchsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Yellow"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Olive"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Green"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Teal"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lime"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Purple"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Navy"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Blue"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10843,7 -10843,7 +11095,11 @@@ msgstr "उपशीरà¥à¤·à¤• (पà¥
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12630,10 -12630,10 +12886,17 @@@ msgid "Fast
msgstr "जलद"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "सामानà¥à¤¯"
@@@ -12738,8 -12738,8 +13001,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13075,9 -13075,9 +13343,15 @@@ msgstr "सà¥à¤°à¥à¤µà¤¾à¤¤ करà¤
msgid "Opening"
msgstr "उघडत आहे"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "पौà¤"
@@@ -14956,7 -14956,7 +15230,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "टेलीटेकà¥à¤¸à¥à¤Ÿ"
@@@ -15135,7 -15135,7 +15413,11 @@@ msgid "VLC media player Help
msgstr "VLC मेडिया पà¥à¤²à¥‡à¤¯à¤° मदत"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "यादी"
@@@ -15223,9 -15223,9 +15505,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "जतन करा"
@@@ -15364,7 -15364,7 +15652,11 @@@ msgstr "इनपà¥à¤Ÿ नाही à¤
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "वेळेवर जा"
@@@ -15384,7 -15384,7 +15676,11 @@@ msgstr "निवडलेला मी
msgid "Backward"
msgstr "मागे"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15394,7 -15394,7 +15690,11 @@@ msgstr "
msgid "Forward"
msgstr "पà¥à¤¢à¥‡"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15414,84 -15414,84 +15714,155 @@@ msgstr "फà¥à¤² सà¥à¤•à¥à¤°à¥€à¤
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "पà¥à¤²à¥‡à¤¬à¥…क थांबवणà¥à¤¯à¤¾à¤¸à¤¾à¤ ी कà¥à¤²à¤¿à¤• करा."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "पà¥à¤²à¥‡à¤²à¤¿à¤¸à¥à¤Ÿ दाखवा/लपवा "
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "पà¥à¤²à¥‡à¤¬à¥…क थांबवणà¥à¤¯à¤¾à¤¸à¤¾à¤ ी कà¥à¤²à¤¿à¤• करा."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "पà¥à¤²à¥‡à¤²à¤¿à¤¸à¥à¤Ÿ दाखवा/लपवा "
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "पà¥à¤¨à¥à¤¹à¤¾"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "पिसा"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "पिसा"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "पूरà¥à¤£ आवाज"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "पूरà¥à¤£ आवाज"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "परिणाम"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "रà¥à¤ªà¤¾à¤‚तर करून सà¥à¤Ÿà¥à¤°à¥€à¤® करा"
@@@ -15527,7 -15527,7 +15898,11 @@@ msgstr "आउटपà¥à¤Ÿ सà¥à¤¥à¤¾
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15710,8 -15710,8 +16085,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "सानà¥à¤•à¥‚ल"
@@@ -15804,36 -15804,36 +16184,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "पà¥à¤¨à¥à¤¹à¤¾ विचारू नये"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "VLC मीडीया पà¥à¤²à¥‡à¤¬à¥…क"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "कà¥à¤°à¤¶à¤²à¥‰à¤— सापडत नाही"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "VLC मीडीया पà¥à¤²à¥‡à¤¬à¥…क"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "कà¥à¤°à¤¶à¤²à¥‰à¤— सापडत नाही"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "सà¥à¤°à¥ ठेवा"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "मागील पसंती काढून टाकू?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "मागील पसंती काढून टाकू?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15985,7 -15985,7 +16397,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "दृशà¥à¤¯ गà¥à¤£à¥‹à¤¤à¥à¤¤à¤° बंदिसà¥à¤¤ करा"
@@@ -16114,7 -16114,7 +16530,11 @@@ msgstr "VLC लपवा
msgid "Hide Others"
msgstr "बाकीचे लपवा"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "सरà¥à¤µ दाखवा"
@@@ -16199,15 -16199,15 +16619,27 @@@ msgstr "गाणे ताळमेळ
msgid "A→B Loop"
msgstr "A→B लूप"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "गाणà¥à¤¯à¤¾à¤¨à¤‚तर बाहेर पडा"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "पà¥à¤¢à¥‡ घà¥à¤¯à¤¾"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "गाणà¥à¤¯à¤¾à¤¨à¤‚तर बाहेर पडा"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "पà¥à¤¢à¥‡ घà¥à¤¯à¤¾"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "मागे घà¥à¤¯à¤¾"
@@@ -16223,30 -16223,30 +16655,56 @@@ msgstr "आवाज कमी करà¤
msgid "Audio Device"
msgstr "संगीत साधन"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "अरà¥à¤§à¤¾ आकार"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "सामानà¥à¤¯ आकार"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "दà¥à¤ªà¥à¤ªà¤Ÿ आकार"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "सà¥à¤•à¥à¤°à¥€à¤¨à¤²à¤¾ फिट करा"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "अरà¥à¤§à¤¾ आकार"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "सामानà¥à¤¯ आकार"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "दà¥à¤ªà¥à¤ªà¤Ÿ आकार"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "सà¥à¤•à¥à¤°à¥€à¤¨à¤²à¤¾ फिट करा"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "वर तरंगत ठेवा"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "चितà¥à¤°à¤«à¥€à¤¤ साधन फà¥à¤²à¤¸à¥à¤•à¥à¤°à¥€à¤¨ "
@@@ -16255,7 -16255,7 +16713,11 @@@
msgid "Post processing"
msgstr "उरलेले काम'"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16483,7 -16483,7 +16945,11 @@@ msgid "Play another media synchronously
msgstr "ताळमेळ घालून दà¥à¤¸à¤°à¤¾ मेडिया पà¥à¤²à¥‡ करा"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "निवडा..."
@@@ -16654,7 -16654,7 +17120,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "उपशीरà¥à¤·à¤• à¤à¤¨à¤•à¥‹à¤¡à¤¿à¤‚ग"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "फोनà¥à¤Ÿ आकार"
@@@ -16883,12 -16883,12 +17353,20 @@@ msgstr "जतन करताना à¤
msgid "VLC was unable to save the meta data."
msgstr "VLC मेटाडेटा जतन करू शकत नाही."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "पसंती"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "सरà¥à¤µ मूळ सà¥à¤µà¤°à¥à¤ªà¤¾à¤¤ आणा"
@@@ -17065,129 -17065,125 +17543,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "मूळ à¤à¤¨à¤•à¥‹à¤¡à¤¿à¤‚ग"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "डिसà¥à¤ªà¥à¤²à¥‡ सेटिंग"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "मूळ à¤à¤¨à¤•à¥‹à¤¡à¤¿à¤‚ग"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "डिसà¥à¤ªà¥à¤²à¥‡ सेटिंग"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "फोनà¥à¤Ÿ रंग"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "फोनà¥à¤Ÿ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OSD चालू करा"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OSD चालू करा"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "अपारदरà¥à¤¶à¤•à¤¤à¤¾"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "फà¥à¤²à¤¸à¥à¤•à¥à¤°à¥€à¤¨ पà¥à¤°à¤•à¤¾à¤°à¤¾à¤¤à¥€à¤² काळी सà¥à¤•à¥à¤°à¥€à¤¨"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "फà¥à¤²à¤¸à¥à¤•à¥à¤°à¥€à¤¨ पà¥à¤°à¤•à¤¾à¤°à¤¾à¤¤à¥€à¤² काळी सà¥à¤•à¥à¤°à¥€à¤¨"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "डिसà¥à¤ªà¥à¤²à¥‡"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "पà¥à¤°à¤¦à¤¾à¤¨ साधन"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "चितà¥à¤°à¤«à¥€à¤¤ पà¥à¤°à¤¤à¤¿à¤®à¤¾"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "फोलà¥à¤¡à¤°"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "पà¥à¤°à¤¦à¤¾à¤¨ साधन"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "चितà¥à¤°à¤«à¥€à¤¤ पà¥à¤°à¤¤à¤¿à¤®à¤¾"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "फोलà¥à¤¡à¤°"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "पसंती मूळ सà¥à¤µà¤°à¥à¤ªà¤¾à¤¤ आणा"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17200,35 -17196,35 +17786,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19179,20 -19175,20 +19795,36 @@@ msgstr "निवडलेला आर
msgid "Create a new profile"
msgstr "नवीन आराखडा बनवा"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "बनवा"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "आराखडà¥à¤¯à¤¾à¤šà¥‡ नाव दिले नाही"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "आराखडà¥à¤¯à¤¾à¤šà¥‡ नाव दिले नाही"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "तà¥à¤®à¥à¤¹à¥€ आराखडà¥à¤¯à¤¾à¤šà¥‡ नाव दिले पाहिजे"
@@@ -22499,45 -22495,45 +23131,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22546,93 -22542,93 +23214,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "जासà¥à¤¤ लहान"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "लहान"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "मोठे"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "जासà¥à¤¤ मोठे"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "पातळ"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "जड"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "पातळ"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "जड"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/ms.po
index 4b952a4,71ecb54..bcd2bfe
--- a/po/ms.po
+++ b/po/ms.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-05-04 08:00+0000\n"
"Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
"Language-Team: Malay (http://www.transifex.com/projects/p/vlc-trans/language/"
@@@ -138,7 -138,7 +142,11 @@@ msgstr "Lain-lain tetapan audio dan mod
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -477,10 -477,10 +485,17 @@@ msgid "&About
msgstr "Perih&al"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -519,17 -519,17 +534,29 @@@ msgid "Save...
msgstr "Simpan..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Ulang Semua"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Ulang Sekali"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -609,7 -609,7 +636,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Dilumpuhkan"
@@@ -1272,20 -1272,20 +1303,36 @@@ msgstr "Kadar kerangka
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Input anda tidak dapat dibuka"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Input anda tidak dapat dibuka"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC tidak dapat membuka MRL '%s'. Periksa log untuk perincian."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC gagal mengecam format input"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC gagal mengecam format input"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1710,7 -1710,7 +1757,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1796,7 -1796,7 +1847,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Tiada"
@@@ -1826,7 -1826,7 +1881,11 @@@ msgstr "
"Ini adalah metod output video yang digunakan oleh VLC. Kelakuan lalai adalah "
"automatik pilih metod terbaik yang ada."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Benarkan video"
@@@ -2033,7 -2033,7 +2092,11 @@@ msgstr "
"persembahkan terus video). VLC akan cuba menggunakannya sebagai lalai."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Sentiasa di atas"
@@@ -2084,7 -2084,7 +2147,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2093,7 -2093,7 +2160,11 @@@ msgstr "Deinterlace
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Mod merungkai"
@@@ -2151,7 -2151,7 +2222,11 @@@ msgstr "
"Halang daemon pengurusan kuasa semasa sebarang mainbalik, bagi mengelakkan "
"komputer terhenti kerana ketiadaan aktiviti."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Dekorasi tetingkap"
@@@ -2344,7 -2344,7 +2419,11 @@@ msgstr "
"bersegi (1:1). Jika anda mempunyai skrin 16:9, anda mungkin perlu menukarnya "
"kepada 4:3 untuk simpan ukuran."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Langkau kerangka"
@@@ -2488,12 -2488,12 +2567,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2501,7 -2501,7 +2589,11 @@@ msgid "Default
msgstr "Lalai"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2826,7 -2826,7 +2918,11 @@@ msgid "You can completely disable the s
msgstr "VLC boleh lumpuhkan keseluruhan memproses sub-gambar."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3732,7 -3732,7 +3828,11 @@@ msgid "These settings are the global VL
msgstr ""
"Tetapan ini adalah pengikat kunci VLC global, dikenali sebagai \"hotkey\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3756,8 -3756,8 +3856,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3837,10 -3837,10 +3942,17 @@@ msgid "Slower (fine)
msgstr "Perlahan (halus)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3855,10 -3855,10 +3967,17 @@@ msgstr "
"tayang."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Terdahulu"
@@@ -3869,9 -3869,9 +3988,15 @@@ msgstr "
"Pilih hotkey digunakan untuk lompat kepada item terdahulu dalam senarai "
"tayang."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4106,9 -4106,9 +4231,15 @@@ msgid "Select the key to decrease audi
msgstr "Pilih kunci untuk mengurangkan volum audio."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Bisukan"
@@@ -4522,7 -4522,7 +4653,11 @@@ msgstr "Kitar melalui peranti audio ter
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Snapshot"
@@@ -4726,12 -4726,12 +4861,21 @@@ msgstr "Muaturun ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Batal"
@@@ -5487,7 -5487,7 +5631,11 @@@ msgstr "Pangkas
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Nisbah aspek"
@@@ -7821,7 -7821,7 +7969,11 @@@ msgstr "Input Skrin
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Skrin"
@@@ -8553,7 -8553,7 +8705,11 @@@ msgstr "# Vol maks
msgid "Volume Set"
msgstr "Tetapan Volum"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9689,7 -9689,7 +9845,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "Pengadun audio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Output audio gagal"
@@@ -9720,7 -9720,7 +9880,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9728,32 -9728,32 +9892,56 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Output AudioUnit HAL"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Output AudioUnit HAL"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Peranti output audio dipilih adalah diguna secara eksklusif oleh program "
"lain."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Peranti audio tidak dikonfigur"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Peranti audio tidak dikonfigur"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Output terenkod)"
@@@ -10973,46 -10973,46 +11161,74 @@@ msgstr "Bayang
msgid "Outline"
msgstr "Panduan"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Hitam"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Kelabu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Perak"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Putih"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Maroon"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Merah"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11020,61 -11020,61 +11236,97 @@@ msgid "Fuchsia
msgstr "Fuchsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Kuning"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Olive"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Hijau"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Teal"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lime"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Purple"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Navy"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Biru"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11204,7 -11204,7 +11456,11 @@@ msgstr "Sarikata (lanjutan)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13077,10 -13077,10 +13333,17 @@@ msgid "Fast
msgstr "Fast"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -13185,8 -13185,8 +13448,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13531,9 -13531,9 +13799,15 @@@ msgstr "
msgid "Opening"
msgstr "Membuka"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Berhenti seketika"
@@@ -15439,7 -15439,7 +15713,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Demuxer Strim Pengangkut MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15618,7 -15618,7 +15896,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Indeks"
@@@ -15706,9 -15706,9 +15988,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Simpan"
@@@ -15853,7 -15853,7 +16141,11 @@@ msgid "The stream must be playing or pa
msgstr ""
"Stream mesti ditayangkan atau dihenti seketika untuk tanda laman berfungsi."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Lompat Ke Masa"
@@@ -15873,7 -15873,7 +16165,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15883,7 -15883,7 +16179,11 @@@ msgstr "
msgid "Forward"
msgstr "Maju"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15903,84 -15903,84 +16203,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Kesan"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16016,7 -16016,7 +16387,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16199,8 -16199,8 +16574,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Langganan "
@@@ -16293,36 -16293,36 +16673,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Tiada CrashLog ditemui"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Tiada CrashLog ditemui"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Teruskan"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Tidak menemui sebarang jejak nahas terdahulu."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Tidak menemui sebarang jejak nahas terdahulu."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16481,7 -16481,7 +16893,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16610,7 -16610,7 +17026,11 @@@ msgstr "Sorok VLC
msgid "Hide Others"
msgstr "Sorok Lain"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Papar Semua"
@@@ -16695,15 -16695,15 +17115,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Keluar selepas Tayangan"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Maju Langkah"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Keluar selepas Tayangan"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Maju Langkah"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Undur Langkah"
@@@ -16719,30 -16719,30 +17151,56 @@@ msgstr "Turunkan Volum
msgid "Audio Device"
msgstr "Peranti Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Saiz Separuh"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Saiz Normal"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Saiz Berganda"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Muat Skrin"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Saiz Separuh"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Saiz Normal"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Saiz Berganda"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Muat Skrin"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Apung di Atas"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Peranti Video Skrin Penuh"
@@@ -16751,7 -16751,7 +17209,11 @@@
msgid "Post processing"
msgstr "Pasca memproses"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16979,7 -16979,7 +17441,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Pilih..."
@@@ -17150,7 -17150,7 +17616,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Saiz Font"
@@@ -17379,12 -17379,12 +17849,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Keutamaan"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Reset Semua"
@@@ -17561,129 -17561,125 +18039,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Warna fon"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Font"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Kelegapan"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Paparan"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Folder"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Format "
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Awalan "
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Folder"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Format "
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Awalan "
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Kependaman terendah"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Kependaman tertinggi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Reset Keutamaan"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17696,35 -17692,35 +18282,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Pilih"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Pilih"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19737,20 -19733,20 +20353,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Cipta"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -23126,23 -23122,23 +23758,43 @@@ msgstr "Output strim transkod
msgid "Overlays/Subtitles"
msgstr "Lappisan/Sarikata"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Saiz font dalam piksel"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Saiz font dalam piksel"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23151,11 -23147,11 +23803,19 @@@ msgstr "
"Ini adalah saiz lalai font yang akan dikemukana pada video. Jika ditetapkan "
"kepada sesuatu yang lain dari 0 pilihan ini akan menindih saiz font relatif."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -23163,12 -23159,12 +23823,20 @@@ msgstr "
"Kelegapan (balikan dari telus) pada teks yang akan diberikan pada video. 0 = "
"telus, 255 = legap keseluruhannya."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Warna lalai teks"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23181,71 -23177,71 +23849,131 @@@ msgstr "
"kemudian biru. #000000 = hitam, #FF0000 = merah, #00FF00 = hijau, #FFFF00 = "
"kuning (merah + hijau), #FFFFFF = putih"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Saiz font relatif"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "lebih kecil"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Kecil"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Besar"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "lebih besar"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Guna pengemuka YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Guna pengemuka YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -23253,23 -23249,23 +23981,43 @@@ msgstr "
"Persembahan font menggunakan \"YUV terpalet\". Pilihan ini hanya diperlukan "
"jika anda ingin mengkodnya kepada sarikata DVB"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Pengemuka teks"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Pengemuka fon Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Pengemuka teks"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Pengemuka fon Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/my.po
index a42840e,fbaeed5..21b6c68
--- a/po/my.po
+++ b/po/my.po
@@@ -10,7 -10,7 +10,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-05-04 08:00+0000\n"
"Last-Translator: Christoph Miebach <christoph.miebach at web.de>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/vlc-"
@@@ -135,7 -135,7 +139,11 @@@ msgstr "အမျá€á€¯á€¸á€™á€»á€á€¯á
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -442,10 -442,10 +450,17 @@@ msgid "&About
msgstr "အကြောင်း(&A)"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -484,17 -484,17 +499,29 @@@ msgid "Save...
msgstr "မှá€á€ºá€žá€á€™á€ºá€¸..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "အားလုံးပြန်ဖွင့်"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "á€á€…်á€á€¯á€á€Šá€ºá€¸á€•á€¼á€”်ဖွင့်"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -574,7 -574,7 +601,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "မလုပ်ဆောင်စေ"
@@@ -1233,20 -1233,20 +1264,36 @@@ msgstr "
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1637,7 -1637,7 +1684,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1719,7 -1719,7 +1770,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "ဘာမှမဟုá€á€º"
@@@ -1743,7 -1743,7 +1798,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -1933,7 -1933,7 +1992,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "အမြဲá€á€™á€ºá€¸á€¡á€•á€±á€«á€º"
@@@ -1984,7 -1984,7 +2047,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -1993,7 -1993,7 +2060,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2049,7 -2049,7 +2120,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2218,7 -2218,7 +2293,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2346,12 -2346,12 +2425,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2359,7 -2359,7 +2447,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2662,7 -2662,7 +2754,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3474,7 -3474,7 +3570,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3498,8 -3498,8 +3598,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3579,10 -3579,10 +3684,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3595,10 -3595,10 +3707,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "ယá€á€„်"
@@@ -3607,9 -3607,9 +3726,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3844,9 -3844,9 +3969,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "အသံá€á€á€á€º"
@@@ -4260,7 -4260,7 +4391,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4457,12 -4457,12 +4592,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "ပယ်ဖျက်"
@@@ -5218,7 -5218,7 +5362,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7514,7 -7514,7 +7662,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8246,7 -8246,7 +8398,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9357,7 -9357,7 +9513,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9388,7 -9388,7 +9548,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9396,30 -9396,30 +9560,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10585,46 -10585,46 +10773,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "မျá€á€¯á€¸á€á€°á€…ု"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10632,61 -10632,61 +10848,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10816,7 -10816,7 +11068,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12603,10 -12603,10 +12859,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -12711,8 -12711,8 +12974,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13048,9 -13048,9 +13316,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "ရပ်á€á€”့်"
@@@ -14928,7 -14928,7 +15202,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15107,7 -15107,7 +15385,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15195,9 -15195,9 +15477,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "မှá€á€ºá€žá€á€™á€ºá€¸"
@@@ -15336,7 -15336,7 +15624,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15356,7 -15356,7 +15648,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15366,7 -15366,7 +15662,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15386,84 -15386,84 +15686,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "ကုလားဖန်ထá€á€¯á€¸"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "ကုလားဖန်ထá€á€¯á€¸"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15499,7 -15499,7 +15870,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15682,8 -15682,8 +16057,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "စá€á€á€ºá€€á€¼á€á€¯á€€á€º"
@@@ -15776,36 -15776,36 +16156,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15957,7 -15957,7 +16369,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16086,7 -16086,7 +16502,11 @@@ msgstr "
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr ""
@@@ -16171,15 -16171,15 +16591,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16195,30 -16195,30 +16627,56 @@@ msgstr "
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16227,7 -16227,7 +16685,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16455,7 -16455,7 +16917,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -16626,7 -16626,7 +17092,11 @@@ msgstr "ဘောင်နှုန်á
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -16855,12 -16855,12 +17325,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "လá€á€¯á€œá€¬á€¸á€á€»á€€á€ºá€™á€»á€¬á€¸"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17037,129 -17037,125 +17515,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17172,35 -17168,35 +17758,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19138,20 -19134,20 +19754,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22454,45 -22450,45 +23086,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22501,93 -22497,93 +23169,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/nb.po
index ff49a3d,831461c..468b2fa
--- a/po/nb.po
+++ b/po/nb.po
@@@ -12,7 -12,7 +12,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-22 08:17+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
@@@ -142,7 -142,7 +146,11 @@@ msgstr "Diverse innstillinger for lyd o
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -465,10 -465,10 +473,17 @@@ msgid "&About
msgstr "&Om"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -507,17 -507,17 +522,29 @@@ msgid "Save...
msgstr "Lagre …"
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Gjenta alt"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Gjenta en"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -622,7 -622,7 +649,11 @@@ msgstr "Det maksimale nummeret for filt
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Slå av"
@@@ -1288,20 -1288,20 +1319,36 @@@ msgstr "Bildefrekvens
msgid "Decoded format"
msgstr "Dekodet format"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Inndataene kan ikke åpnes"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Inndataene kan ikke åpnes"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC kan ikke åpne MRL-en «%s». Les loggen for mer informasjon."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC gjenkjenner ikke inndataformatet"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC gjenkjenner ikke inndataformatet"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1727,7 -1727,7 +1774,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1811,7 -1811,7 +1862,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Ingen"
@@@ -1835,7 -1835,7 +1890,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Slå på video"
@@@ -2029,7 -2029,7 +2088,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Alltid øverst"
@@@ -2081,7 -2081,7 +2144,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2090,7 -2090,7 +2157,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2148,7 -2148,7 +2219,11 @@@ msgstr "
"Hindrer strømsparingtjenesten i å starte ved avspilling. Dette forhindrer at "
"datamaskinen blir satt i hvilemodus ved mangel på aktivitet."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Vindudekorasjoner"
@@@ -2328,7 -2328,7 +2403,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Hopp over rammer"
@@@ -2456,12 -2456,12 +2535,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2469,7 -2469,7 +2557,11 @@@ msgid "Default
msgstr "Standard"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2774,7 -2774,7 +2866,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3601,7 -3601,7 +3697,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignorer"
@@@ -3625,8 -3625,8 +3725,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3706,10 -3706,10 +3811,17 @@@ msgid "Slower (fine)
msgstr "Tregere (små steg)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3722,10 -3722,10 +3834,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Velg en hurtigsast for å bytte til det neste elementet i spillelisten."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Forrige"
@@@ -3735,9 -3735,9 +3854,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"Velg en hurtigsast for å bytte mellom forrige og neste element i spillelisten"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3972,9 -3972,9 +4097,15 @@@ msgid "Select the key to decrease audi
msgstr "Velg hurtigtasten for å senke volumet."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Demp"
@@@ -4388,7 -4388,7 +4519,11 @@@ msgstr "Bytt mellom de tilgjengelige ly
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Skjermbilde"
@@@ -4590,12 -4590,12 +4725,21 @@@ msgstr "Laster ned …
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Avbryt"
@@@ -5356,7 -5356,7 +5500,11 @@@ msgstr "Beskjær
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Størrelsesforhold"
@@@ -7652,7 -7652,7 +7800,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Skjerm"
@@@ -8384,7 -8384,7 +8536,11 @@@ msgstr "
msgid "Volume Set"
msgstr "Lydstyrke"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9495,7 -9495,7 +9651,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9526,7 -9526,7 +9686,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9534,30 -9534,30 +9698,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Lydenheten er ikke satt opp"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Lydenheten er ikke satt opp"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10723,46 -10723,46 +10911,74 @@@ msgstr "Skygge
msgid "Outline"
msgstr "Disposisjon"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Sorter"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Grå"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Sølv"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Hvit"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Rød"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10770,61 -10770,61 +10986,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Gul"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Oliven"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Grønn"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lime"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Lilla"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Marine"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Blå"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10956,7 -10956,7 +11208,11 @@@ msgstr "Undertekster (avansert)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Bygger skriftmellomlager"
@@@ -12745,10 -12745,10 +13001,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -12853,8 -12853,8 +13116,13 @@@ msgid "D-Bus control interface
msgstr "DBus-kontrollgrensesnitt"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13192,9 -13192,9 +13460,15 @@@ msgstr "Klargjør
msgid "Opening"
msgstr "Ã…pner"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pause"
@@@ -15077,7 -15077,7 +15351,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -15256,7 -15256,7 +15534,11 @@@ msgid "VLC media player Help
msgstr "Hjelp for VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Innholdsliste"
@@@ -15344,9 -15344,9 +15626,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Lagre"
@@@ -15485,7 -15485,7 +15773,11 @@@ msgstr "Fant ingen inndata
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Hopp til:"
@@@ -15505,7 -15505,7 +15797,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15515,7 -15515,7 +15811,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15535,84 -15535,84 +15835,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Tilfeldig"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Tilfeldig"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Effekter"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15648,7 -15648,7 +16019,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15831,8 -15831,8 +16206,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Tilpasset"
@@@ -15925,36 -15925,36 +16305,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Fant ingen krasjlogg"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Fant ingen krasjlogg"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Fortsett"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Kunne ikke finne spor av et tidligere krasj."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Fjerne gamle innstillinger?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Fant nettopp en eldre versjon av VLCs oppsettfiler."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Flytt til søppelkurven og start VLC på nytt"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Kunne ikke finne spor av et tidligere krasj."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Fjerne gamle innstillinger?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Fant nettopp en eldre versjon av VLCs oppsettfiler."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Flytt til søppelkurven og start VLC på nytt"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16106,7 -16106,7 +16518,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16235,7 -16235,7 +16651,11 @@@ msgstr "Skjul VLC
msgid "Hide Others"
msgstr "Skjul andre"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Vis alt"
@@@ -16320,15 -16320,15 +16740,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Avslutt etter avspilling"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "GÃ¥ framover"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Avslutt etter avspilling"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "GÃ¥ framover"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "GÃ¥ bakover"
@@@ -16344,30 -16344,30 +16776,56 @@@ msgstr "Senk volumet
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Halv størrelse"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Normal størrelse"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dobbel størrelse"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Tilpass til skjerm"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Halv størrelse"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Normal størrelse"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dobbel størrelse"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Tilpass til skjerm"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Flyt øverst"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16376,7 -16376,7 +16834,11 @@@
msgid "Post processing"
msgstr "Etterbehandling"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16604,7 -16604,7 +17066,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Velg …"
@@@ -16777,7 -16777,7 +17243,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Skriftstørrelse"
@@@ -17006,12 -17006,12 +17476,20 @@@ msgstr "Feil ved lagring av metadata
msgid "VLC was unable to save the meta data."
msgstr "VLC kunne ikke lagre metadataene."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Innstillinger"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Tilbakestill alt"
@@@ -17188,129 -17188,125 +17666,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Skriftfarge"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Skrift"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Slå på skjermvisning"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Slå på skjermvisning"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Skjermbilder"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Mappe"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Format"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefiks"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Sekvensiell nummerering"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Skjermbilder"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Mappe"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Format"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefiks"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Sekvensiell nummerering"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Tilbakestill innstillinger"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17323,35 -17319,35 +17909,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Velg"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Velg"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Ugyldig kombinasjon"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Ugyldig kombinasjon"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19289,20 -19285,20 +19905,36 @@@ msgstr "Slett den valgte profilen
msgid "Create a new profile"
msgstr "Lag en ny profil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Lag"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Mangler profilnavn"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Mangler profilnavn"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22611,45 -22607,45 +23243,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Skriftstørrelse i bildepunkter"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Skriftstørrelse i bildepunkter"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Standard skriftfarge"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22658,93 -22654,93 +23326,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Relativ skriftstørrelse"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Mindre"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Små"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Stor"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Større"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Bruk YUVP-opptegning"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Bruk YUVP-opptegning"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Teksttegner"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2-skrifttegner"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Teksttegner"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2-skrifttegner"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/ne.po
index a1a6c67,d058cbe..641d28a
--- a/po/ne.po
+++ b/po/ne.po
@@@ -2,7 -2,7 +2,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: \n"
"Last-Translator: Animesh Swar <animesh_swar at hotmail.co.uk>\n"
"Language-Team: \n"
@@@ -131,7 -131,7 +135,11 @@@ msgstr "विविध अडियà¥
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -494,10 -494,10 +502,17 @@@ msgid "&About
msgstr "बारेमा"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -540,17 -540,17 +555,29 @@@ msgid "Save...
msgstr "बाचात गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ "
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "सबै दोहरà¥à¤¯à¤¾à¤‰à¤¨à¥à¤¹à¥‹à¤¸à¥"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "दोहरà¥à¤¯à¤¾à¤‰à¤¨à¥‡ सà¥à¤°à¥ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -659,7 -659,7 +686,11 @@@ msgstr "छानà¥à¤¨à¥‡ को अà¤
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "अकà¥à¤·à¤® पारà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
@@@ -1413,20 -1413,20 +1444,36 @@@ msgstr "फà¥à¤°à¥‡à¤® दर
msgid "Decoded format"
msgstr "असङà¥à¤•à¥‡à¤¤à¤•"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "तपाईंको ईनपà¥à¤Ÿ खोलà¥à¤¨ सकिदैन "
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "तपाईंको ईनपà¥à¤Ÿ खोलà¥à¤¨ सकिदैन "
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC को MRL '%s' खोलà¥à¤¨ असमरà¥à¤¥ छौ। विवरण को लागि पà¥à¤°à¤µà¥‡à¤¶ को जाà¤à¤š गरौ। "
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC को ईनपà¥à¤Ÿ को पà¥à¤°à¤¾à¤°à¥‚प लाई चिनà¥à¤¨ सकिà¤à¤¨"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC को ईनपà¥à¤Ÿ को पà¥à¤°à¤¾à¤°à¥‚प लाई चिनà¥à¤¨ सकिà¤à¤¨"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1865,7 -1865,7 +1912,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1956,7 -1956,7 +2007,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "कà¥à¤¨à¥ˆ होइन"
@@@ -1986,7 -1986,7 +2041,11 @@@ msgstr "
"यो VLC दà¥à¤µà¤¾à¤°à¤¾ पà¥à¤°à¤¯à¥‹à¤— गरिà¤à¤•à¥‹ à¤à¤¿à¤¡à¤¿à¤¯à¥‹ निरà¥à¤—त विधि हो । पूरà¥à¤µà¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤¿à¤¤ वà¥à¤¯à¤µà¤¹à¤¾à¤°à¤²à¥‡ उपलबà¥à¤§ "
"उपयà¥à¤•à¥à¤¤ विधि सà¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ रूपमा चयन गरà¥à¤¦à¤› ।"
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "à¤à¤¿à¤¡à¤¿à¤¯à¥‹ सकà¥à¤·à¤® पारà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
@@@ -2193,7 -2193,7 +2252,11 @@@ msgstr "
"रूपमा रेनà¥à¤¡à¤° गरà¥à¤¨à¥‡ कà¥à¤·à¤®à¤¤à¤¾) । VLC ले यसलाई पूरà¥à¤µà¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤¿à¤¤ रूपमा पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨ पà¥à¤°à¤¯à¤¾à¤¸ गरà¥à¤¦à¤› ।"
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "सधै माथितिर"
@@@ -2253,7 -2253,7 +2316,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2262,7 -2262,7 +2329,11 @@@ msgstr "डिइनà¥à¤Ÿà¤°à¤²à¥‡à¤¸
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "डिइनà¥à¤Ÿà¤°à¤²à¥‡à¤¸ मोड"
@@@ -2321,7 -2321,7 +2392,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr "à¤à¤¿à¤¡à¤¿à¤¯à¥‹ पà¥à¤²à¥‡à¤¬à¥à¤¯à¤¾à¤• गरà¥à¤¦à¤¾ सà¥à¤•à¥à¤°à¤¿à¤¨à¤¸à¥‡à¤à¤° अकà¥à¤·à¤® पारà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "सञà¥à¤à¥à¤¯à¤¾à¤² सजावट"
@@@ -2518,7 -2518,7 +2593,11 @@@ msgstr "
"यसले मोनिटर आकार अनà¥à¤ªà¤¾à¤¤ बल गरà¥à¤¦à¤› । धेरै मोनिटरसà¤à¤— वरà¥à¤— पिकà¥à¤¸à¥‡à¤² (१:१) हà¥à¤¨à¥à¤› । यदि तपाईà¤à¤¸à¤à¤— "
"१६:९ सà¥à¤•à¥à¤°à¤¿à¤¨ छ à¤à¤¨à¥‡, तपाईà¤à¤²à¥‡ अनà¥à¤ªà¤¾à¤¤ राखà¥à¤¨ कà¥à¤°à¤®à¤®à¤¾ ४:३ मा परिवरà¥à¤¤à¤¨ गरà¥à¤¨ आवशà¥à¤¯à¤• परà¥à¤¦à¤› ।"
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "फà¥à¤°à¥‡à¤® फडà¥à¤•à¤¾à¤‰à¤¨à¥à¤¹à¥‹à¤¸à¥"
@@@ -2669,12 -2669,12 +2748,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2682,7 -2682,7 +2770,11 @@@ msgid "Default
msgstr "पूरà¥à¤µà¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤¿à¤¤"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -3025,7 -3025,7 +3117,11 @@@ msgid "You can completely disable the s
msgstr "तपाईà¤à¤²à¥‡ सहायक तसà¥à¤µà¤¿à¤° पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾à¤²à¤¾à¤ˆ समà¥à¤ªà¥‚रà¥à¤£ रूपमा अकà¥à¤·à¤® पारà¥à¤¨ सकà¥à¤¨à¥à¤¹à¥à¤¨à¥à¤› ।"
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3957,7 -3957,7 +4053,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "ति सेटिङहरू विशà¥à¤µà¤µà¥à¤¯à¤¾à¤ªà¥€ VLC कà¥à¤žà¥à¤œà¥€ बनà¥à¤§à¤¨ हà¥à¤¨à¥ जसलाई \"हटकà¥à¤žà¥à¤œà¥€\" को रूपमा चिनिनà¥à¤› ।"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Ignore"
msgstr "कà¥à¤¨à¥ˆ होइन"
@@@ -3985,8 -3985,8 +4085,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4072,10 -4072,10 +4177,17 @@@ msgid "Slower (fine)
msgstr "ढिलो"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4088,10 -4088,10 +4200,17 @@@ msgid "Select the hotkey to use to ski
msgstr "बजाउने सूचीमा पछिलà¥à¤²à¥‹ वसà¥à¤¤à¥à¤²à¤¾à¤ˆ फडà¥à¤•à¤¾à¤‰à¤¨ पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨ हटकà¥à¤žà¥à¤œà¥€ चयन गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "अघिलà¥à¤²à¥‹"
@@@ -4100,9 -4100,9 +4219,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "बजाउने सूचीमा अघिलà¥à¤²à¥‹ वसà¥à¤¤à¥ फडà¥à¤•à¤¾à¤‰à¤¨ पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨ हटकà¥à¤žà¥à¤œà¥€ चयन गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4339,9 -4339,9 +4464,15 @@@ msgid "Select the key to decrease audi
msgstr "अडियो à¤à¥‹à¤²à¥à¤¯à¥à¤® घटाउन कà¥à¤žà¥à¤œà¥€ चयन गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "मौन"
@@@ -4782,7 -4782,7 +4913,11 @@@ msgstr "उपलबà¥à¤§ अडिय
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "सà¥à¤¨à¥à¤¯à¤¾à¤ªà¤¶à¤Ÿ"
@@@ -4987,12 -4987,12 +5122,21 @@@ msgstr "अहिले डाउनल
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "रदà¥à¤¦ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
@@@ -5764,7 -5764,7 +5908,11 @@@ msgstr "काà¤à¤Ÿà¤›à¤¾à¤à¤Ÿ गर
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "आकार अनà¥à¤ªà¤¾à¤¤"
@@@ -8312,7 -8312,7 +8460,11 @@@ msgstr "सà¥à¤•à¥à¤°à¤¿à¤¨ आगत
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "सà¥à¤•à¥à¤°à¤¿à¤¨"
@@@ -9137,7 -9137,7 +9289,11 @@@ msgstr "Vol max #
msgid "Volume Set"
msgstr "à¤à¥‹à¤²à¥à¤¯à¥à¤® सेट"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10362,7 -10362,7 +10518,11 @@@ msgstr "सराउनà¥à¤¡
msgid "ALSA audio output"
msgstr "ALSA अडियो निरà¥à¤—त"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "अडियो निरà¥à¤—त पिन"
@@@ -10398,7 -10398,7 +10558,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "गà¥à¤°à¥‡à¤¸à¥à¤•à¥‡à¤² à¤à¤¿à¤¡à¤¿à¤¯à¥‹ निरà¥à¤—त"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "HAL अडियो à¤à¤•à¤¾à¤‡ निरà¥à¤—त"
@@@ -10408,32 -10408,32 +10572,56 @@@
msgid "Last audio device"
msgstr "अडियो यनà¥à¤¤à¥à¤°"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL अडियो à¤à¤•à¤¾à¤‡ निरà¥à¤—त"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL अडियो à¤à¤•à¤¾à¤‡ निरà¥à¤—त"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
++=======
+ #: modules/audio_output/auhal.c:578
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio device is not configured"
msgstr "अडियो यनà¥à¤¤à¥à¤° नाम"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "अडियो यनà¥à¤¤à¥à¤°"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (सङà¥à¤•à¥‡à¤¤à¤¨ निरà¥à¤—त)"
@@@ -11719,46 -11719,46 +11907,74 @@@ msgstr "छाà¤à¤¯à¤¾ अफसेट
msgid "Outline"
msgstr "रà¥à¤ªà¤°à¥‡à¤–ा"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "कालो"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "गà¥à¤°à¥‡"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "चाà¤à¤¦à¥€ रङ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "सेतो"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "खैरो रातो रङ"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "रातो"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11766,61 -11766,61 +11982,97 @@@ msgid "Fuchsia
msgstr "उजà¥à¤¯à¤¾à¤²à¥‹ रातो रङ"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "पहेà¤à¤²à¥‹"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "जलपाई"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "हरियो"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "गाढा हरियो निलो"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "कागती"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "बैजनी"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "गाढा निलो"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "निलो"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11964,7 -11964,7 +12216,11 @@@ msgstr "उपशीरà¥à¤·à¤• सङ
msgid "Subtitle renderers using libass"
msgstr "उपशीरà¥à¤·à¤• डà¥à¤®à¥à¤•à¥à¤¸à¤° सेटिङ"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13925,10 -13925,10 +14181,17 @@@ msgid "Fast
msgstr "छिटो"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "साधारण"
@@@ -14053,8 -14053,8 +14316,13 @@@ msgid "D-Bus control interface
msgstr "नियनà¥à¤¤à¥à¤°à¤£ इनà¥à¤Ÿà¤°à¤«à¥‡à¤¸"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14422,9 -14422,9 +14690,15 @@@ msgstr "इटालीयन
msgid "Opening"
msgstr "खोलà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "पज गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
@@@ -16505,7 -16505,7 +16779,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG वाहन पà¥à¤°à¤µà¤¾à¤¹ डà¥à¤®à¥à¤•à¥à¤¸à¤°"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Teletext"
msgstr "पाठउपशीरà¥à¤·à¤• असङà¥à¤•à¥‡à¤¤à¤•"
@@@ -16704,7 -16704,7 +16982,11 @@@ msgid "VLC media player Help
msgstr "VLC मिडिया पà¥à¤²à¥‡à¤¯à¤°"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾"
@@@ -16801,9 -16801,9 +17083,15 @@@ msgstr "कृपया नोड नà¤
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "बचत गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
@@@ -16948,7 -16948,7 +17236,11 @@@ msgstr "आगत फेला परà¥
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "पà¥à¤¸à¥à¤¤à¤•à¤šà¤¿à¤¨à¥‹à¤²à¥‡ काम गरà¥à¤¨à¤•à¤¾ लागि पà¥à¤°à¤µà¤¾à¤¹à¤²à¤¾à¤ˆ बजाउनॠवा पज गरà¥à¤¨à¥ परà¥à¤¦à¤› ।"
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "समयमा जानà¥à¤¹à¥‹à¤¸à¥"
@@@ -16969,7 -16969,7 +17261,11 @@@ msgstr "
msgid "Backward"
msgstr "चरण पछाडि"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16979,7 -16979,7 +17275,11 @@@ msgstr "
msgid "Forward"
msgstr "पठाउनà¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -17001,93 -17001,93 +17301,164 @@@ msgstr "टेलनेट इनà¥à¤Ÿ
msgid "Click to enable fullscreen video playback."
msgstr "à¤à¤¿à¤¡à¤¿à¤¯à¥‹ पà¥à¤²à¥‡à¤¬à¥à¤¯à¤¾à¤• गरà¥à¤¦à¤¾ सà¥à¤•à¥à¤°à¤¿à¤¨à¤¸à¥‡à¤à¤° अकà¥à¤·à¤® पारà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "पà¥à¤²à¥‡à¤¬à¥à¤¯à¤¾à¤• रोकà¥à¤¨ हटकà¥à¤žà¥à¤œà¥€ चयन गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "बजाउने सूची बचत गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "सबै दोहरà¥à¤¯à¤¾à¤‰à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "अडियो मौन गरà¥à¤¨ कà¥à¤žà¥à¤œà¥€ चयन गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "पूरà¥à¤µà¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤¿à¤¤ अडियो à¤à¥‹à¤²à¥à¤¯à¥à¤®"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to play the audio at maximum volume."
msgstr "चौडाइ र उचाइलाई अधिकतम मानको रूपमा लिनà¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
#, fuzzy
msgid "Effects"
msgstr "पà¥à¤°à¤à¤¾à¤µ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr "अघिलà¥à¤²à¥‹ बजाउने सूची वसà¥à¤¤à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the next playlist item."
msgstr "VLC ले हालको बजाउने सूची वसà¥à¤¤à¥à¤²à¤¾à¤ˆ बजाइ रहनà¥à¤› ।"
++<<<<<<< HEAD
++=======
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -17129,7 -17129,7 +17500,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17331,8 -17331,8 +17706,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
#, fuzzy
msgid "Custom"
@@@ -17434,38 -17434,38 +17814,70 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "VLC मिडिया पà¥à¤²à¥‡à¤¯à¤°"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "कà¥à¤°à¥à¤¯à¤¾à¤¶ लग फेला परेन"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "कà¥à¤°à¥à¤¯à¤¾à¤¶ लग फेला परेन"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "जारी राखà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "अघिलà¥à¤²à¥‹ बिगà¥à¤°à¥‡à¤•à¥‹ कà¥à¤¨à¥ˆ पनि चिनà¥à¤¹ फेला पारà¥à¤¨ सकेन"
+
+#: modules/gui/macosx/intf.m:1936
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "अघिलà¥à¤²à¥‹ बिगà¥à¤°à¥‡à¤•à¥‹ कà¥à¤¨à¥ˆ पनि चिनà¥à¤¹ फेला पारà¥à¤¨ सकेन"
+
+ #: modules/gui/macosx/intf.m:1921
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Remove old preferences?"
msgstr "पà¥à¤°à¤¾à¤¥à¤®à¤¿à¤•à¤¤à¤¾ पà¥à¤¨: सेट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -17626,7 -17626,7 +18038,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Lock Aspect Ratio"
msgstr "सà¥à¤§à¤¾à¤° आकार अनà¥à¤ªà¤¾à¤¤"
@@@ -17768,7 -17768,7 +18184,11 @@@ msgstr "VLC लà¥à¤•à¤¾à¤‰à¤¨à¥à¤¹à¥‹
msgid "Hide Others"
msgstr "अनà¥à¤¯ लà¥à¤•à¤¾à¤‰à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "सबै देखाउनà¥à¤¹à¥‹à¤¸à¥"
@@@ -17861,16 -17861,16 +18281,28 @@@ msgstr "घडि समकà¥à¤°à¤®à¤£
msgid "A→B Loop"
msgstr "लà¥à¤ª"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Quit after Playback"
msgstr "सà¥à¤¥à¤¾à¤¨à¤¿à¤¯ पà¥à¤²à¥‡à¤¬à¥à¤¯à¤¾à¤•"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "चरण अगाडि"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "चरण अगाडि"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "चरण पछाडि"
@@@ -17888,30 -17888,30 +18320,56 @@@ msgstr "पूरà¥à¤µà¤¨à¤¿à¤°à¥à¤§à
msgid "Audio Device"
msgstr "अडियो यनà¥à¤¤à¥à¤°"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "आधा साइज"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "साधारण साइज"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "दोबà¥à¤¬à¤° साइज"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "सà¥à¤•à¥à¤°à¤¿à¤¨à¤®à¤¾ मिलà¥à¤¨à¥‡ बनाउनà¥à¤¹à¥‹à¤¸à¥"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "आधा साइज"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "साधारण साइज"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "दोबà¥à¤¬à¤° साइज"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "सà¥à¤•à¥à¤°à¤¿à¤¨à¤®à¤¾ मिलà¥à¤¨à¥‡ बनाउनà¥à¤¹à¥‹à¤¸à¥"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "माथि समतल"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Fullscreen Video Device"
msgstr "पूरापरà¥à¤¦à¤¾ à¤à¤¿à¤¡à¤¿à¤¯à¥‹ निरà¥à¤—त"
@@@ -17921,7 -17921,7 +18379,11 @@@
msgid "Post processing"
msgstr "पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ पशà¥à¤šà¤¾à¤¤"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "उपशीरà¥à¤·à¤• फाइल"
@@@ -18175,7 -18175,7 +18637,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "छनोट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥..."
@@@ -18368,7 -18368,7 +18834,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "उपशीरà¥à¤·à¤• सङà¥à¤•à¥‡à¤¤à¤¨"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "फनà¥à¤Ÿ साइज"
@@@ -18607,12 -18607,12 +19077,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "पà¥à¤°à¤¾à¤¥à¤®à¤¿à¤•à¤¤à¤¾"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "सबै पà¥à¤¨: सेट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
@@@ -18813,144 -18813,139 +19291,252 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "सà¥à¤¥à¤¾à¤¨à¤¿à¤¯ पà¥à¤²à¥‡à¤¬à¥à¤¯à¤¾à¤•"
+
+#: modules/gui/macosx/simple_prefs.m:377
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Default Encoding"
msgstr "असङà¥à¤•à¥‡à¤¤à¤¨"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:378
++=======
+ #: modules/gui/macosx/simple_prefs.m:377
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Display Settings"
msgstr "रिजà¥à¤¯à¥‹à¤²à¥à¤¸à¤¨ पà¥à¤°à¤°à¥à¤¦à¤¶à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
#, fuzzy
msgid "Font color"
msgstr "रङ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "फनà¥à¤Ÿ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "उपशीरà¥à¤·à¤• à¤à¤¾à¤·à¤¾"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "अडियो à¤à¤¾à¤·à¤¾"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Enable OSD"
msgstr "सकà¥à¤·à¤® पारà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "अपारदरà¥à¤¶à¥€à¤¤à¤¾"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Force bold"
msgstr "मोनो अडियो बल गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "रà¥à¤ªà¤°à¥‡à¤–ा"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Black screens in Fullscreen mode"
msgstr "पूरापरà¥à¤¦à¤¾à¤®à¤¾ कालो परà¥à¤¦à¤¾"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "पà¥à¤°à¤°à¥à¤¦à¤¶à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Output module"
msgstr "निरà¥à¤—त मोडà¥à¤¯à¥à¤²"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
++=======
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Video snapshots"
msgstr "à¤à¤¿à¤¡à¤¿à¤¯à¥‹ सà¥à¤¨à¥à¤¯à¤¾à¤ªà¤¶à¤Ÿ ढाà¤à¤šà¤¾"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
++=======
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Folder"
msgstr "फोलà¥à¤Ÿà¤° रितà¥à¤¯à¤¾à¤‰à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
++=======
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Format"
msgstr "VCD ढाà¤à¤šà¤¾"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
++=======
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Prefix"
msgstr "अघिलà¥à¤²à¥‹"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "पà¥à¤°à¤¾à¤¥à¤®à¤¿à¤•à¤¤à¤¾ पà¥à¤¨: सेट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18963,38 -18958,38 +19549,68 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the folder to save your video snapshots to."
msgstr "तपाईà¤à¤•à¥‹ आगत पà¥à¤°à¤µà¤¾à¤¹ यहाठछनोट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "छनोट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "छनोट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the directory or filename where the records will be stored."
msgstr "रेकरà¥à¤¡ सङà¥à¤—à¥à¤°à¤¹ हà¥à¤¨à¥‡ डाइरेकà¥à¤Ÿà¤°à¥€"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Invalid combination"
msgstr "अवैध चयन"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -21213,21 -21208,21 +21829,37 @@@ msgstr "चयन गरिà¤à¤•à¥‹ à¤
msgid "Create a new profile"
msgstr "\"छिटो सà¥à¤°à¥\" फाइल सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
#, fuzzy
msgid "Create"
msgstr "केनà¥à¤¦à¥à¤°"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "You must set a name for the profile."
msgstr "सà¥à¤µà¤¤: पतà¥à¤¤à¤¾ उपशीरà¥à¤·à¤• फाइल"
@@@ -24959,25 -24954,25 +25591,45 @@@ msgstr "टà¥à¤°à¤¾à¤¨à¥à¤¸à¤•à¥‹à¤¡
msgid "Overlays/Subtitles"
msgstr "ओà¤à¤°à¤²à¥‡/उपशीरà¥à¤·à¤•"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font family for the font you want to use"
msgstr "तपाईà¤à¤²à¥‡ पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨ चाहनॠà¤à¤à¤•à¥‹ फनà¥à¤Ÿà¤•à¤¾ लागि फाइलनाम"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:159
++=======
+ #: modules/text_renderer/freetype.c:158
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font file for the font you want to use"
msgstr "तपाईà¤à¤²à¥‡ पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨ चाहनॠà¤à¤à¤•à¥‹ फनà¥à¤Ÿà¤•à¤¾ लागि फाइलनाम"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "पिकà¥à¤¸à¥‡à¤²à¤®à¤¾ फनà¥à¤Ÿ साइज"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "पिकà¥à¤¸à¥‡à¤²à¤®à¤¾ फनà¥à¤Ÿ साइज"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24986,12 -24981,12 +25638,20 @@@ msgstr "
"यो à¤à¤¿à¤¡à¤¿à¤¯à¥‹à¤®à¤¾ रेनà¥à¤¡à¤° गरिने फनà¥à¤Ÿà¤•à¥‹ पूरà¥à¤µà¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤¿à¤¤ साइज हो । यदि ० à¤à¤¨à¥à¤¦à¤¾ केहि फरकमा सेट "
"गरिà¤à¤®à¤¾ यो विकलà¥à¤ªà¤²à¥‡ सापेकà¥à¤·à¤¿à¤• फनà¥à¤Ÿ साइज अधिरोधण गरà¥à¤¦à¤› ।"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "रà¥à¤ªà¤°à¥‡à¤–ा"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24999,12 -24994,12 +25659,20 @@@ msgstr "
"à¤à¤¿à¤¡à¤¿à¤¯à¥‹à¤®à¤¾ रेनà¥à¤¡à¤° गरिने पाठको अपारदरà¥à¤¶à¥€à¤¤à¤¾ (पारदरà¥à¤¶à¥€à¤¤à¤¾à¤•à¥‹ उलà¥à¤Ÿà¥‹) । ० = पारदरà¥à¤¶à¥€, २५५ = "
"पूरà¥à¤£ रूपमा अपारदरà¥à¤¶à¥€ "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "पाठपूरà¥à¤µà¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤¿à¤¤ रङ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -25016,12 -25011,12 +25684,20 @@@ msgstr "
"दà¥à¤ˆ कà¥à¤¯à¤¾à¤°à¥‡à¤•à¥à¤Ÿà¤°à¤¹à¤°à¥‚ रातो, तà¥à¤¯à¤¸à¤ªà¤›à¤¿ हरियो र निलोका लागि हो । #000000 = कालो, #FF0000 = "
"रातो, #00FF00 = हरियो, #FFFF00 = पहेà¤à¤²à¥‹ (रातो + हरियो), #FFFFFF = सेतो"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "सापेकà¥à¤·à¤¿à¤• फनà¥à¤Ÿ साइज"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
#, fuzzy
msgid ""
@@@ -25031,66 -25026,66 +25707,118 @@@ msgstr "
"à¤à¤¿à¤¡à¤¿à¤¯à¥‹à¤®à¤¾ रेनà¥à¤¡à¤° गरिनेसà¤à¤— यो फनà¥à¤Ÿà¤•à¥‹ सापेकà¥à¤·à¤¿à¤• पूरà¥à¤µà¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤¿à¤¤ साइज हो । यदि पूरà¥à¤£ साइज सेट "
"गरेमा, सापेकà¥à¤·à¤¿à¤• साइज अधिरोहण हà¥à¤¨à¥à¤› ।"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "पृषà¥à¤ à¤à¥‚मि"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "पृषà¥à¤ à¤à¥‚मि"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "रà¥à¤ªà¤°à¥‡à¤–ा"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
++=======
+ #: modules/text_renderer/freetype.c:187
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow opacity"
msgstr "छाà¤à¤¯à¤¾ अफसेट"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "छाà¤à¤¯à¤¾ अफसेट"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
++=======
+ #: modules/text_renderer/freetype.c:189
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow angle"
msgstr "छाà¤à¤¯à¤¾ अफसेट"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:191
++=======
+ #: modules/text_renderer/freetype.c:190
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow distance"
msgstr "छाà¤à¤¯à¤¾ अफसेट"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "धेरै सानो"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "सानो"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "ठूलो"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "धेरै ठूलो"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "YUVP रेनà¥à¤¡à¤°à¤° पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "YUVP रेनà¥à¤¡à¤°à¤° पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -25098,23 -25093,23 +25826,43 @@@ msgstr "
"यसले \"paletized YUV\" को पà¥à¤°à¤¯à¥‹à¤— गरेर फनà¥à¤Ÿ रेनà¥à¤¡à¤° गरà¥à¤¦à¤› । यदि तपाईà¤à¤²à¥‡ DVB उपशीरà¥à¤·à¤•à¤®à¤¾ "
"सङà¥à¤•à¥‡à¤¤à¤¨ गरà¥à¤¨ चाहनॠà¤à¤à¤®à¤¾ मातà¥à¤° यो विकलà¥à¤ª आवशà¥à¤¯à¤• परà¥à¤¦à¤› ।"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "पाठरेनà¥à¤¡à¤°à¤°"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "सà¥à¤µà¤¤à¤¨à¥à¤¤à¥à¤° पà¥à¤°à¤•à¤¾à¤° २ फनà¥à¤Ÿ रेनà¥à¤¡à¤°à¤°"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "पाठरेनà¥à¤¡à¤°à¤°"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "सà¥à¤µà¤¤à¤¨à¥à¤¤à¥à¤° पà¥à¤°à¤•à¤¾à¤° २ फनà¥à¤Ÿ रेनà¥à¤¡à¤°à¤°"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/nl.po
index b9bba25,54a5c6e..91d70d0
--- a/po/nl.po
+++ b/po/nl.po
@@@ -11,7 -11,7 +11,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-28 15:14+0000\n"
"Last-Translator: Thomas De Rocker\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/vlc-trans/language/"
@@@ -142,7 -142,7 +146,11 @@@ msgstr "Overige audio-instellingen en m
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -494,10 -494,10 +502,17 @@@ msgid "&About
msgstr "&Over"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -536,17 -536,17 +551,29 @@@ msgid "Save...
msgstr "Opslaan..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Alles herhalen"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Eén herhalen"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -651,7 -651,7 +678,11 @@@ msgstr "Het maximum aantal filters (%u
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Uitschakelen"
@@@ -1355,20 -1355,20 +1386,36 @@@ msgstr "Beeldsnelheid
msgid "Decoded format"
msgstr "Gedecodeerd formaat"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Uw invoer kon niet geopend worden"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Uw invoer kon niet geopend worden"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC kon de MRL '%s' niet openen. Controleer het logboek voor details."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC is niet in staat de structuur van de invoer te herkennen"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC is niet in staat de structuur van de invoer te herkennen"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1803,7 -1803,7 +1850,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1893,7 -1893,7 +1944,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Geen"
@@@ -1922,7 -1922,7 +1977,11 @@@ msgstr "
"Dit is de video-uitvoermethode die door VLC gebruikt zal worden. Het "
"standaardgedrag is om automatisch de best beschikbare module te kiezen."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Video inschakelen"
@@@ -2132,7 -2132,7 +2191,11 @@@ msgstr "
"video direct weer te geven). VLC zal standaard proberen deze te gebruiken."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Altijd boven"
@@@ -2188,7 -2188,7 +2251,11 @@@ msgstr "Cursor en besturing volledig sc
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2197,7 -2197,7 +2264,11 @@@ msgstr "Deïnterlace
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Deïnterlace-modus"
@@@ -2255,7 -2255,7 +2326,11 @@@ msgstr "
"Schakel de energiebeheerdaemon uit tijdens het afspelen om te voorkomen dat "
"de computer in slaapstand gezet wordt doordat er geen activiteit plaatsvindt."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Vensterranden"
@@@ -2460,7 -2460,7 +2535,11 @@@ msgstr "
"pixels (1:1). Als u een 16:9 scherm heeft, moet u wellicht dit naar 4:3 "
"veranderen om de juiste verhouding te behouden."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Beelden overslaan"
@@@ -2604,12 -2604,12 +2683,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2617,7 -2617,7 +2705,11 @@@ msgid "Default
msgstr "Standaard"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2964,7 -2964,7 +3056,11 @@@ msgid "You can completely disable the s
msgstr "U kunt subafbeelding verwerking volledig uitschakelen."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3928,7 -3928,7 +4024,11 @@@ msgstr "
"Hier kunnen VLC 'sneltoetsen' geconfigureerd worden, ook wel bekend als "
"\"hotkeys\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Negeren"
@@@ -3954,8 -3954,8 +4054,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4036,10 -4036,10 +4141,17 @@@ msgid "Slower (fine)
msgstr "Langzamer (fijn)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4054,10 -4054,10 +4166,17 @@@ msgstr "
"gaan."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Vorige"
@@@ -4068,9 -4068,9 +4187,15 @@@ msgstr "
"Selecteer de sneltoets om naar het vorige onderdeel in de afspeellijst te "
"gaan."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4306,9 -4306,9 +4431,15 @@@ msgid "Select the key to decrease audi
msgstr "Selecteer de sneltoets om het geluid harder te zetten."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Dempen"
@@@ -4733,7 -4733,7 +4864,11 @@@ msgstr "Schakelen tussen beschikbare au
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Momentopname"
@@@ -4941,12 -4941,12 +5076,21 @@@ msgstr "Downloaden ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Annuleren"
@@@ -5714,7 -5714,7 +5858,11 @@@ msgstr "Bijsnijden
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Beeldverhouding"
@@@ -8221,7 -8221,7 +8369,11 @@@ msgstr "Beeldscherminvoer
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Scherm"
@@@ -8976,7 -8976,7 +9128,11 @@@ msgstr "Vol max #
msgid "Volume Set"
msgstr "Volume ingesteld"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10172,7 -10172,7 +10328,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "ALSA audio-uitvoer"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Audio-uitvoer mislukt"
@@@ -10205,7 -10205,7 +10365,11 @@@ msgstr "AudioQueue (iOS / Mac OS) audio
msgid "Android AudioTrack audio output"
msgstr "Android AudioTrack audio-uitvoer"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "AudioUnit-uitvoer voor iOS"
@@@ -10213,22 -10213,22 +10377,38 @@@
msgid "Last audio device"
msgstr "Laatste audio-apparaat"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit-uitvoer"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit-uitvoer"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Het geselecteerde audio-uitvoerapparaat is exclusief in gebruik door een "
"ander programma."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Audioapparaat is niet geconfigureerd"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Audioapparaat is niet geconfigureerd"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10236,11 -10236,11 +10416,19 @@@ msgstr "
"Configureer uw speakeropstelling met \"Audio Midi Setup\" in /Toepassingen/"
"Hulpprogramma's. Op dit moment wordt de stereo-modus gebruikt."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Systeemgeluid-uitvoerapparaat"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Systeemgeluid-uitvoerapparaat"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Gecodeerde uitvoer)"
@@@ -11536,46 -11536,46 +11724,74 @@@ msgstr "Schaduw
msgid "Outline"
msgstr "Omtrek"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Zwart"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Grijs"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Zilver"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Wit"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Kastanjebruin"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Rood"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11583,61 -11583,61 +11799,97 @@@ msgid "Fuchsia
msgstr "Fuchsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Geel"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Olijf"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Groen"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Taling"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Limoen"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Paars"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Marine"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Blauw"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11792,7 -11792,7 +12044,11 @@@ msgstr "Ondertitels (geavanceerd)
msgid "Subtitle renderers using libass"
msgstr "Ondertitelweergave met libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Lettertypebuffer opbouwen"
@@@ -13815,10 -13815,10 +14071,17 @@@ msgid "Fast
msgstr "Snel"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normaal"
@@@ -13926,8 -13926,8 +14189,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus controle-interface"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14281,9 -14281,9 +14549,15 @@@ msgstr "Initialiseren
msgid "Opening"
msgstr "Openen"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pauze"
@@@ -16234,7 -16234,7 +16508,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG Transport Stream demuxer"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletekst"
@@@ -16422,7 -16422,7 +16700,11 @@@ msgid "VLC media player Help
msgstr "VLC Media Player help"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Index"
@@@ -16510,9 -16510,9 +16792,15 @@@ msgstr "Voer een naam in voor het nieuw
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Opslaan"
@@@ -16657,7 -16657,7 +16945,11 @@@ msgid "The stream must be playing or pa
msgstr ""
"De stream moet afspelen of gepauzeerd zijn om bladwijzers te laten werken."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Naar tijdstip springen"
@@@ -16677,7 -16677,7 +16969,11 @@@ msgstr "Klik om de huidige media af te
msgid "Backward"
msgstr "Achteruit"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16689,7 -16689,7 +16985,11 @@@ msgstr "
msgid "Forward"
msgstr "Vooruit"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16713,23 -16713,15 +17013,35 @@@ msgstr "Shermvullende weergave aan/uit
msgid "Click to enable fullscreen video playback."
msgstr "Klik om videoweergave in volledig scherm in te schakelen."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "Klikken en vasthouden om de huidige media terug te spoelen."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "Klikken en vasthouden om de huidige media vooruit te spoelen."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Klik om afspelen te stoppen."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Afspeellijst weergeven/verbergen"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Klik om afspelen te stoppen."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Afspeellijst weergeven/verbergen"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -16738,12 -16730,12 +17050,20 @@@ msgstr "
"weergegeven wordt in het hoofdvenster, kunt u hiermee de afspeellijst "
"verbergen."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Herhalen"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -16751,15 -16743,15 +17071,27 @@@ msgstr "
"Klik om de herhalingsmodus te wijzigen. Er zijn 3 mogelijkheden: één "
"herhalen, alles herhalen en uitgeschakeld."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Shuffle"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "Klik om willekeurig afspelen in/uit te schakelen."
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Shuffle"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "Klik om willekeurig afspelen in/uit te schakelen."
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -16767,24 -16759,24 +17099,44 @@@ msgstr "
"Klik en beweeg de muis terwijl u de knop ingedrukt houdt om deze schuifbalk "
"te gebruiken om het volume te wijzigen."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Klik om het geluid te dempen of terug in te schakelen."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Volledig volume"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Klik om de audio aan het maximale volume af te spelen."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Klik om het geluid te dempen of terug in te schakelen."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Volledig volume"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Klik om de audio aan het maximale volume af te spelen."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Effecten"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -16792,14 -16784,22 +17144,33 @@@ msgstr "
"Klik om een audio-effectenpaneel weer te geven, dat een equalizer en andere "
"filters bevat."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Klik om naar het vorige afspeellijst-item te gaan."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Klik om naar het volgende afspeellijst-item te gaan."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Klik om naar het vorige afspeellijst-item te gaan."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Klik om naar het volgende afspeellijst-item te gaan."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "Klikken en vasthouden om de huidige media terug te spoelen."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "Klikken en vasthouden om de huidige media vooruit te spoelen."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Converteren & streamen"
@@@ -16835,7 -16835,7 +17206,11 @@@ msgstr "Kies een uitvoerlocatie
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17025,8 -17025,8 +17400,13 @@@ msgid "A SDP export is requested, but n
msgstr "Er is een SDP-export aangevraagd, maar er werd geen url opgegeven."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Aangepast"
@@@ -17130,36 -17130,36 +17510,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "Niet opnieuw vragen"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "VLC media-weergave"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Geen CrashLog gevonden"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "VLC media-weergave"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Geen CrashLog gevonden"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Doorgaan"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Kan geen trace-bestand van een vorige crash vinden."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Oude voorkeuren verwijderen?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "We vonden net een oudere versie van VLC's voorkeurenbestanden."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Verplaats naar Prullenbak en herstart VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Kan geen trace-bestand van een vorige crash vinden."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Oude voorkeuren verwijderen?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "We vonden net een oudere versie van VLC's voorkeurenbestanden."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Verplaats naar Prullenbak en herstart VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC Debug Log (%s).rtf"
@@@ -17342,7 -17342,7 +17754,11 @@@ msgstr "
"Deze optie staat toe dat het icoon van de interface in verschillende "
"gevallen wijzigt."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Beeldverhouding vastzetten"
@@@ -17475,7 -17475,7 +17891,11 @@@ msgstr "VLC verbergen
msgid "Hide Others"
msgstr "Andere verbergen"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Alles weergeven"
@@@ -17560,15 -17560,15 +17980,27 @@@ msgstr "Spoorsynchronisatie
msgid "A→B Loop"
msgstr "A→B herhalen"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Afsluiten na afspelen"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Stap vooruit"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Afsluiten na afspelen"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Stap vooruit"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Stap terug"
@@@ -17584,30 -17584,30 +18016,56 @@@ msgstr "Volume verlagen
msgid "Audio Device"
msgstr "Audio-apparaat"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Halve grootte"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Normale grootte"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dubbele grootte"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Passend op scherm"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Halve grootte"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Normale grootte"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dubbele grootte"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Passend op scherm"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Altijd boven"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Schermvullend video-apparaat"
@@@ -17616,7 -17616,7 +18074,11 @@@
msgid "Post processing"
msgstr "Nabewerking"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Ondertitelbestand toevoegen..."
@@@ -17856,7 -17856,7 +18318,11 @@@ msgid "Play another media synchronously
msgstr "Een ander medium synchroon afspelen"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Kiezen..."
@@@ -18044,7 -18044,7 +18510,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Ondertitelcodering"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Tekstgrootte"
@@@ -18273,12 -18273,12 +18743,20 @@@ msgstr "Fout tijdens opslaan van gegeve
msgid "VLC was unable to save the meta data."
msgstr "VLC was niet in staat metagegevens op te slaan."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Voorkeuren"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Alles herstellen"
@@@ -18457,130 -18457,125 +18935,238 @@@ msgstr "Growl-notificaties inschakelen
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "iTunes pauzeren tijdens afspelen van VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Standaardcodering"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Weergave-instellingen"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Standaardcodering"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Weergave-instellingen"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Tekstkleur"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Lettertype"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Ondertitel-talen"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Ondertitel-talen"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Voorkeurstaal ondertitels"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OSD inschakelen"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OSD inschakelen"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Dekking"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Vet forceren"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Vet forceren"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Kleur omtrek"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Dikte omtrek"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Zwarte schermen in schermvullende modus"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Zwarte schermen in schermvullende modus"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Weergave"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Uitvoermodule"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Video-snapshots"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Map"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Formaat"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefix"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Sequentiele nummering"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Laatste controle op: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Er is nog geen controle uitgevoerd."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Uitvoermodule"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Video-snapshots"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Map"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Formaat"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefix"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Sequentiele nummering"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Laatste controle op: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Er is nog geen controle uitgevoerd."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Laagste latentietijd"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Lage latentietijd"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Hoge latentietijd"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Hogere latentietijd"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Voorkeuren herstellen"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18602,20 -18597,20 +19188,37 @@@ msgstr "
"\n"
"Bent u zeker dat u wilt verdergaan?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Kies de map om uw video snapshots in op te slaan."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Kiezen"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Map of bestandsnaam waar de opnames in opgeslagen moeten worden."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Kies de map om uw video snapshots in op te slaan."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Kiezen"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Map of bestandsnaam waar de opnames in opgeslagen moeten worden."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18623,17 -18618,17 +19226,30 @@@ msgstr "
"Druk op een nieuwe toets voor\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Ongeldige combinatie"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Ongeldige combinatie"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"Helaas, deze toetsen kunnen niet als sneltoetskoppelingen toegewezen worden."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Deze combinatie wordt al gebruikt door \"%@\"."
@@@ -20724,20 -20719,20 +21340,36 @@@ msgstr "Geselecteerd profiel verwijdere
msgid "Create a new profile"
msgstr "Nieuw profiel aanmaken"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Maken"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "Deze muxer wordt niet direct voorzien door VLC: hij kan ontbreken."
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Profielnaam ontbreekt"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr "Deze muxer wordt niet direct voorzien door VLC: hij kan ontbreken."
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Profielnaam ontbreekt"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Geef een naam voor het profiel op."
@@@ -24308,23 -24303,23 +24940,43 @@@ msgstr "Transcode-streamuitvoer
msgid "Overlays/Subtitles"
msgstr "Overlays/ondertitels"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Monospace-lettertype"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Lettertypefamilie van het lettertype dat u wilt gebruiken"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Lettertypebestand van het lettertype dat u wilt gebruiken"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Tekstgrootte in pixels"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Monospace-lettertype"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Lettertypefamilie van het lettertype dat u wilt gebruiken"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Lettertypebestand van het lettertype dat u wilt gebruiken"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Tekstgrootte in pixels"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24334,11 -24329,11 +24986,19 @@@ msgstr "
"video. Als u iets anders dan 0 instelt, zal deze optie de relatieve "
"tekstgrootte overschrijven."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Tekstdekking"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Tekstdekking"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24346,12 -24341,12 +25006,20 @@@ msgstr "
"De dekking (omgekeerde van transparantie) van de tekst die op de video zal "
"worden weergegeven. 0 = transparant, 255 = volledig dekkend."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Standaardtekstkleur"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24364,12 -24359,12 +25032,20 @@@ msgstr "
"voor rood, dan groen, dan blauw. #000000 = zwart, #FF0000 = rood, #00FF00 = "
"groen, #FFFF00 = geel (rood + groen), #FFFFFF = wit"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Relatieve lettergrootte"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24379,59 -24374,59 +25055,111 @@@ msgstr "
"weergegeven zullen worden. Als de absolute tekstgrootte ingesteld is, zal de "
"relatieve grootte overschreven worden."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Achtergronddekking"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Achtergrondkleur"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Omtrekdekking"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Schaduwdekking"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Schaduwkleur"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Schaduwhoek"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Schaduw-afstand"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Achtergronddekking"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Achtergrondkleur"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Omtrekdekking"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Schaduwdekking"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Schaduwkleur"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Schaduwhoek"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Schaduw-afstand"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Kleiner"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Klein"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Groot"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Groter"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "YUVP-renderer gebruiken"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "YUVP-renderer gebruiken"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24439,23 -24434,23 +25167,43 @@@ msgstr "
"Dit geeft de tekst weer door \"YUV met paletten\" te gebruiken. Deze optie "
"is alleen nodig als u wilt coderen als DVB-ondertitels."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Dun"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Dik"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Tekstweergave"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2-tekstweergave"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Dun"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Dik"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Tekstweergave"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2-tekstweergave"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/nn.po
index 9e63cad,9064e37..61a05ad
--- a/po/nn.po
+++ b/po/nn.po
@@@ -7,7 -7,7 +7,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2010-01-27 19:06+0100\n"
"Last-Translator: Eirik U. Birkeland <eirbir at gmail.com>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@@ -138,7 -138,7 +142,11 @@@ msgstr "Ymse lydinnstillingar og -modul
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -498,10 -498,10 +506,17 @@@ msgid "&About
msgstr "&Om"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -544,19 -544,19 +559,31 @@@ msgid "Save...
msgstr "Lagra …"
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Repeat All"
msgstr "Velg fil"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Repeat One"
msgstr "Valg"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -665,7 -665,7 +692,11 @@@ msgstr "Det høgste talet på filter (%
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Slå av"
@@@ -1417,20 -1417,20 +1448,36 @@@ msgstr "Biletrate
msgid "Decoded format"
msgstr "Dekodarar"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Klarer ikkje opna inndataa dine"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Klarer ikkje opna inndataa dine"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC klarer ikkje opna MRL-en «%s». Sjå loggen for detaljar."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC kjenner ikkje att inndataformatet"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC kjenner ikkje att inndataformatet"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1868,7 -1868,7 +1915,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1960,7 -1960,7 +2011,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Ingen"
@@@ -1990,7 -1990,7 +2045,11 @@@ msgstr "
"Dette er den metoden for videoutdata som er i bruk av VLC. "
"Standardinnstillinga vel automatisk den beste tilgjengelege metoden."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Slå på video"
@@@ -2200,7 -2200,7 +2259,11 @@@ msgstr "
"video direkte). VLC vil prøva å bruka det som standard."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Alltid øvst"
@@@ -2253,7 -2253,7 +2316,11 @@@ msgstr "Gøym peikar og fullskjermskont
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2262,7 -2262,7 +2329,11 @@@ msgstr "Linjedobling
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
#, fuzzy
msgid "Deinterlace mode"
@@@ -2324,7 -2324,7 +2395,11 @@@ msgstr "
"Stoppar straumstyringa under alle avspelingar, for å unngå at maskina går i "
"kvilemodus grunna inaktivitet."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Vindaugsdekorasjonar"
@@@ -2533,7 -2533,7 +2608,11 @@@ msgstr "
"(1:1). Om du har ein 16:9, må du kanskje endre denne til 4:3 for å halde på "
"proporsjonane."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Skip frames"
msgstr "Fort"
@@@ -2692,12 -2692,12 +2771,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2706,7 -2706,7 +2794,11 @@@ msgid "Default
msgstr "Slett"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
#, fuzzy
@@@ -3083,7 -3083,7 +3175,11 @@@ msgid "You can completely disable the s
msgstr "Du kan slå underbilethandsaminga heilt av."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -4061,7 -4061,7 +4157,11 @@@ msgstr "
"Desse innstillingane er globale VLC-tastekombinasjonar, kjende som "
"«snøggtastar»."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Ignore"
msgstr "Mono"
@@@ -4089,8 -4089,8 +4189,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4172,10 -4172,10 +4277,17 @@@ msgid "Slower (fine)
msgstr "Seinare (jamt)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4188,10 -4188,10 +4300,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Vel snøggtast for å hoppa til neste element på spelelista."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Førre"
@@@ -4200,9 -4200,9 +4319,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "Vel snøggtast for å hoppa til førre element på spelelista."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4437,9 -4437,9 +4562,15 @@@ msgid "Select the key to decrease audi
msgstr "Vel tast for å få lågare lyd."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Demp"
@@@ -4877,7 -4877,7 +5008,11 @@@ msgstr "Bla gjennom tilgjengelege lydei
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Skjermbilete"
@@@ -5093,12 -5093,12 +5228,21 @@@ msgstr "Lastar ned …
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Avbryt"
@@@ -5917,7 -5917,7 +6061,11 @@@ msgstr "Klipp til
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "kildens bildeformat"
@@@ -8500,7 -8500,7 +8648,11 @@@ msgstr "Fullskjerm %d
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Skjerm"
@@@ -9347,7 -9347,7 +9499,11 @@@ msgstr "
msgid "Volume Set"
msgstr "Øk volum"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
#, fuzzy
@@@ -10616,7 -10616,7 +10772,11 @@@ msgstr "Lyd
msgid "ALSA audio output"
msgstr "Lydeksport volum"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "Lyd-eksportmodul"
@@@ -10653,7 -10653,7 +10813,11 @@@ msgstr "Standard grensesnitt:
msgid "Android AudioTrack audio output"
msgstr "Videoutdata i gråtonar"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "Lydeksport volum"
@@@ -10663,34 -10663,34 +10827,58 @@@
msgid "Last audio device"
msgstr "lydenhet"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
++=======
+ #: modules/audio_output/auhal.c:166
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "HAL AudioUnit output"
msgstr "Lydeksport volum"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
++=======
+ #: modules/audio_output/auhal.c:578
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio device is not configured"
msgstr "Navn på ALSA-enhet"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr "Lyd."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "lydenhet"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -12020,27 -12020,27 +12208,43 @@@ msgstr "Forskyvning av skygge
msgid "Outline"
msgstr "heltall"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#, fuzzy
msgid "Black"
msgstr "Tilbake"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Grå"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
#, fuzzy
msgid "Silver"
msgstr "Sakte"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
@@@ -12048,7 -12048,7 +12252,11 @@@
msgid "White"
msgstr "Tittel"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
#, fuzzy
@@@ -12056,7 -12056,7 +12264,11 @@@ msgid "Maroon
msgstr "Mono"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
@@@ -12064,7 -12064,7 +12276,11 @@@
msgid "Red"
msgstr "Ã…pne fil"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -12073,7 -12073,7 +12289,11 @@@ msgid "Fuchsia
msgstr "skrifttype"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -12081,7 -12081,7 +12301,11 @@@
msgid "Yellow"
msgstr "Sakte"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
#, fuzzy
@@@ -12089,7 -12089,7 +12313,11 @@@ msgid "Olive
msgstr "heltall"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -12097,14 -12097,14 +12325,22 @@@
msgid "Green"
msgstr "Fullskjerm"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
#, fuzzy
msgid "Teal"
msgstr "Tittel"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
@@@ -12112,14 -12112,14 +12348,22 @@@
msgid "Lime"
msgstr "Tid"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
#, fuzzy
msgid "Purple"
msgstr "_Teksting"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
#, fuzzy
@@@ -12127,7 -12127,7 +12371,11 @@@ msgid "Navy
msgstr "_Navigasjon"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
@@@ -12135,7 -12135,7 +12383,11 @@@
msgid "Blue"
msgstr "Øk volum"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -12279,7 -12279,7 +12531,11 @@@ msgstr "Standard grensesnitt:
msgid "Subtitle renderers using libass"
msgstr "_Innstillinger"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -14280,10 -14280,10 +14536,17 @@@ msgid "Fast
msgstr "Fort"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Normal"
@@@ -14406,8 -14406,8 +14669,13 @@@ msgid "D-Bus control interface
msgstr "Standard grensesnitt: "
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14790,9 -14790,9 +15058,15 @@@ msgstr "tegn
msgid "Opening"
msgstr "Ã…pne fil"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pause"
@@@ -16900,7 -16900,7 +17174,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Spill strøm"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Teletext"
msgstr "Velg neste Kapittel"
@@@ -17109,7 -17109,7 +17387,11 @@@ msgid "VLC media player Help
msgstr "Hjelp for VLC mediespelar"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Index"
msgstr "Standard grensesnitt: "
@@@ -17211,9 -17211,9 +17493,15 @@@ msgstr "_Gjem grensesnitt
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
#, fuzzy
msgid "Save"
@@@ -17368,7 -17368,7 +17656,11 @@@ msgstr "_Innstillinger
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Jump To Time"
msgstr "Hopp til: "
@@@ -17392,7 -17392,7 +17684,11 @@@ msgstr "
msgid "Backward"
msgstr "GÃ¥ tilbake"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -17402,7 -17402,7 +17698,11 @@@ msgstr "
msgid "Forward"
msgstr "Framover"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -17424,91 -17424,91 +17724,162 @@@ msgstr "_Fullskjerm
msgid "Click to enable fullscreen video playback."
msgstr "Slå av pauseskjermen under videoavspeling."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "Vel snøggtast for å stoppa avspelinga."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "Ã…pne Spilleliste"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "Gjenta:"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "Vel tast for å dempa lyden."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "Slett"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Effektar"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr "Forrige fil"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the next playlist item."
msgstr "VLC vil halda fram med å spela av det gjeldande spelelisteelementet."
++<<<<<<< HEAD
++=======
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -17551,7 -17551,7 +17922,11 @@@ msgstr "velg en utstrøm
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17760,8 -17760,8 +18135,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
#, fuzzy
msgid "Custom"
@@@ -17867,40 -17867,40 +18247,72 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "VLC mediespelar"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
++=======
+ #: modules/gui/macosx/intf.m:1877
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "No CrashLog found"
msgstr "_Innstillinger"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
#, fuzzy
msgid "Continue"
msgstr "tegn"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Remove old preferences?"
msgstr "Innstillinger"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -18070,7 -18070,7 +18482,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Lock Aspect Ratio"
msgstr "kildens bildeformat"
@@@ -18215,7 -18215,7 +18631,11 @@@ msgstr "Gøym VLC
msgid "Hide Others"
msgstr "Gøym andre"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Vis alle"
@@@ -18307,16 -18307,16 +18727,28 @@@ msgstr "&Synkronisering av spor
msgid "A→B Loop"
msgstr "A–B-sløyfe"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Avslutt etter avspeling"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Avslutt etter avspeling"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Step Forward"
msgstr "GÃ¥ tilbake"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Step Backward"
msgstr "GÃ¥ tilbake"
@@@ -18334,35 -18334,35 +18766,61 @@@ msgstr "LÃ¥gare lyd
msgid "Audio Device"
msgstr "lydenhet"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Half Size"
msgstr "Standard grensesnitt: "
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
++=======
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Normal Size"
msgstr "Standard grensesnitt: "
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
++=======
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Double Size"
msgstr "Standard grensesnitt: "
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
++=======
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Fit to Screen"
msgstr "Fullskjerm"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Float on Top"
msgstr "på"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Fullskjermsvideoeining"
@@@ -18371,7 -18371,7 +18829,11 @@@
msgid "Post processing"
msgstr "Etterprosessering"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Undertekstfil"
@@@ -18618,7 -18618,7 +19080,11 @@@ msgid "Play another media synchronously
msgstr "Spel eit anna medium synkront (ekstra lydfil e.l.)"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
#, fuzzy
msgid "Choose..."
@@@ -18814,7 -18814,7 +19280,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Teiknkoding for undertekstane"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Skriftstorleik"
@@@ -19072,12 -19072,12 +19542,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Innstillingar"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Reset All"
msgstr "Velg fil"
@@@ -19272,28 -19272,23 +19750,44 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Set avspelinga på pause"
+
+#: modules/gui/macosx/simple_prefs.m:377
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Default Encoding"
msgstr "Standard grensesnitt: "
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:378
++=======
+ #: modules/gui/macosx/simple_prefs.m:377
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Display Settings"
msgstr "Oppløsning"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
#, fuzzy
msgid "Font color"
msgstr "skrifttype"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
@@@ -19301,118 -19296,118 +19795,210 @@@
msgid "Font"
msgstr "skrifttype"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Velg Kapittel"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Velg Kapittel"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Enable OSD"
msgstr "skru på video"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Force bold"
msgstr "Bruk alltid monolyd"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "heltall"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Black screens in Fullscreen mode"
msgstr "Fullskjerm"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
#, fuzzy
msgid "Display"
msgstr "Spill"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Output module"
msgstr "Neste fil"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
++=======
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Video snapshots"
msgstr "XVimage chroma format"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
++=======
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Folder"
msgstr "Fil"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
++=======
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Format"
msgstr "Port"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
++=======
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Prefix"
msgstr "Forrige"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
#, fuzzy
msgid "Reset Preferences"
msgstr "Innstillinger"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -19425,39 -19420,39 +20011,69 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the folder to save your video snapshots to."
msgstr "Pause strøm"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
++=======
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose"
msgstr "Utforsk"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the directory or filename where the records will be stored."
msgstr "Du kan fastsette videoinnkoding her"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Invalid combination"
msgstr "Valg"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -21625,20 -21620,20 +22241,36 @@@ msgstr "Slett den valde profilen
msgid "Create a new profile"
msgstr "Opprett ein ny profil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Opprett"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Profilnamn manglar"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Profilnamn manglar"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Du må velja eit namn på profilen."
@@@ -25337,26 -25332,26 +25969,46 @@@ msgstr "Pause strøm
msgid "Overlays/Subtitles"
msgstr "_Teksting"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font family for the font you want to use"
msgstr "Filnamnet på skrifttypen du vil bruka"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:159
++=======
+ #: modules/text_renderer/freetype.c:158
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font file for the font you want to use"
msgstr "Filnamnet på skrifttypen du vil bruka"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
++=======
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font size in pixels"
msgstr "skrifttype"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
@@@ -25364,24 -25359,24 +26016,40 @@@
"font size."
msgstr "standard på."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "heltall"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr "på "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Standardfarge på tekst"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
#, fuzzy
msgid ""
@@@ -25391,13 -25386,13 +26059,21 @@@
"(red + green), #FFFFFF = white"
msgstr "på"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
#, fuzzy
msgid "Relative font size"
msgstr "Standard grensesnitt: "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
#, fuzzy
msgid ""
@@@ -25405,91 -25400,91 +26081,163 @@@
"video. If absolute font size is set, relative size will be overridden."
msgstr "standard på."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "GÃ¥ tilbake"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "GÃ¥ tilbake"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "heltall"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
++=======
+ #: modules/text_renderer/freetype.c:187
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow opacity"
msgstr "Forskyvning av skygge"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "Forskyvning av skygge"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
++=======
+ #: modules/text_renderer/freetype.c:189
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow angle"
msgstr "Forskyvning av skygge"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:191
++=======
+ #: modules/text_renderer/freetype.c:190
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow distance"
msgstr "Forskyvning av skygge"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Mindre"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Små"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Store"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Større"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
++=======
+ #: modules/text_renderer/freetype.c:196
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Use YUVP renderer"
msgstr "Standard grensesnitt: "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text renderer"
msgstr "Standard grensesnitt: "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:220
++=======
+ #: modules/text_renderer/freetype.c:219
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Freetype2 font renderer"
msgstr "Standard grensesnitt: "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/oc.po
index 2500301,6d769fa..26686c9
--- a/po/oc.po
+++ b/po/oc.po
@@@ -3,17 -3,16 +3,29 @@@
# This file is distributed under the same license as the VLC package.
#
# Translators:
++<<<<<<< HEAD
+# Cedric31 <cvalmary at yahoo.fr>, 2009,2013
+# gosgroc <gosgroc at gmail.com>, 2013
+# Laurent Jonqueres, 2006
+# Tòni Galhard <tony.gaillard at supinfo.com>,, 2009
++=======
+ # Cedric31 <cvalmary at yahoo.fr>, 2013
+ # Tòni Galhard <tony.gaillard at supinfo.com>,, 2009
+ # Laurent Jonqueres, 2006
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-12-04 19:32+0000\n"
+"Last-Translator: gosgroc <gosgroc at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-10-10 16:48+0000\n"
+ "Last-Translator: Cedric31 <cvalmary at yahoo.fr>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/vlc-"
"trans/language/oc/)\n"
"Language: oc\n"
@@@ -36,11 -35,11 +48,19 @@@ msgstr "
#: include/vlc_config_cat.h:33
msgid "VLC preferences"
++<<<<<<< HEAD
+msgstr "Preferéncias del VLC"
+
+#: include/vlc_config_cat.h:35
+msgid "Select \"Advanced Options\" to see all options."
+msgstr "Causissetz \"Opcions avançadas\" per veire totas las opcions."
++=======
+ msgstr "Preferéncias VLC"
+
+ #: include/vlc_config_cat.h:35
+ msgid "Select \"Advanced Options\" to see all options."
+ msgstr "Seleccionatz \"Opcions avançadas\" per veire totas las opcions."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:38 modules/gui/macosx/simple_prefs.m:269
#: modules/gui/qt4/components/simple_preferences.cpp:220
@@@ -89,15 -88,15 +109,27 @@@ msgstr "Paramètres dels acorchis
#: share/lua/http/dialogs/create_stream.html:150
#: modules/gui/qt4/ui/profiles.h:704 modules/gui/qt4/ui/profiles.h:735
msgid "Audio"
++<<<<<<< HEAD
+msgstr "Àudio"
+
+#: include/vlc_config_cat.h:54
+msgid "Audio settings"
+msgstr "Paramètres d'à udio"
+
+#: include/vlc_config_cat.h:56
+msgid "General audio settings"
+msgstr "Paramètres generals d'à udio"
++=======
+ msgstr "Àudio"
+
+ #: include/vlc_config_cat.h:54
+ msgid "Audio settings"
+ msgstr "Paramètres à udio"
+
+ #: include/vlc_config_cat.h:56
+ msgid "General audio settings"
+ msgstr "Paramètres à udio generals"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:58 include/vlc_config_cat.h:80
#: modules/gui/qt4/ui/profiles.h:733 modules/gui/qt4/ui/profiles.h:743
@@@ -116,7 -115,7 +148,11 @@@ msgstr "Visualizacions
#: include/vlc_config_cat.h:62 src/audio_output/output.c:284
#: src/libvlc-module.c:197
msgid "Audio visualizations"
++<<<<<<< HEAD
+msgstr "Visualizacions d'Ã udio"
++=======
+ msgstr "Visualizacion à udio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:64 include/vlc_config_cat.h:76
msgid "Output modules"
@@@ -124,7 -123,7 +160,11 @@@ msgstr "Sortidas dels moduls
#: include/vlc_config_cat.h:65
msgid "General settings for audio output modules."
++<<<<<<< HEAD
+msgstr "Paramètres generals pels moduls de sortida d'à udio."
++=======
+ msgstr "Paramètres generals pels moduls de sortida à udio."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:67 src/libvlc-module.c:1962
#: modules/gui/macosx/VideoEffects.m:85
@@@ -134,13 -133,13 +174,21 @@@ msgstr "Divèrs
#: include/vlc_config_cat.h:68
msgid "Miscellaneous audio settings and modules."
++<<<<<<< HEAD
+msgstr "Paramètres divèrses à udio e moduls."
++=======
+ msgstr "Paramètres divèrses à udio e moduls"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:71 src/input/es_out.c:2869 src/input/es_out.c:2951
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -158,11 -157,11 +206,19 @@@ msgstr "Paramètres vidèo
#: include/vlc_config_cat.h:74
msgid "General video settings"
++<<<<<<< HEAD
+msgstr "Paramètres generals de vidèo"
+
+#: include/vlc_config_cat.h:78
+msgid "Choose your preferred video output and configure it here."
+msgstr "Causir la vòstra sortida vidèo preferida e la configurar aquÃ."
++=======
+ msgstr "Paramètres vidèo"
+
+ #: include/vlc_config_cat.h:78
+ msgid "Choose your preferred video output and configure it here."
+ msgstr "Causir la vòstra sortida vidèo favorida e la configurar aquÃ."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:82
msgid "Video filters are used to process the video stream."
@@@ -217,7 -216,7 +273,11 @@@ msgstr "Demuxers*
#: include/vlc_config_cat.h:109
msgid "Demuxers are used to separate audio and video streams."
++<<<<<<< HEAD
+msgstr "Los demuxers son utilizats per desseparar los fluxes d'à udio e vidèo."
++=======
+ msgstr "Los demuxers son utilizats per desseparar los fluxes à udio e vidèo"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:111
msgid "Video codecs"
@@@ -225,17 -224,15 +285,29 @@@ msgstr "Codecs vidèo
#: include/vlc_config_cat.h:112
msgid "Settings for the video, images or video+audio decoders and encoders."
++<<<<<<< HEAD
+msgstr ""
+"Paramètres per los descodificadors e codificadors del vidèo, les images o el "
+"vidèo+à udio"
+
+#: include/vlc_config_cat.h:114
+msgid "Audio codecs"
+msgstr "Codècs d'à udio"
+
+#: include/vlc_config_cat.h:115
+msgid "Settings for the audio-only decoders and encoders."
+msgstr "Paramètres pels codificadors e descodificadors d'à udio."
++=======
+ msgstr "Paramètres per la codificacion vidèo"
+
+ #: include/vlc_config_cat.h:114
+ msgid "Audio codecs"
+ msgstr "Codecs à udio"
+
+ #: include/vlc_config_cat.h:115
+ msgid "Settings for the audio-only decoders and encoders."
+ msgstr "Paramètres per la codificacion à udio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:117
msgid "Subtitle codecs"
@@@ -247,7 -244,7 +319,11 @@@ msgstr "Paramètres per la codificacio
#: include/vlc_config_cat.h:120
msgid "General input settings. Use with care..."
++<<<<<<< HEAD
+msgstr "Paramètres generals d'intrada. D'utilizar amb precaucions..."
++=======
+ msgstr "Paramètres generals d'intrada. D'utilizar amb precaucions."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:123 src/libvlc-module.c:1897
#: modules/access/avio.h:56
@@@ -288,7 -285,7 +364,11 @@@ msgid "
"You can also set default parameters for each muxer."
msgstr ""
"Los Muxers crèan los formats d'encapsulacion que son utilizats pels fluxes "
++<<<<<<< HEAD
+"elementals (vidèo, à udio ...) ensemble. Aqueste reglatges permeton "
++=======
+ "elementals (video, audio, ...) ensemble. Aqueste reglatges permeton "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"d'utilizar un muxer especific. Saique devètz pas far aquò.\n"
"Tanben podètz cambiar los paramètres per cada muxer."
@@@ -440,7 -437,7 +520,11 @@@ msgstr "Dobrir un &repertòri...
#: include/vlc_intf_strings.h:50
msgid "Select one or more files to open"
++<<<<<<< HEAD
+msgstr "Causissetz un or mai fichièrs de dobrir"
++=======
+ msgstr "Causir un or mai fichièrs de dobrir"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:51
msgid "Select Directory"
@@@ -448,11 -445,11 +532,19 @@@ msgstr "Causir un repertòri
#: include/vlc_intf_strings.h:51
msgid "Select Folder"
++<<<<<<< HEAD
+msgstr "Causir lo dorsièr"
+
+#: include/vlc_intf_strings.h:55
+msgid "Media &Information"
+msgstr "&Informacion del fichièr multimèdia"
++=======
+ msgstr ""
+
+ #: include/vlc_intf_strings.h:55
+ msgid "Media &Information"
+ msgstr "Informacion del mèdia"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:56
msgid "&Codec Information"
@@@ -479,10 -476,10 +571,17 @@@ msgid "&About
msgstr "&A prepaus"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -490,7 -487,7 +589,11 @@@ msgstr "Legir
#: include/vlc_intf_strings.h:66
msgid "Remove Selected"
++<<<<<<< HEAD
+msgstr "Suprimir lo causits"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:67
msgid "Information..."
@@@ -498,11 -495,11 +601,19 @@@ msgstr "Informacion...
#: include/vlc_intf_strings.h:68
msgid "Create Directory..."
++<<<<<<< HEAD
+msgstr "Crear un repertòri"
+
+#: include/vlc_intf_strings.h:69
+msgid "Create Folder..."
+msgstr "Crear un dorsièr..."
++=======
+ msgstr ""
+
+ #: include/vlc_intf_strings.h:69
+ msgid "Create Folder..."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:70
msgid "Show Containing Directory..."
@@@ -521,17 -518,17 +632,29 @@@ msgid "Save...
msgstr "Salvar..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Tot repetir"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Repetir un còp"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -547,7 -544,7 +670,11 @@@ msgstr "Apondre a lista de lectura
#: include/vlc_intf_strings.h:83
msgid "Add File..."
++<<<<<<< HEAD
+msgstr "Apondre fichièr..."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:84
msgid "Add Directory..."
@@@ -599,37 -596,10 +726,44 @@@ msgid "
"code. You can also give funds and material to help us. And of course, you "
"can <b>promote</b> VLC media player.</p></body></html>"
msgstr ""
++<<<<<<< HEAD
+"<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; "
+"charset=utf-8\" /></head><body><h2>Benvenguda dins l'ajuda de VLC media "
+"player</h2><h3>Documentacion</h3><p>Podètz trobar la documentacion de VLC a "
+"prepaus dins lo sit <a href=\"http://wiki.videolan.org\">wiki</a> de "
+"VideoLAN.</p><p>Sètz novelari amb lo logicial VLC media player, mercé de "
+"legir l'<br><a href=\"http://wiki.videolan.org/Documentation:VLC_for_dummies"
+"\"><em>Introduccion a VLC media player</em></a>.</p><p>Anatz trobar qualques "
+"informacions a prepaus de l'utilizacion dellector dins <br>\"<a href="
+"\"http://wiki.videolan.org/Documentation:Play_HowTo\"><em>Cossà legir los "
+"fichièrs amb VLC media player.</em></a>\"</p><p>Pel salvar, convertir, "
+"transcoding*, encodatge, muxing* e las prètzfaches de streaming, devètz "
+"trobar las informacions utilas dins la <a href=\"http://wiki.videolan.org/"
+"Documentation:Streaming_HowTo\">Documentacion del streaming*</a>.</p><p>Se "
+"sètz pas segur a prepaus de la terminologia, mercé de consultar la <a href="
+"\"http://wiki.videolan.org/Knowledge_Base\">basa de coneissença</a>.</"
+"p><p>Per comprene los acorchis al clavièr, cal legir la pagina a prepaus de "
+"las <a href=\"http://wiki.videolan.org/Hotkeys\">acorchis</a>.</p><h3>Ajuda</"
+"h3><p>Abans de demandar quicòm, mercé d'agachar las questions que son las "
+"mai demandas : <a href=\"http://www.videolan.org/support/faq.html\"> QMD</a>."
+"</p><p>Tanben podètz aver (e donar) de l'ajuda suls <a href=\"http://forum."
+"videolan.org\">Foroms</a>, las <a href=\"http://www.videolan.org/vlc/lists."
+"html\">listas de corrièr</a> o sul canal IRC (<em>#videolan</em> sus irc."
+"freenode.net).</p><h3>Participar al projècte</h3><p>Podètz ajudar lo "
+"projècte VideoLAN ne donant de son temps per ajudar la comunautat, lo "
+"design* skins*, traduire la documentacion, testar e codar. Podètz nos donar "
+"un pauc d'argent o de material per nos ajudar. E de segur podètz "
+"<b>promòure</b> VLC media player.</p></body></html>"
+
+#: src/audio_output/filters.c:247
+msgid "Audio filtering failed"
+msgstr "Lo filtratge d'Ã udio a pas capitat"
++=======
+
+ #: src/audio_output/filters.c:247
+ msgid "Audio filtering failed"
+ msgstr "Filtres audio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/audio_output/filters.c:248
#, c-format
@@@ -638,7 -608,7 +772,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Desactivat"
@@@ -665,7 -635,7 +803,11 @@@ msgstr "Egalizador
#: src/audio_output/output.c:279 src/libvlc-module.c:192
msgid "Audio filters"
++<<<<<<< HEAD
+msgstr "Filtres d'Ã udio"
++=======
+ msgstr "Filtres audio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/audio_output/output.c:290
msgid "Replay gain"
@@@ -1165,7 -1135,7 +1307,11 @@@ msgid "
"VLC does not support the audio or video format \"%4.4s\". Unfortunately "
"there is no way for you to fix this."
msgstr ""
++<<<<<<< HEAD
+"VLC suporta pas lo format à udio o vidèo \"%4.4s\". Malurosament es pas "
++=======
+ "VLC suporta pas lo format audio o video \"%4.4s\". Malurosament es pas "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"possible de cambiar aquò."
#: src/input/es_out.c:922 src/input/es_out.c:927 src/libvlc-module.c:230
@@@ -1303,20 -1273,20 +1449,36 @@@ msgstr "Taus d'imatge
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Vòstra intrada pòt pas èsser dobèrta"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Vòstra intrada pòt pas èsser dobèrta"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC pòt pas dobrir lo MRL '%s'. Agachatz l'istoric pels detalhs."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC pòt pas reconéisser lo format d'intrada"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC pòt pas reconéisser lo format d'intrada"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1420,7 -1390,7 +1582,11 @@@ msgstr "Pista Vidèo
#: src/input/var.c:205 modules/gui/macosx/MainMenu.m:381
#: modules/gui/macosx/MainMenu.m:382
msgid "Audio Track"
++<<<<<<< HEAD
+msgstr "Pista d'Ã udio"
++=======
+ msgstr "Pista à udio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/var.c:210
msgid "Subtitle Track"
@@@ -1628,20 -1598,20 +1794,33 @@@ msgstr "
#: src/libvlc-module.c:127
msgid "Audio output module"
++<<<<<<< HEAD
+msgstr "Modul de sortida d'Ã udio"
++=======
+ msgstr "Sortida audio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:129
msgid ""
"This is the audio output method used by VLC. The default behavior is to "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+"Es lo metòde utilizat per la sortida d'à udio per VLC. Lo melhor es causit "
+"automaticament per defaut."
++=======
+ "Es lo metòde utilizat per la sortida audio per VLC. Lo melhor es causit per "
+ "defaut."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:133 modules/gui/macosx/simple_prefs.m:310
#: modules/stream_out/display.c:40 modules/gui/qt4/ui/sprefs_audio.h:412
msgid "Enable audio"
++<<<<<<< HEAD
+msgstr "Activar l'Ã udio"
++=======
+ msgstr "Activar audio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:135
msgid ""
@@@ -1732,7 -1702,7 +1911,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1817,10 -1787,10 +2000,17 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+#: share/lua/http/dialogs/create_stream.html:196
+msgid "None"
+msgstr "Pas cap"
++=======
+ #: modules/text_renderer/freetype.c:214
+ #: share/lua/http/dialogs/create_stream.html:196
+ msgid "None"
+ msgstr "Cap"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:238
msgid ""
@@@ -1845,7 -1815,7 +2035,11 @@@ msgid "
"automatically select the best method available."
msgstr "Aquò's lo metòde utilizat per VLC. Per defaut lo melhor es causit."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Activar la video"
@@@ -2043,9 -2013,11 +2237,17 @@@ msgid "
"Overlay is the hardware acceleration capability of your video card (ability "
"to render video directly). VLC will try to use it by default."
msgstr ""
++<<<<<<< HEAD
+
+#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ "Overlay is the hardware acceleration capability of your video card (ability "
+ "*to render video directly). VLC will try to use it by default.*"
+
+ #: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Totjorn davant"
@@@ -2098,7 -2070,7 +2300,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2107,7 -2079,7 +2313,11 @@@ msgstr "Desentreleçar
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2165,7 -2137,7 +2375,11 @@@ msgstr "
"Desactivar lo mòde estalvida d'energia per que l'ordenador s'arresta pas a "
"causa d'una inactivitat."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Decoracions de la fenèstra"
@@@ -2351,7 -2323,7 +2565,11 @@@ msgstr "
"(1:1). Se avètz un ecran 16:9, auriatz benlèu besonh de cambiar aquò en 4:3 "
"per aver un aspècte normal."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Passar los frames"
@@@ -2491,12 -2463,12 +2709,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2504,7 -2476,7 +2731,11 @@@ msgid "Default
msgstr "Defaut"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2568,7 -2540,7 +2799,11 @@@ msgstr "
#: src/libvlc-module.c:578 modules/gui/qt4/ui/open_disk.h:312
msgid "Audio track"
++<<<<<<< HEAD
+msgstr "Pista d'Ã udio"
++=======
+ msgstr "Pista à udio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:580
msgid "Stream number of the audio track to use (from 0 to n)."
@@@ -2621,7 -2593,7 +2856,11 @@@ msgstr "ID del flux o de la pista del s
#: src/libvlc-module.c:607
msgid "Preferred video resolution"
++<<<<<<< HEAD
+msgstr "Resolucion del vidèo preferida"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:609
msgid ""
@@@ -2818,7 -2790,7 +3057,11 @@@ msgid "You can completely disable the s
msgstr "Podètz desactivar del tot los sos-imatges."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3165,7 -3137,7 +3408,11 @@@ msgstr "
#: src/libvlc-module.c:896
msgid "Preferred decoders list"
++<<<<<<< HEAD
+msgstr "Lista dels descodificadors preferits"
++=======
+ msgstr "Lista dels descodadors preferits"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:898
msgid ""
@@@ -3180,7 -3152,7 +3427,11 @@@ msgstr "
#: src/libvlc-module.c:903
msgid "Preferred encoders list"
++<<<<<<< HEAD
+msgstr "Lista dels codificadors preferits"
++=======
+ msgstr "Lista dels encoders* preferits"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:905
msgid ""
@@@ -3663,19 -3635,18 +3914,31 @@@ msgstr "
#: src/libvlc-module.c:1166
msgid "Use media library"
++<<<<<<< HEAD
+msgstr "Utilizar la bibliotèca multimèdia"
++=======
+ msgstr "Utilizar la librariá de mèdia"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1168
msgid ""
"The media library is automatically saved and reloaded each time you start "
"VLC."
msgstr ""
++<<<<<<< HEAD
+"La bibliotèca multimèdia es enregistrada e tornada cargar cada còp que "
+"lançatz VLC."
+
+#: src/libvlc-module.c:1171
+msgid "Load Media Library"
+msgstr "Cargar la bibliotèca multimèdia"
++=======
+ "La librariá es enregistrada e tornada cargar cada còp que lançatz VLC."
+
+ #: src/libvlc-module.c:1171
+ msgid "Load Media Library"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1173
msgid "Enable this option to load the SQL-based Media Library at VLC startup"
@@@ -3697,7 -3668,7 +3960,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "Aquestes reglatges sont nomenats \"acorchis\" (hotkeys)."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignorar"
@@@ -3721,8 -3692,8 +3988,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3747,7 -3718,7 +4019,11 @@@ msgstr "Lectura/Pausa
#: src/libvlc-module.c:1208
msgid "Select the hotkey to use to swap paused state."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per far \"pausa/lectura\"."
++=======
+ msgstr "Causissètz l'acorchi per far \"pausa/lectura\"."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1209
msgid "Pause only"
@@@ -3755,7 -3726,7 +4031,11 @@@ msgstr "Solament pausa
#: src/libvlc-module.c:1210
msgid "Select the hotkey to use to pause."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per far pausa."
++=======
+ msgstr "Causissètz l'acorchi per far pausa."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1211
msgid "Play only"
@@@ -3763,7 -3734,7 +4043,11 @@@ msgstr "Solament lectura
#: src/libvlc-module.c:1212
msgid "Select the hotkey to use to play."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per far lectura."
++=======
+ msgstr "Causissètz l'acorchi per far lectura."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1213 modules/gui/macosx/MainMenu.m:358
#: modules/gui/qt4/components/controller.hpp:116
@@@ -3773,7 -3744,7 +4057,11 @@@ msgstr "Mai lèu
#: src/libvlc-module.c:1214 src/libvlc-module.c:1220
msgid "Select the hotkey to use for fast forward playback."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per legir mai lèu."
++=======
+ msgstr "Causissètz l'acorchi per legir mai lèu."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1215 modules/gui/macosx/MainMenu.m:356
#: modules/gui/qt4/components/controller.hpp:116
@@@ -3783,7 -3754,7 +4071,11 @@@ msgstr "Mai lentament
#: src/libvlc-module.c:1216 src/libvlc-module.c:1222
msgid "Select the hotkey to use for slow motion playback."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per legir mai lentament."
++=======
+ msgstr "Causissètz l'acorchi per legir mai lentament."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1217
msgid "Normal rate"
@@@ -3791,7 -3762,7 +4083,11 @@@ msgstr "Talha normale
#: src/libvlc-module.c:1218
msgid "Select the hotkey to set the playback rate back to normal."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per aver un imatge de talha normala."
++=======
+ msgstr "Causissètz l'acorchi per aver un imatge de talha normala."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1219 modules/gui/qt4/menus.cpp:864
msgid "Faster (fine)"
@@@ -3802,10 -3773,10 +4098,17 @@@ msgid "Slower (fine)
msgstr "Mai lentament (prim)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3816,13 -3787,13 +4119,23 @@@ msgstr "Seguent
#: src/libvlc-module.c:1224
msgid "Select the hotkey to use to skip to the next item in the playlist."
msgstr ""
++<<<<<<< HEAD
+"Causissetz l'acorchi per anar a l'element seguent de la lista de lectura."
+
+#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ "Causissètz l'acorchi per anar a l'element seguent de la lista de lectura."
+
+ #: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Precedent"
@@@ -3830,11 -3801,11 +4143,19 @@@
#: src/libvlc-module.c:1226
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+"Causissetz l'acorchi per anar a l'element precedent de la lista de lectura."
+
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ "Causissètz l'acorchi per anar a l'element precedent de la lista de lectura."
+
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3842,7 -3813,7 +4163,11 @@@ msgstr "Arrestar
#: src/libvlc-module.c:1228
msgid "Select the hotkey to stop playback."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per arrestar."
++=======
+ msgstr "Causissètz l'acorchi per arrestar."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1229 modules/gui/macosx/bookmarks.m:99
#: modules/gui/macosx/bookmarks.m:108 modules/gui/macosx/ControlsBar.m:64
@@@ -3855,7 -3826,7 +4180,11 @@@ msgstr "Posicion
#: src/libvlc-module.c:1230
msgid "Select the hotkey to display the position."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per mostrar la posicion."
++=======
+ msgstr "Causissètz l'acorchi per mostrar la posicion."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1232
msgid "Very short backwards jump"
@@@ -3863,7 -3834,7 +4192,11 @@@ msgstr "Fòrça pichon saut enarrièr
#: src/libvlc-module.c:1234
msgid "Select the hotkey to make a very short backwards jump."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per far un fòrça pichon saut enarrièr."
++=======
+ msgstr "Causissètz l'acorchi per far un fòrça pichon saut enarrièr."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1235
msgid "Short backwards jump"
@@@ -3871,7 -3842,7 +4204,11 @@@ msgstr "Pichon saut enarrièr
#: src/libvlc-module.c:1237
msgid "Select the hotkey to make a short backwards jump."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per far un pichon saut en abans."
++=======
+ msgstr "Causissètz l'acorchi per far un pichon saut en abans."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1238
msgid "Medium backwards jump"
@@@ -3879,7 -3850,7 +4216,11 @@@ msgstr "Saut mejan enarrièr
#: src/libvlc-module.c:1240
msgid "Select the hotkey to make a medium backwards jump."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per far un saut mejan enarrièr."
++=======
+ msgstr "Causissètz l'acorchi per far un saut mejan enarrièr."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1241
msgid "Long backwards jump"
@@@ -3887,7 -3858,7 +4228,11 @@@ msgstr "Saut long enarrièr
#: src/libvlc-module.c:1243
msgid "Select the hotkey to make a long backwards jump."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per far un long saut enarrièr."
++=======
+ msgstr "Causissètz l'acorchi per far un long saut enarrièr."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1245
msgid "Very short forward jump"
@@@ -3895,7 -3866,7 +4240,11 @@@ msgstr "Fòrça pichon saut enarrièr
#: src/libvlc-module.c:1247
msgid "Select the hotkey to make a very short forward jump."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per far un fòrça pichon saut enarrièr."
++=======
+ msgstr "Causissètz l'acorchi per far un fòrça pichon saut enarrièr."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1248
msgid "Short forward jump"
@@@ -3903,7 -3874,7 +4252,11 @@@ msgstr "Pichon saut en abans
#: src/libvlc-module.c:1250
msgid "Select the hotkey to make a short forward jump."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per far un pichon saut en abans"
++=======
+ msgstr "Causissètz l'acorchi per far un pichon saut en abans"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1251
msgid "Medium forward jump"
@@@ -3911,7 -3882,7 +4264,11 @@@ msgstr "Saut mejan en abans
#: src/libvlc-module.c:1253
msgid "Select the hotkey to make a medium forward jump."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per far un saut mejan en abans."
++=======
+ msgstr "Causissètz l'acorchi per far un saut mejan en abans."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1254
msgid "Long forward jump"
@@@ -3919,7 -3890,7 +4276,11 @@@ msgstr "Long saut en abans
#: src/libvlc-module.c:1256
msgid "Select the hotkey to make a long forward jump."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per far un long en abans."
++=======
+ msgstr "Causissètz l'acorchi per far un long en abans."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1257 modules/control/hotkeys.c:402
msgid "Next frame"
@@@ -3927,7 -3898,7 +4288,11 @@@ msgstr "Imatge seguent
#: src/libvlc-module.c:1259
msgid "Select the hotkey to got to the next video frame."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per anar a l'imatge seguent."
++=======
+ msgstr "Causissètz l'acorchi per anar a l'imatge seguent."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1261
msgid "Very short jump length"
@@@ -3970,7 -3941,7 +4335,11 @@@ msgstr "Sortir
#: src/libvlc-module.c:1271
msgid "Select the hotkey to quit the application."
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per sortir del programa."
++=======
+ msgstr "Causissètz l'acorchi per sortir del programa."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1272
msgid "Navigate up"
@@@ -3979,7 -3950,7 +4348,11 @@@ msgstr "Navegar vèrs lo naut
#: src/libvlc-module.c:1273
msgid "Select the key to move the selector up in DVD menus."
msgstr ""
++<<<<<<< HEAD
+"Causissetz l'acorchi per navegar vèrs lo naut dins los menuts dels DVDs."
++=======
+ "Causissètz l'acorchi per navegar vèrs lo naut dins los menuts dels DVDs."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1274
msgid "Navigate down"
@@@ -3988,7 -3959,7 +4361,11 @@@ msgstr "Navegar vèrs lo bas
#: src/libvlc-module.c:1275
msgid "Select the key to move the selector down in DVD menus."
msgstr ""
++<<<<<<< HEAD
+"Causissetz l'acorchi per navegar vèrs lo bas dins los menuts dels DVDs."
++=======
+ "Causissètz l'acorchi per navegar vèrs lo bas dins los menuts dels DVDs."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1276
msgid "Navigate left"
@@@ -3997,7 -3968,7 +4374,11 @@@ msgstr "Navegar vèrs l'esquèrra
#: src/libvlc-module.c:1277
msgid "Select the key to move the selector left in DVD menus."
msgstr ""
++<<<<<<< HEAD
+"Causissetz l'acorchi per navegar vèrs l'esquèrra dins los menuts dels DVDs."
++=======
+ "Causissètz l'acorchi per navegar vèrs l'esquèrra dins los menuts dels DVDs."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1278
msgid "Navigate right"
@@@ -4006,7 -3977,7 +4387,11 @@@ msgstr "Navegar vèrs la drecha
#: src/libvlc-module.c:1279
msgid "Select the key to move the selector right in DVD menus."
msgstr ""
++<<<<<<< HEAD
+"Causissetz l'acorchi per navegar vèrs la drecha dins los menuts dels DVDs."
++=======
+ "Causissètz l'acorchi per navegar vèrs la drecha dins los menuts dels DVDs."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1280
msgid "Activate"
@@@ -4015,7 -3986,7 +4400,11 @@@ msgstr "Activar
#: src/libvlc-module.c:1281
msgid "Select the key to activate selected item in DVD menus."
msgstr ""
++<<<<<<< HEAD
+"Causissetz l'acorchi per activar l'element seleccionat dins los menuts dels "
++=======
+ "Causissètz l'acorchi per activar l'element seleccionat dins los menuts dels "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"DVD."
#: src/libvlc-module.c:1282 modules/gui/qt4/dialogs/toolbar.cpp:397
@@@ -4024,7 -3995,7 +4413,11 @@@ msgstr "Anar al menut del DVD
#: src/libvlc-module.c:1283
msgid "Select the key to take you to the DVD menu"
++<<<<<<< HEAD
+msgstr "Causissetz l'acorchi per anar al menut del DVD."
++=======
+ msgstr "Causissètz l'acorchi per anar al menut del DVD."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1284
msgid "Select previous DVD title"
@@@ -4075,9 -4046,9 +4468,15 @@@ msgid "Select the key to decrease audi
msgstr "Causissètz l'acorchi per baissar lo volum."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Copar lo son"
@@@ -4491,7 -4462,7 +4890,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Captura d'ecran"
@@@ -4532,7 -4503,7 +4935,11 @@@ msgstr "Periferic per defaut
#: src/libvlc-module.c:1739
msgid "Network settings"
++<<<<<<< HEAD
+msgstr "Paramètres del ret"
++=======
+ msgstr "Paramètres del Ret"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1764
msgid "Socks proxy"
@@@ -4544,7 -4515,7 +4951,11 @@@ msgstr "Metadonadas
#: src/libvlc-module.c:1872
msgid "Decoders"
++<<<<<<< HEAD
+msgstr "Descodificadors"
++=======
+ msgstr "Descodadors"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1879 modules/access/avio.h:46
#: modules/access/v4l2/v4l2.c:59 modules/gui/macosx/playlistinfo.m:96
@@@ -4561,7 -4532,7 +4972,11 @@@ msgstr "Moduls especials
#: src/libvlc-module.c:1966 modules/gui/qt4/dialogs/plugins.cpp:70
msgid "Plugins"
++<<<<<<< HEAD
+msgstr "Empeutons"
++=======
+ msgstr "Ajustons"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1972
msgid "Performance options"
@@@ -4661,12 -4632,12 +5076,20 @@@ msgstr "%ld B
#: src/misc/update.c:566
msgid "Saving file failed"
++<<<<<<< HEAD
+msgstr "La salvagarda del fichièr a pas capitat"
++=======
+ msgstr "Salvagarda del fichièr pas capitada."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/misc/update.c:567
#, c-format
msgid "Failed to open \"%s\" for writing"
++<<<<<<< HEAD
+msgstr "La dobertura de \"%s\" per escriure endedins a pas capitat"
++=======
+ msgstr "Impossible d'obrir \"%s\" per escriure endedins"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/misc/update.c:580
#, c-format
@@@ -4693,12 -4664,12 +5116,21 @@@ msgstr "Telecargament ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Anullar"
@@@ -4765,13 -4736,13 +5197,21 @@@ msgstr "
#: src/misc/update.c:712
msgid "Install"
++<<<<<<< HEAD
+msgstr "Installar"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/playlist/engine.c:269 src/playlist/loadsave.c:152 lib/media_list.c:252
#: modules/gui/macosx/MainWindow.m:222
#: modules/gui/qt4/components/playlist/selector.cpp:238
msgid "Media Library"
++<<<<<<< HEAD
+msgstr "Bibliotèca multimèdia"
++=======
+ msgstr "Librariá de mèdia"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/playlist/tree.c:67 modules/access/dtv/access.c:75
#: modules/access/v4l2/v4l2.c:242
@@@ -4916,7 -4887,7 +5356,11 @@@ msgstr "Anglés
#: src/text/iso-639_def.h:74
msgid "Esperanto"
++<<<<<<< HEAD
+msgstr "Esperanto"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:75
msgid "Estonian"
@@@ -4968,7 -4939,7 +5412,11 @@@ msgstr "Manx
#: src/text/iso-639_def.h:87
msgid "Greek, Modern"
++<<<<<<< HEAD
+msgstr "Grèc modèrn"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:88
msgid "Guarani"
@@@ -5008,7 -4979,7 +5456,11 @@@ msgstr "Esquimés
#: src/text/iso-639_def.h:97
msgid "Interlingue"
++<<<<<<< HEAD
+msgstr "Interlingua"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:98
msgid "Interlingua"
@@@ -5036,7 -5007,7 +5488,11 @@@ msgstr "Japonés
#: src/text/iso-639_def.h:104
msgid "Greenlandic, Kalaallisut"
++<<<<<<< HEAD
+msgstr "Groenlandés, kalaallisut "
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:105
msgid "Kannada"
@@@ -5048,7 -5019,7 +5504,11 @@@ msgstr "Cashmiri
#: src/text/iso-639_def.h:107
msgid "Kazakh"
++<<<<<<< HEAD
+msgstr "Kasakh"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:108
msgid "Khmer"
@@@ -5144,7 -5115,7 +5604,11 @@@ msgstr "Moldau
#: src/text/iso-639_def.h:131
msgid "Mongolian"
++<<<<<<< HEAD
+msgstr "Mongòl"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:132
msgid "Nauru"
@@@ -5188,7 -5159,7 +5652,11 @@@ msgstr "Chichewa; Nyanja
#: src/text/iso-639_def.h:142
msgid "Occitan; Provençal"
++<<<<<<< HEAD
+msgstr "Occitan"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:143
msgid "Oriya"
@@@ -5208,7 -5179,7 +5676,11 @@@ msgstr "Penjabenc
#: src/text/iso-639_def.h:148
msgid "Persian"
++<<<<<<< HEAD
+msgstr "Persan"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:149
msgid "Pali"
@@@ -5220,7 -5191,7 +5692,11 @@@ msgstr "Polonés
#: src/text/iso-639_def.h:151
msgid "Portuguese"
++<<<<<<< HEAD
+msgstr "Portugués"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:152
msgid "Pushto"
@@@ -5232,7 -5203,7 +5708,11 @@@ msgstr "QuÃchoa
#: src/text/iso-639_def.h:154
msgid "Original audio"
++<<<<<<< HEAD
+msgstr "Àudio original"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:155
msgid "Raeto-Romance"
@@@ -5248,7 -5219,7 +5728,11 @@@ msgstr "Kirondi
#: src/text/iso-639_def.h:158
msgid "Russian"
++<<<<<<< HEAD
+msgstr "Rus"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:159
msgid "Sango"
@@@ -5256,7 -5227,7 +5740,11 @@@ msgstr "Sangho
#: src/text/iso-639_def.h:160
msgid "Sanskrit"
++<<<<<<< HEAD
+msgstr "Sanscrit"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:161
msgid "Serbian"
@@@ -5392,7 -5363,7 +5880,11 @@@ msgstr "Oigor
#: src/text/iso-639_def.h:194
msgid "Ukrainian"
++<<<<<<< HEAD
+msgstr "Ucrainés"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:195
msgid "Urdu"
@@@ -5404,7 -5375,7 +5896,11 @@@ msgstr "Ozbèc
#: src/text/iso-639_def.h:197
msgid "Vietnamese"
++<<<<<<< HEAD
+msgstr "Vietnamian "
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:198
msgid "Volapuk"
@@@ -5456,7 -5427,7 +5952,11 @@@ msgstr "Talh
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Proporcion"
@@@ -5524,11 -5495,11 +6024,19 @@@ msgstr "
#: modules/access/alsa.c:57
msgid "ALSA audio capture"
++<<<<<<< HEAD
+msgstr "Captura d'Ã udio ALSA"
+
+#: modules/access/attachment.c:44
+msgid "Attachment"
+msgstr "Adjoncion"
++=======
+ msgstr ""
+
+ #: modules/access/attachment.c:44
+ msgid "Attachment"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/attachment.c:45
msgid "Attachment input"
@@@ -5599,7 -5570,7 +6107,11 @@@ msgstr "
#: modules/access/bluray.c:287
msgid "AACS MMC failed."
++<<<<<<< HEAD
+msgstr "AACS MMC a pas capitat."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:293
msgid "Your system AACS decoding library does not work. Missing keys?"
@@@ -5814,7 -5785,7 +6326,11 @@@ msgstr "
#: modules/gui/qt4/components/open_panels.cpp:812
#: modules/gui/qt4/components/open_panels.cpp:1033
msgid "Audio device name"
++<<<<<<< HEAD
+msgstr "Nom del dispositiu d'Ã udio"
++=======
+ msgstr "Nom Dispositiu Audio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:137
msgid ""
@@@ -6003,7 -5974,7 +6519,11 @@@ msgstr "Configurar
#: modules/access/dshow/dshow.cpp:527 modules/access/dshow/dshow.cpp:601
#: modules/access/dshow/dshow.cpp:1048 modules/access/dshow/dshow.cpp:1101
msgid "Capture failed"
++<<<<<<< HEAD
+msgstr "La captura a pas capitat"
++=======
+ msgstr "Captura pas capitada"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:528
msgid "No video or audio device selected."
@@@ -6233,11 -6204,11 +6753,19 @@@ msgstr "
#: modules/access/dtv/access.c:161
msgid "0.20"
++<<<<<<< HEAD
+msgstr "0,20"
+
+#: modules/access/dtv/access.c:161
+msgid "0.25"
+msgstr "0,25"
++=======
+ msgstr ""
+
+ #: modules/access/dtv/access.c:161
+ msgid "0.25"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:164
msgid "Transport stream ID"
@@@ -6351,7 -6322,7 +6879,11 @@@ msgstr "
#: modules/access/dtv/access.c:218
msgid "Network identifier"
++<<<<<<< HEAD
+msgstr "Identificator de ret"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:219
msgid "Satellite azimuth"
@@@ -7167,7 -7138,7 +7699,11 @@@ msgstr "
#: modules/access/oss.c:66
msgid "Capture the audio stream in stereo."
++<<<<<<< HEAD
+msgstr "Capturar lo flux d'à udio en esterèo."
++=======
+ msgstr "Capturar lo flux à udio en esterèo."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/oss.c:67 modules/access_output/shout.c:95
#: modules/gui/macosx/ConvertAndSave.m:190
@@@ -7503,19 -7474,19 +8039,35 @@@ msgstr "
#: modules/access/qtcapture.m:43
msgid "Video Capture width"
++<<<<<<< HEAD
+msgstr "Largor de la captura de vidèo"
+
+#: modules/access/qtcapture.m:44
+msgid "Video Capture width in pixel"
+msgstr "Largor de la captura de vidèo en pixèls"
+
+#: modules/access/qtcapture.m:45
+msgid "Video Capture height"
+msgstr "Nautor de la captura de vidèo"
+
+#: modules/access/qtcapture.m:46
+msgid "Video Capture height in pixel"
+msgstr "Nautor de la captura de vidèo en pixèls"
++=======
+ msgstr ""
+
+ #: modules/access/qtcapture.m:44
+ msgid "Video Capture width in pixel"
+ msgstr ""
+
+ #: modules/access/qtcapture.m:45
+ msgid "Video Capture height"
+ msgstr ""
+
+ #: modules/access/qtcapture.m:46
+ msgid "Video Capture height in pixel"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/qtcapture.m:60 modules/access/qtcapture.m:61
msgid "Quicktime Capture"
@@@ -7664,7 -7635,7 +8216,11 @@@ msgstr "
#: modules/access/rtsp/access.c:86
msgid "Connection failed"
++<<<<<<< HEAD
+msgstr "La connexion a pas capitat"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/rtsp/access.c:87
#, c-format
@@@ -7673,7 -7644,7 +8229,11 @@@ msgstr "VLC pòt pas se connectar a \"%
#: modules/access/rtsp/access.c:228
msgid "Session failed"
++<<<<<<< HEAD
+msgstr "La session a pas capitat"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/rtsp/access.c:229
msgid "The requested RTSP session could not be established."
@@@ -7708,11 -7679,11 +8268,19 @@@ msgstr "
#: modules/access/screen/screen.c:62 modules/gui/macosx/open.m:214
msgid "Subscreen width"
++<<<<<<< HEAD
+msgstr "Longor del sosecran"
+
+#: modules/access/screen/screen.c:64 modules/gui/macosx/open.m:215
+msgid "Subscreen height"
+msgstr "Nautor del sosecran"
++=======
+ msgstr ""
+
+ #: modules/access/screen/screen.c:64 modules/gui/macosx/open.m:215
+ msgid "Subscreen height"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/screen/screen.c:66 modules/access/screen/xcb.c:58
#: modules/gui/macosx/open.m:216
@@@ -7755,7 -7726,7 +8323,11 @@@ msgstr "Dintrada ecran
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Ecran"
@@@ -7889,19 -7860,19 +8461,35 @@@ msgstr "
#: modules/access/shm.c:75
msgid "15 bits"
++<<<<<<< HEAD
+msgstr "15 bits"
+
+#: modules/access/shm.c:75 modules/access/vnc.c:68
+msgid "16 bits"
+msgstr "16 bits"
+
+#: modules/access/shm.c:75 modules/access/vnc.c:68
+msgid "24 bits"
+msgstr "24 bits"
+
+#: modules/access/shm.c:75 modules/access/vnc.c:68
+msgid "32 bits"
+msgstr "32 bits"
++=======
+ msgstr ""
+
+ #: modules/access/shm.c:75 modules/access/vnc.c:68
+ msgid "16 bits"
+ msgstr ""
+
+ #: modules/access/shm.c:75 modules/access/vnc.c:68
+ msgid "24 bits"
+ msgstr ""
+
+ #: modules/access/shm.c:75 modules/access/vnc.c:68
+ msgid "32 bits"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/shm.c:82
msgid "Framebuffer input"
@@@ -7965,11 -7936,11 +8553,19 @@@ msgstr "
#: modules/access/v4l2/v4l2.c:44
msgid "Video capture device"
++<<<<<<< HEAD
+msgstr "Dispositiu de captura de vidèo"
+
+#: modules/access/v4l2/v4l2.c:45
+msgid "Video capture device node."
+msgstr "Nòde del dispositiu de captura de vidèo."
++=======
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:45
+ msgid "Video capture device node."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:46
msgid "VBI capture device"
@@@ -8215,19 -8186,19 +8811,35 @@@ msgstr "
#: modules/access/v4l2/v4l2.c:144
msgid "Horizontal flip"
++<<<<<<< HEAD
+msgstr "Coalevar horizontalament"
+
+#: modules/access/v4l2/v4l2.c:146
+msgid "Flip the picture horizontally."
+msgstr "Coalevar la image horizontalament."
+
+#: modules/access/v4l2/v4l2.c:147
+msgid "Vertical flip"
+msgstr "Coalevar verticalament"
+
+#: modules/access/v4l2/v4l2.c:149
+msgid "Flip the picture vertically."
+msgstr "Coalevar l'image verticalament."
++=======
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:146
+ msgid "Flip the picture horizontally."
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:147
+ msgid "Vertical flip"
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:149
+ msgid "Flip the picture vertically."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:150
msgid "Rotate (degrees)"
@@@ -8249,7 -8220,7 +8861,11 @@@ msgstr "
#: modules/access/v4l2/v4l2.c:156
msgid "Color effect"
++<<<<<<< HEAD
+msgstr "Efièch de color"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:157
msgid "Select a color effect."
@@@ -8257,7 -8228,7 +8873,11 @@@ msgstr "
#: modules/access/v4l2/v4l2.c:164
msgid "Black & white"
++<<<<<<< HEAD
+msgstr "Negre e blanc"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:164 modules/gui/macosx/VideoEffects.m:136
#: modules/video_filter/sepia.c:65 modules/gui/qt4/ui/video_effects.h:1341
@@@ -8487,7 -8458,7 +9107,11 @@@ msgstr "Vol max #
msgid "Volume Set"
msgstr "Volum Causit"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -8686,11 -8657,11 +9310,19 @@@ msgstr "
#: modules/access/vnc.c:63
msgid "Image quality"
++<<<<<<< HEAD
+msgstr "Qualitat de l'image"
+
+#: modules/access/vnc.c:64
+msgid "Image quality 1 to 9 (max)"
+msgstr "Qualitat de l'image del 1 al 9 (maximal)"
++=======
+ msgstr ""
+
+ #: modules/access/vnc.c:64
+ msgid "Image quality 1 to 9 (max)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:78
msgid "VNC"
@@@ -9598,7 -9569,7 +10230,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "Sortida audio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Error dins la sortida à udio"
@@@ -9629,7 -9600,7 +10265,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9637,30 -9608,30 +10277,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Lo periferic à udio es pas configurat"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Lo periferic à udio es pas configurat"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Sortida Encodada)"
@@@ -10826,46 -10797,46 +11490,74 @@@ msgstr "
msgid "Outline"
msgstr "Contorn"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Negre"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Grey"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Argent"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Blanc"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Marron"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Roge"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10873,61 -10844,61 +11565,97 @@@ msgid "Fuchsia
msgstr "Fúchsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Jaune"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Oliva"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Verd"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lima"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Porpra"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Blau marin"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Blau"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11057,7 -11028,7 +11785,11 @@@ msgstr "SostÃtols (avançat)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -11569,7 -11540,7 +12301,11 @@@ msgstr "
#: modules/codec/schroedinger.c:327
msgid "Force Profile"
++<<<<<<< HEAD
+msgstr "Forçar perfil"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:339
msgid "VC2 Low Delay Profile"
@@@ -11577,15 -11548,15 +12313,27 @@@ msgstr "
#: modules/codec/schroedinger.c:340
msgid "VC2 Simple Profile"
++<<<<<<< HEAD
+msgstr "Perfil simple de VC2"
+
+#: modules/codec/schroedinger.c:341
+msgid "VC2 Main Profile"
+msgstr "Perfil principal de VC2"
+
+#: modules/codec/schroedinger.c:342
+msgid "Main Profile"
+msgstr "Perfil principal"
++=======
+ msgstr ""
+
+ #: modules/codec/schroedinger.c:341
+ msgid "VC2 Main Profile"
+ msgstr ""
+
+ #: modules/codec/schroedinger.c:342
+ msgid "Main Profile"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:363
msgid "Dirac video decoder using libschroedinger"
@@@ -11673,11 -11644,11 +12421,19 @@@ msgstr "
#: modules/codec/speex.c:91
msgid "Narrow-band (8kHz)"
++<<<<<<< HEAD
+msgstr "Banda estrecha (8 kHz)"
+
+#: modules/codec/speex.c:91
+msgid "Wide-band (16kHz)"
+msgstr "Banda ampla (16 kHz)"
++=======
+ msgstr ""
+
+ #: modules/codec/speex.c:91
+ msgid "Wide-band (16kHz)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/speex.c:91
msgid "Ultra-wideband (32kHz)"
@@@ -11713,7 -11684,7 +12469,11 @@@ msgstr "
#: modules/codec/spudec/spudec.c:51
msgid "DVD subtitles"
++<<<<<<< HEAD
+msgstr "SostÃtols de DVD"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/spudec/spudec.c:60
msgid "DVD subtitles packetizer"
@@@ -11729,7 -11700,7 +12489,11 @@@ msgstr "
#. languages using the Latin alphabet.
#: modules/codec/subsdec.c:97
msgid "Default (Windows-1252)"
++<<<<<<< HEAD
+msgstr "Per defaut (Windows-1252)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsdec.c:98
msgid "System codeset"
@@@ -11737,11 -11708,11 +12501,19 @@@ msgstr "
#: modules/codec/subsdec.c:99
msgid "Universal (UTF-8)"
++<<<<<<< HEAD
+msgstr "Universal (UTF-8)"
+
+#: modules/codec/subsdec.c:100
+msgid "Universal (UTF-16)"
+msgstr "Universal (UTF-16)"
++=======
+ msgstr ""
+
+ #: modules/codec/subsdec.c:100
+ msgid "Universal (UTF-16)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsdec.c:101
msgid "Universal (big endian UTF-16)"
@@@ -11757,111 -11728,111 +12529,219 @@@ msgstr "
#: modules/codec/subsdec.c:107
msgid "Western European (Latin-9)"
++<<<<<<< HEAD
+msgstr "Europèu occidental (Latin-9)"
+
+#: modules/codec/subsdec.c:108
+msgid "Western European (Windows-1252)"
+msgstr "Europèu occidental (Windows-1252)"
+
+#: modules/codec/subsdec.c:109
+msgid "Western European (IBM 00850)"
+msgstr "Europèu occidental (IBM 00850)"
+
+#: modules/codec/subsdec.c:111
+msgid "Eastern European (Latin-2)"
+msgstr "Europèu oriental (Latin-2)"
+
+#: modules/codec/subsdec.c:112
+msgid "Eastern European (Windows-1250)"
+msgstr "Europèu oriental (Windows-1250)"
+
+#: modules/codec/subsdec.c:114
+msgid "Esperanto (Latin-3)"
+msgstr "Esperanto (Latin-3)"
+
+#: modules/codec/subsdec.c:116
+msgid "Nordic (Latin-6)"
+msgstr "Nordic (Latin-6)"
+
+#: modules/codec/subsdec.c:118
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cirillic (Windows-1251)"
+
+#: modules/codec/subsdec.c:119
+msgid "Russian (KOI8-R)"
+msgstr "Rus (KOI8-R)"
+
+#: modules/codec/subsdec.c:120
+msgid "Ukrainian (KOI8-U)"
+msgstr "Ucraïnian (KOI8-U)"
+
+#: modules/codec/subsdec.c:122
+msgid "Arabic (ISO 8859-6)"
+msgstr "Arab (ISO 8859-6)"
+
+#: modules/codec/subsdec.c:123
+msgid "Arabic (Windows-1256)"
+msgstr "Arab (Windows-1256)"
+
+#: modules/codec/subsdec.c:125
+msgid "Greek (ISO 8859-7)"
+msgstr "Grèc (ISO 8859-7)"
+
+#: modules/codec/subsdec.c:126
+msgid "Greek (Windows-1253)"
+msgstr "Grèc (Windows-1253)"
+
+#: modules/codec/subsdec.c:128
+msgid "Hebrew (ISO 8859-8)"
+msgstr "Ebrieu (ISO 8859-8)"
+
+#: modules/codec/subsdec.c:129
+msgid "Hebrew (Windows-1255)"
+msgstr "Ebrieu (Windows-1255)"
+
+#: modules/codec/subsdec.c:131
+msgid "Turkish (ISO 8859-9)"
+msgstr "Turc (ISO 8859-9)"
+
+#: modules/codec/subsdec.c:132
+msgid "Turkish (Windows-1254)"
+msgstr "Turc (Windows-1254)"
+
+#: modules/codec/subsdec.c:135
+msgid "Thai (TIS 620-2533/ISO 8859-11)"
+msgstr "Tai (TIS 620-2533/ISO 8859-11)"
+
+#: modules/codec/subsdec.c:136
+msgid "Thai (Windows-874)"
+msgstr "Tai (Windows-874)"
+
+#: modules/codec/subsdec.c:138
+msgid "Baltic (Latin-7)"
+msgstr "Baltic (Latin-7)"
+
+#: modules/codec/subsdec.c:139
+msgid "Baltic (Windows-1257)"
+msgstr "Baltic (Windows-1257)"
+
+#: modules/codec/subsdec.c:142
+msgid "Celtic (Latin-8)"
+msgstr "Celtic (Latin-8)"
+
+#: modules/codec/subsdec.c:145
+msgid "South-Eastern European (Latin-10)"
+msgstr "Europèu sud-oriental (Latin-10)"
+
+#: modules/codec/subsdec.c:147
+msgid "Simplified Chinese (ISO-2022-CN-EXT)"
+msgstr "Chinés simplificat (ISO-2022-CN-EXT)"
+
+#: modules/codec/subsdec.c:148
+msgid "Simplified Chinese Unix (EUC-CN)"
+msgstr "Chinés simplificat unix (EUC-CN)"
+
+#: modules/codec/subsdec.c:149
+msgid "Japanese (7-bits JIS/ISO-2022-JP-2)"
+msgstr "Japonés (7-bits JIS/ISO-2022-JP-2)"
++=======
+ msgstr ""
+
+ #: modules/codec/subsdec.c:108
+ msgid "Western European (Windows-1252)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:109
+ msgid "Western European (IBM 00850)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:111
+ msgid "Eastern European (Latin-2)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:112
+ msgid "Eastern European (Windows-1250)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:114
+ msgid "Esperanto (Latin-3)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:116
+ msgid "Nordic (Latin-6)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:118
+ msgid "Cyrillic (Windows-1251)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:119
+ msgid "Russian (KOI8-R)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:120
+ msgid "Ukrainian (KOI8-U)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:122
+ msgid "Arabic (ISO 8859-6)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:123
+ msgid "Arabic (Windows-1256)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:125
+ msgid "Greek (ISO 8859-7)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:126
+ msgid "Greek (Windows-1253)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:128
+ msgid "Hebrew (ISO 8859-8)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:129
+ msgid "Hebrew (Windows-1255)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:131
+ msgid "Turkish (ISO 8859-9)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:132
+ msgid "Turkish (Windows-1254)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:135
+ msgid "Thai (TIS 620-2533/ISO 8859-11)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:136
+ msgid "Thai (Windows-874)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:138
+ msgid "Baltic (Latin-7)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:139
+ msgid "Baltic (Windows-1257)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:142
+ msgid "Celtic (Latin-8)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:145
+ msgid "South-Eastern European (Latin-10)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:147
+ msgid "Simplified Chinese (ISO-2022-CN-EXT)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:148
+ msgid "Simplified Chinese Unix (EUC-CN)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:149
+ msgid "Japanese (7-bits JIS/ISO-2022-JP-2)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsdec.c:150
msgid "Japanese Unix (EUC-JP)"
@@@ -11869,35 -11840,35 +12749,67 @@@ msgstr "
#: modules/codec/subsdec.c:151
msgid "Japanese (Shift JIS)"
++<<<<<<< HEAD
+msgstr "Japonés (Shift JIS)"
+
+#: modules/codec/subsdec.c:152
+msgid "Korean (EUC-KR/CP949)"
+msgstr "Corean (EUC-KR/CP949)"
+
+#: modules/codec/subsdec.c:153
+msgid "Korean (ISO-2022-KR)"
+msgstr "Corean (ISO-2022-KR)"
+
+#: modules/codec/subsdec.c:154
+msgid "Traditional Chinese (Big5)"
+msgstr "Chinés tradicional (Big5)"
+
+#: modules/codec/subsdec.c:155
+msgid "Traditional Chinese Unix (EUC-TW)"
+msgstr "Chinés traditional unix (EUC-TW)"
+
+#: modules/codec/subsdec.c:156
+msgid "Hong-Kong Supplementary (HKSCS)"
+msgstr "Hong-Kong suplementari (HKSCS)"
+
+#: modules/codec/subsdec.c:158
+msgid "Vietnamese (VISCII)"
+msgstr "Vietnamian (VISCII)"
+
+#: modules/codec/subsdec.c:159
+msgid "Vietnamese (Windows-1258)"
+msgstr "Vietnamian (Windows-1258)"
++=======
+ msgstr ""
+
+ #: modules/codec/subsdec.c:152
+ msgid "Korean (EUC-KR/CP949)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:153
+ msgid "Korean (ISO-2022-KR)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:154
+ msgid "Traditional Chinese (Big5)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:155
+ msgid "Traditional Chinese Unix (EUC-TW)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:156
+ msgid "Hong-Kong Supplementary (HKSCS)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:158
+ msgid "Vietnamese (VISCII)"
+ msgstr ""
+
+ #: modules/codec/subsdec.c:159
+ msgid "Vietnamese (Windows-1258)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsdec.c:166
msgid "Subtitle text encoding"
@@@ -12844,10 -12815,10 +13756,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -12952,8 -12923,8 +13871,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13290,9 -13261,9 +14214,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pausa"
@@@ -14334,23 -14305,23 +15264,43 @@@ msgstr "
#: modules/demux/mp4/id3genres.h:111
msgid "Hard Rock"
++<<<<<<< HEAD
+msgstr "Ròck dur"
+
+#: modules/demux/mp4/id3genres.h:112
+msgid "Folk"
+msgstr "Folk"
+
+#: modules/demux/mp4/id3genres.h:113
+msgid "Folk-Rock"
+msgstr "Folk-ròck"
+
+#: modules/demux/mp4/id3genres.h:114
+msgid "National Folk"
+msgstr "Folk nacional"
+
+#: modules/demux/mp4/id3genres.h:115
+msgid "Swing"
+msgstr "Swing"
++=======
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:112
+ msgid "Folk"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:113
+ msgid "Folk-Rock"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:114
+ msgid "National Folk"
+ msgstr ""
+
+ #: modules/demux/mp4/id3genres.h:115
+ msgid "Swing"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:116
msgid "Fast Fusion"
@@@ -14636,7 -14607,7 +15586,11 @@@ msgstr "
#: modules/demux/mp4/mp4.c:1066
msgid "Original Format"
++<<<<<<< HEAD
+msgstr "Format original"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1067
msgid "Display Source As"
@@@ -14660,11 -14631,11 +15614,19 @@@ msgstr "
#: modules/demux/mp4/mp4.c:1072
msgid "Warning"
++<<<<<<< HEAD
+msgstr "Alèrta"
+
+#: modules/demux/mp4/mp4.c:1073
+msgid "Software"
+msgstr "Logicial"
++=======
+ msgstr ""
+
+ #: modules/demux/mp4/mp4.c:1073
+ msgid "Software"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1074 modules/demux/xiph_metadata.h:55
#: modules/demux/xiph_metadata.h:62
@@@ -14677,11 -14648,11 +15639,19 @@@ msgstr "
#: modules/demux/mp4/mp4.c:1076
msgid "Model"
++<<<<<<< HEAD
+msgstr "Modèl"
+
+#: modules/demux/mp4/mp4.c:1077
+msgid "Product"
+msgstr "Produch"
++=======
+ msgstr ""
+
+ #: modules/demux/mp4/mp4.c:1077
+ msgid "Product"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1078
msgid "Grouping"
@@@ -14689,7 -14660,7 +15659,11 @@@ msgstr "
#: modules/demux/mp4/mp4.c:1080
msgid "Sub-Title"
++<<<<<<< HEAD
+msgstr "SostÃtol"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1081
msgid "Arranger"
@@@ -14709,7 -14680,7 +15683,11 @@@ msgstr "
#: modules/demux/mp4/mp4.c:1085
msgid "Song Description"
++<<<<<<< HEAD
+msgstr "Descripcion de la cançon "
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1086
msgid "Liner Notes"
@@@ -15171,7 -15142,7 +16149,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletèxt"
@@@ -15350,7 -15321,7 +16332,11 @@@ msgid "VLC media player Help
msgstr "Ajuda de VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Indèx"
@@@ -15417,30 -15388,30 +16403,52 @@@ msgstr "Efièches à udio
#: modules/gui/macosx/AudioEffects.m:202 modules/gui/macosx/VideoEffects.m:231
msgid "Duplicate current profile..."
++<<<<<<< HEAD
+msgstr "Duplicar lo perfil actual..."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:207
#: modules/gui/macosx/ConvertAndSave.m:1054
msgid "Organize Profiles..."
++<<<<<<< HEAD
+msgstr "Organizar los perfils..."
+
+#: modules/gui/macosx/AudioEffects.m:385 modules/gui/macosx/VideoEffects.m:877
+msgid "Duplicate current profile for a new profile"
+msgstr "Duplicar lo perfil actual per un perfil novèl"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/AudioEffects.m:385 modules/gui/macosx/VideoEffects.m:877
+ msgid "Duplicate current profile for a new profile"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:386
#: modules/gui/macosx/ConvertAndSave.m:367
#: modules/gui/macosx/VideoEffects.m:878
msgid "Enter a name for the new profile:"
++<<<<<<< HEAD
+msgstr "Picatz lo nom pel perfil novèl:"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:388 modules/gui/macosx/AudioEffects.m:642
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Salvar"
@@@ -15580,7 -15551,7 +16588,11 @@@ msgstr "Cap d'intrada trobada
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Anar al Temps"
@@@ -15600,7 -15571,7 +16612,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15610,7 -15581,7 +16626,11 @@@ msgstr "
msgid "Forward"
msgstr "Enarrièr"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15630,84 -15601,84 +16650,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
-#: modules/gui/macosx/ControlsBar.m:437
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
msgid "Click to stop playback."
msgstr ""
-#: modules/gui/macosx/ControlsBar.m:440
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
++#: modules/gui/macosx/ControlsBar.m:437
++msgid "Click to stop playback."
++msgstr ""
++
++#: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efièches"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15743,7 -15714,7 +16834,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15926,8 -15897,8 +17021,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Personalizar"
@@@ -15939,7 -15910,7 +17039,11 @@@ msgstr "Nom d'utilizaire
#: modules/gui/macosx/coredialogs.m:243
msgid "Errors and Warnings"
++<<<<<<< HEAD
+msgstr "Errors e alèrtas "
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/coredialogs.m:244
msgid "Clean up"
@@@ -16020,36 -15991,36 +17124,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Suprimir l'anciana interfà cia?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Avèm trobat una anciana version de las preferéncias de VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Suprimir l'anciana interfà cia?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Avèm trobat una anciana version de las preferéncias de VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16201,7 -16172,7 +17337,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16231,7 -16202,7 +17371,11 @@@ msgstr "
#: modules/gui/macosx/macosx.m:121 modules/gui/macosx/MainMenu.m:344
msgid "Show Sidebar"
++<<<<<<< HEAD
+msgstr "Mostrar barra laterala"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:122
msgid "Shows a sidebar in the main window listing media sources."
@@@ -16330,7 -16301,7 +17474,11 @@@ msgstr "Amagar VLC
msgid "Hide Others"
msgstr "Amagar autris"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Tot mostrar"
@@@ -16392,7 -16363,7 +17540,11 @@@ msgstr "Tot seleccionar
#: modules/gui/macosx/MainMenu.m:337
msgid "View"
++<<<<<<< HEAD
+msgstr "Visualizar"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:346 modules/gui/macosx/MainMenu.m:347
msgid "Playlist Table Columns"
@@@ -16415,15 -16386,15 +17567,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Sortir après lectura"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Sortir après lectura"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16439,30 -16410,30 +17603,56 @@@ msgstr "Baissar lo volum
msgid "Audio Device"
msgstr "Periferic à udio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Talha mejana"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Talha normale"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Talha dobla"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Ajustar a l'ecran"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Talha mejana"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Talha normale"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Talha dobla"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Ajustar a l'ecran"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Totjorn davant"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Sortida vidèo plen ecran"
@@@ -16471,7 -16442,7 +17661,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16625,7 -16596,7 +17819,11 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:219
msgid "LIBRARY"
++<<<<<<< HEAD
+msgstr "BIBLIOTÈCA"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainWindow.m:224
msgid "MY COMPUTER"
@@@ -16637,7 -16608,7 +17835,11 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:226
msgid "LOCAL NETWORK"
++<<<<<<< HEAD
+msgstr "RET LOCALA"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainWindow.m:227
msgid "INTERNET"
@@@ -16699,7 -16670,7 +17901,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Causir..."
@@@ -16802,7 -16773,7 +18008,11 @@@ msgstr "
#: modules/gui/macosx/open.m:217
msgid "Capture Audio"
++<<<<<<< HEAD
+msgstr "Àudio de la captura"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:218
msgid "Current channel:"
@@@ -16870,7 -16841,7 +18080,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Talha de la poliça"
@@@ -17099,12 -17070,12 +18313,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Preferéncias"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Tornar lançar totes"
@@@ -17158,7 -17129,7 +18380,11 @@@ msgstr "General à udio
#: modules/gui/macosx/simple_prefs.m:312
msgid "Preferred Audio language"
++<<<<<<< HEAD
+msgstr "Lenga preferida per l'Ã udio"
++=======
+ msgstr "Lenga per l'audio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/simple_prefs.m:313
msgid "Enable Last.fm submissions"
@@@ -17281,129 -17252,125 +18507,238 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Encodatge per defaut"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Mostrar los paramètres"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Encodatge per defaut"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Mostrar los paramètres"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Color de la poliça"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Poliça"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
+#: modules/gui/qt4/ui/sprefs_subtitles.h:292
+msgid "Preferred subtitle language"
+msgstr "Lenga preferida dels sostitòls"
+
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Activar OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:292
+ msgid "Preferred subtitle language"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Activar OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
- #: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
- #: modules/gui/qt4/ui/sprefs_video.h:341
- msgid "Display"
- msgstr "Mostrar"
++#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+ #: modules/gui/qt4/ui/sprefs_video.h:341
+ msgid "Display"
+ msgstr "Mostrar"
+
++<<<<<<< HEAD
++#: modules/gui/macosx/simple_prefs.m:400
++msgid "Output module"
++msgstr "Modul de Sortida"
++
++#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
++msgid "Video snapshots"
++msgstr "Captura vidèo"
++
++#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
++msgid "Folder"
++msgstr "Repertòri"
++
++#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
++msgid "Format"
++msgstr "Format"
++
++#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
++msgid "Prefix"
++msgstr "Prefix"
++
++#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
++msgid "Sequential numbering"
++msgstr ""
++
++#: modules/gui/macosx/simple_prefs.m:589
++msgid "Last check on: %@"
++msgstr ""
++
++#: modules/gui/macosx/simple_prefs.m:591
++msgid "No check was performed yet."
++msgstr ""
+
- #: modules/gui/macosx/simple_prefs.m:400
++#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
msgid "Output module"
msgstr "Modul de Sortida"
- #: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
msgid "Video snapshots"
msgstr "Captura vidèo"
- #: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
msgid "Folder"
msgstr "Repertòri"
- #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
msgid "Format"
msgstr "Format"
- #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
msgid "Prefix"
msgstr "Prefix"
- #: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
msgid "Sequential numbering"
msgstr ""
- #: modules/gui/macosx/simple_prefs.m:589
+ #: modules/gui/macosx/simple_prefs.m:588
msgid "Last check on: %@"
msgstr ""
- #: modules/gui/macosx/simple_prefs.m:591
+ #: modules/gui/macosx/simple_prefs.m:590
msgid "No check was performed yet."
msgstr ""
- #: modules/gui/macosx/simple_prefs.m:710
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Tornar lançar las Preferéncias"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17416,35 -17383,35 +18751,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Causir lo repertòri ont salvar las capturas."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Causir"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Causir lo repertòri ont salvar las capturas."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Causir"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -18622,7 -18589,7 +19987,11 @@@ msgstr "
#: modules/gui/qt4/components/controller.hpp:121
msgid "Open subtitles"
++<<<<<<< HEAD
+msgstr "Dobrir sostÃtols"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:121
msgid "Dock fullscreen controller"
@@@ -18776,57 -18743,57 +20145,109 @@@ msgstr "dB
#: modules/gui/qt4/components/extended_panels.cpp:1192
msgid "170 Hz"
++<<<<<<< HEAD
+msgstr "170 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1193
+msgid "310 Hz"
+msgstr "310 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1194
+msgid "600 Hz"
+msgstr "600 Hz"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1193
+ msgid "310 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1194
+ msgid "600 Hz"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1195
#: modules/gui/qt4/components/extended_panels.cpp:1209
msgid "1 KHz"
++<<<<<<< HEAD
+msgstr "1 kHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1196
+msgid "3 KHz"
+msgstr "3 kHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1197
+msgid "6 KHz"
+msgstr "6 kHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1198
+msgid "12 KHz"
+msgstr "12 kHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1199
+msgid "14 KHz"
+msgstr "14 kHz"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1196
+ msgid "3 KHz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1197
+ msgid "6 KHz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1198
+ msgid "12 KHz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1199
+ msgid "14 KHz"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1200
#: modules/gui/qt4/components/extended_panels.cpp:1213
msgid "16 KHz"
++<<<<<<< HEAD
+msgstr "16 kHz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1204
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1205
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1206
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: modules/gui/qt4/components/extended_panels.cpp:1207
+msgid "250 Hz"
+msgstr "250 Hz"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1204
+ msgid "31 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1205
+ msgid "63 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1206
+ msgid "125 Hz"
+ msgstr ""
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1207
+ msgid "250 Hz"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1208
msgid "500 Hz"
@@@ -19146,7 -19113,7 +20567,11 @@@ msgstr "Periferics
#: modules/gui/qt4/components/playlist/selector.cpp:252
msgid "Local Network"
++<<<<<<< HEAD
+msgstr "Ret locala"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/selector.cpp:253
msgid "Internet"
@@@ -19162,11 -19129,11 +20587,19 @@@ msgstr "
#: modules/gui/qt4/components/playlist/standardpanel.cpp:47
msgid "Create Directory"
++<<<<<<< HEAD
+msgstr "Crear un repertòri"
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:47
+msgid "Create Folder"
+msgstr "Crear un dorsièr"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:47
+ msgid "Create Folder"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/standardpanel.cpp:49
msgid "Enter name for new directory:"
@@@ -19178,7 -19145,7 +20611,11 @@@ msgstr "
#: modules/gui/qt4/components/playlist/standardpanel.cpp:241
msgid "Sort by"
++<<<<<<< HEAD
+msgstr "Ordenar per"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/standardpanel.cpp:249
msgid "Ascending"
@@@ -19246,7 -19213,7 +20683,11 @@@ msgstr "
#: modules/gui/qt4/components/preferences_widgets.cpp:1140
msgid "Actions"
++<<<<<<< HEAD
+msgstr "Accions"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1147
msgid "Hotkey"
@@@ -19336,7 -19303,7 +20777,11 @@@ msgstr "
#: modules/gui/qt4/components/simple_preferences.cpp:1242
msgid "File associations"
++<<<<<<< HEAD
+msgstr "Associacions de fichièrs"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:1251
#: modules/gui/qt4/dialogs_provider.hpp:42
@@@ -19384,20 -19351,20 +20829,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Crear"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -19637,7 -19604,7 +21098,11 @@@ msgstr "&Ã’c
#: modules/gui/qt4/dialogs/help.cpp:219
msgid "&No"
++<<<<<<< HEAD
+msgstr "&Non"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:222 modules/gui/qt4/ui/update.h:147
msgid "VLC media player updates"
@@@ -19729,7 -19696,7 +21194,11 @@@ msgstr "&Ret
#: modules/gui/qt4/dialogs/open.cpp:96
msgid "Capture &Device"
++<<<<<<< HEAD
+msgstr "Periferic de &captura..."
++=======
+ msgstr "Periferic de &Captura..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/open.cpp:111
msgid "&Select"
@@@ -19751,19 -19718,19 +21220,35 @@@ msgstr "&Flux
#: modules/gui/qt4/dialogs/open.cpp:121
msgid "C&onvert"
++<<<<<<< HEAD
+msgstr "C&onvertir"
+
+#: modules/gui/qt4/dialogs/open.cpp:205
+msgid "C&onvert / Save"
+msgstr "C&onvertir / Salvar"
+
+#: modules/gui/qt4/dialogs/openurl.cpp:47
+msgid "Open URL"
+msgstr "Dobrir URL"
+
+#: modules/gui/qt4/dialogs/openurl.cpp:64
+msgid "Enter URL here..."
+msgstr "Picatz l'URL aicÃ..."
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs/open.cpp:205
+ msgid "C&onvert / Save"
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs/openurl.cpp:47
+ msgid "Open URL"
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs/openurl.cpp:64
+ msgid "Enter URL here..."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/openurl.cpp:66
msgid "Please enter the URL or path to the media you want to play."
@@@ -19854,11 -19821,11 +21339,19 @@@ msgstr "
#: modules/gui/qt4/dialogs/preferences.cpp:201
msgid "Advanced Preferences"
++<<<<<<< HEAD
+msgstr "Preferéncias avançadas"
+
+#: modules/gui/qt4/dialogs/preferences.cpp:222
+msgid "Simple Preferences"
+msgstr "Preferéncias simplas"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs/preferences.cpp:222
+ msgid "Simple Preferences"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:306
msgid "Cannot save Configuration"
@@@ -19878,7 -19845,7 +21371,11 @@@ msgstr "Dobrir Repertòri
#: modules/gui/qt4/dialogs_provider.cpp:66
msgid "Open Folder"
++<<<<<<< HEAD
+msgstr "Dobrir lo dorsièr"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs_provider.cpp:563
msgid "Open playlist..."
@@@ -19910,7 -19877,7 +21407,11 @@@ msgstr "Fichièrs de mèdia
#: modules/gui/qt4/dialogs_provider.hpp:44
msgid "Subtitle Files"
++<<<<<<< HEAD
+msgstr "Fichièrs de sostÃtols"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs_provider.hpp:45
msgid "All Files"
@@@ -20150,7 -20117,7 +21651,11 @@@ msgstr "&Vidèo
#: modules/gui/qt4/menus.cpp:333 modules/gui/qt4/menus.cpp:1052
msgid "Subti&tle"
++<<<<<<< HEAD
+msgstr "SostÃ&tol"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:335 modules/gui/qt4/menus.cpp:1068
msgid "T&ools"
@@@ -20234,7 -20201,7 +21739,11 @@@ msgstr "Personalizar l'interfà cia...
#: modules/gui/qt4/menus.cpp:439
msgid "&Preferences"
++<<<<<<< HEAD
+msgstr "&Preferéncias"
++=======
+ msgstr "Preferéncias"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:460
msgid "&View"
@@@ -20398,7 -20365,7 +21907,11 @@@ msgstr "Seguent
#: modules/gui/qt4/menus.cpp:850
msgid "Sp&eed"
++<<<<<<< HEAD
+msgstr "Velocitat"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:856
msgid "&Faster"
@@@ -20422,7 -20389,7 +21935,11 @@@ msgstr "En arrièr
#: modules/gui/qt4/menus.cpp:907
msgid "Ctrl+T"
++<<<<<<< HEAD
+msgstr "Ctrl+T"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:922
msgid "Open &Network..."
@@@ -20446,7 -20413,7 +21963,11 @@@ msgstr "
#: modules/gui/qt4/menus.cpp:1164
msgid "&Open Media"
++<<<<<<< HEAD
+msgstr "Dobrir un fichièr multimèdia"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:1628
msgid "&Clear"
@@@ -20928,7 -20895,7 +22449,11 @@@ msgstr "
#: modules/misc/audioscrobbler.c:595
msgid "last.fm: Authentication failed"
++<<<<<<< HEAD
+msgstr "last.fm: L'autentificacion a pas capitat"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/audioscrobbler.c:596
msgid ""
@@@ -21619,11 -21586,11 +23144,19 @@@ msgstr "Podcasts
#: modules/services_discovery/pulse.c:42 modules/services_discovery/udev.c:64
#: modules/services_discovery/udev.c:101
msgid "Audio capture"
++<<<<<<< HEAD
+msgstr "Captura d'Ã udio"
+
+#: modules/services_discovery/pulse.c:43
+msgid "Audio capture (PulseAudio)"
+msgstr "Captura d'Ã udio (PulseAudio)"
++=======
+ msgstr ""
+
+ #: modules/services_discovery/pulse.c:43
+ msgid "Audio capture (PulseAudio)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/pulse.c:186 modules/stream_out/es.c:85
msgid "Generic"
@@@ -21694,15 -21661,15 +23227,27 @@@ msgstr "Utilizaire
#: modules/services_discovery/udev.c:55 modules/services_discovery/udev.c:97
msgid "Video capture"
++<<<<<<< HEAD
+msgstr "Captura de vidèo"
+
+#: modules/services_discovery/udev.c:56
+msgid "Video capture (Video4Linux)"
+msgstr "Captura de vidèo (Video4Linux)"
+
+#: modules/services_discovery/udev.c:65
+msgid "Audio capture (ALSA)"
+msgstr "Captura d'Ã udio (ALSA)"
++=======
+ msgstr ""
+
+ #: modules/services_discovery/udev.c:56
+ msgid "Video capture (Video4Linux)"
+ msgstr ""
+
+ #: modules/services_discovery/udev.c:65
+ msgid "Audio capture (ALSA)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/udev.c:592
msgid "CD"
@@@ -21729,7 -21696,7 +23274,11 @@@ msgstr "
#: modules/services_discovery/xcb_apps.c:86
#: modules/services_discovery/xcb_apps.c:151
msgid "Screen capture"
++<<<<<<< HEAD
+msgstr "Captura d'ecran"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/xcb_apps.c:152
msgid "Your window manager does not provide a list of applications."
@@@ -21747,12 -21714,12 +23296,20 @@@ msgstr "
#: modules/stream_filter/dash/dash.cpp:51
#: modules/stream_filter/dash/dash.cpp:52
msgid "Preferred Width"
++<<<<<<< HEAD
+msgstr "Longor preferida"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/dash/dash.cpp:54
#: modules/stream_filter/dash/dash.cpp:55
msgid "Preferred Height"
++<<<<<<< HEAD
+msgstr "Nautor preferida"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/dash/dash.cpp:57
msgid "Buffer Size (Seconds)"
@@@ -22043,7 -22010,7 +23600,11 @@@ msgstr "
#: modules/stream_out/langfromtelx.c:48
msgid "Page"
++<<<<<<< HEAD
+msgstr "Pagina"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/langfromtelx.c:50
msgid "Specify the page containing the language"
@@@ -22051,7 -22018,7 +23612,11 @@@ msgstr "
#: modules/stream_out/langfromtelx.c:51
msgid "Row"
++<<<<<<< HEAD
+msgstr "Linha"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/langfromtelx.c:53
msgid "Specify the row containing the language"
@@@ -22249,7 -22216,7 +23814,11 @@@ msgstr "
#: modules/stream_out/rtp.c:109 modules/stream_out/standard.c:71
msgid "Session email"
++<<<<<<< HEAD
+msgstr "Corrièr electronic de la session"
++=======
+ msgstr "Corrièr electronic de session"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/rtp.c:111 modules/stream_out/standard.c:73
msgid ""
@@@ -22259,7 -22226,7 +23828,11 @@@ msgstr "
#: modules/stream_out/rtp.c:113 modules/stream_out/standard.c:75
msgid "Session phone number"
++<<<<<<< HEAD
+msgstr "Numèro de telefòn de la session"
++=======
+ msgstr "Numèro de telefòn de session"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/rtp.c:115 modules/stream_out/standard.c:77
msgid ""
@@@ -22707,45 -22674,45 +24280,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Talha de poliça en pixels"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Talha de poliça en pixels"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Color del tèxt per defaut"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22754,93 -22721,93 +24363,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Mai pichon"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Pichon"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Larg"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Mai larg"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Aparéncia del tèxt"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Aparéncia del tèxt"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -25878,7 -25845,7 +27567,11 @@@ msgstr "
#: modules/video_output/glx.c:42 modules/video_output/xcb/glx.c:51
msgid "GLX"
++<<<<<<< HEAD
+msgstr "GLX"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/glx.c:43
msgid "GLX extension for OpenGL"
@@@ -26558,7 -26525,7 +28251,11 @@@ msgstr "
#: share/lua/http/index.html:215
msgid "Hide / Show Library"
++<<<<<<< HEAD
+msgstr "Amagar / Visualizar la bibliotèca"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:216
msgid "Hide / Show Viewer"
@@@ -26677,7 -26644,7 +28374,11 @@@ msgstr "
#: modules/gui/qt4/ui/messages_panel.h:140
msgid "&Filter:"
++<<<<<<< HEAD
+msgstr "&Filtre:"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/messages_panel.h:141
msgid "&Save as..."
@@@ -26741,7 -26708,7 +28442,11 @@@ msgstr "
#: modules/gui/qt4/ui/open_capture.h:97
msgid "Capture mode"
++<<<<<<< HEAD
+msgstr "Mòde de captura"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/open_capture.h:99
msgid "Select the capture device type"
@@@ -27027,7 -26994,7 +28732,11 @@@ msgstr "
#: modules/gui/qt4/ui/sprefs_audio.h:428
msgid "Preferred audio language:"
++<<<<<<< HEAD
+msgstr "Lenga preferida per l'Ã udio"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:429
msgid "Password:"
@@@ -27175,7 -27142,7 +28884,11 @@@ msgstr "Autorizar solament una instà nc
#: modules/gui/qt4/ui/sprefs_interface.h:537
msgid "Configure Media Library"
++<<<<<<< HEAD
+msgstr "Configurar la bibliotèca multimèdia"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:541
msgid "Every "
@@@ -27479,6 -27446,9 +29192,12 @@@ msgstr "
msgid "Media Manager List"
msgstr ""
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Mostrar los detalhs"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -27498,6 -27468,9 +29217,12 @@@
#~ msgstr ""
#~ "Aquestes reglatges an un efièch sus la transformacion dels moduls chroma."
++<<<<<<< HEAD
++=======
+ #~ msgid "Sort"
+ #~ msgstr "Triar"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Some options are available but hidden. Check \"Advanced options\" to see "
#~ "them."
@@@ -27712,12 -27685,23 +29437,32 @@@
#~ msgstr "Senhal pel servidor HTTP (Proxy)"
#, fuzzy
++<<<<<<< HEAD
++#~ msgid " packets sent : %5i"
++#~ msgstr " s Arrestar"
++
++#~ msgid " by the VideoLAN Team.\n"
++#~ msgstr " per l'equipa VideoLAN.\n"
++
++=======
+ #~ msgid "Force Bold"
+ #~ msgstr "Impausar una sortida mòno"
+
+ #, fuzzy
#~ msgid " packets sent : %5i"
#~ msgstr " s Arrestar"
+ #, fuzzy
+ #~ msgid "Icon View"
+ #~ msgstr "Veire"
+
#~ msgid " by the VideoLAN Team.\n"
#~ msgstr " per l'equipa VideoLAN.\n"
+ #~ msgid "&Convert"
+ #~ msgstr "&Convertir"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Freebox TV"
#~ msgstr "Freebox TV"
@@@ -27754,6 -27738,9 +29499,12 @@@
#~ msgid "00000; "
#~ msgstr "00:00:00"
++<<<<<<< HEAD
++=======
+ #~ msgid "Instances"
+ #~ msgstr "Instà ncias"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Enqueue files when in one instance mode"
#~ msgstr "Enqueue items to playlist when in one instance mode*"
@@@ -27804,6 -27791,12 +29555,15 @@@
#~ msgid "IPv4 multicast output interface address"
#~ msgstr "IPv4 multicast output interface address*"
++<<<<<<< HEAD
++=======
+ #~ msgid "Force IPv6"
+ #~ msgstr "Impausar IPv6"
+
+ #~ msgid "Force IPv4"
+ #~ msgstr "Impausar IPv4"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Prefer system plugins over VLC"
#~ msgstr "Sistèma preferits d'ajustons"
@@@ -28545,6 -28538,12 +30305,15 @@@
#~ "Audio track number. VCDs can have up to 2 audio tracks numbered 0 or 1. "
#~ msgstr "Es possible d'aver cap a 8 pistas audio de 0 cap a 7."
++<<<<<<< HEAD
++=======
+ #~ msgid "&Add URL..."
+ #~ msgstr "&Apondre URL..."
+
+ #~ msgid "Sort by &Title"
+ #~ msgstr "Ordenar per &TÃtol"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "&Reverse Sort by Title"
#~ msgstr "Capvirar l'òrdre*"
@@@ -28598,46 -28597,6 +30367,49 @@@
#~ msgstr "esquèrra"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Detalhs del codec"
+
+#, fuzzy
+#~ msgid "Sort"
+#~ msgstr "Ordenar per"
+
+#, fuzzy
+#~ msgid "Force Bold"
+#~ msgstr "Forçar perfil"
+
+#, fuzzy
+#~ msgid "Icon View"
+#~ msgstr "Visualizar"
+
+#, fuzzy
+#~ msgid "&Convert"
+#~ msgstr "C&onvertir"
+
+#, fuzzy
+#~ msgid "Instances"
+#~ msgstr "Installar"
+
+#, fuzzy
+#~ msgid "Force IPv6"
+#~ msgstr "Forçar perfil"
+
+#, fuzzy
+#~ msgid "Force IPv4"
+#~ msgstr "Forçar perfil"
+
+#, fuzzy
+#~ msgid "&Add URL..."
+#~ msgstr "Apondre fichièr..."
+
+#, fuzzy
+#~ msgid "Sort by &Title"
+#~ msgstr "Ordenar per"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Add a subtitle file"
#~ msgstr "Utilizar un fichièr de sostÃtols"
@@@ -28651,11 -28610,11 +30423,19 @@@
#, fuzzy
#~ msgid "Chroma modules settings"
++<<<<<<< HEAD
+#~ msgstr "Paramètres generals de vidèo"
+
+#, fuzzy
+#~ msgid "Packetizer modules settings"
+#~ msgstr "Paramètres generals de vidèo"
++=======
+ #~ msgstr "Paramètres vidèo"
+
+ #, fuzzy
+ #~ msgid "Packetizer modules settings"
+ #~ msgstr "Paramètres vidèo"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Encoders settings"
@@@ -28687,7 -28646,7 +30467,11 @@@
#, fuzzy
#~ msgid "Add to Media Library"
++<<<<<<< HEAD
+#~ msgstr "Cargar la bibliotèca multimèdia"
++=======
+ #~ msgstr "Librariá de mèdia"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Advanced Open..."
@@@ -28727,7 -28686,7 +30511,11 @@@
#, fuzzy
#~ msgid "Audio visualizations "
++<<<<<<< HEAD
+#~ msgstr "Visualizacions d'Ã udio"
++=======
+ #~ msgstr "Visualizacion à udio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Memory copy module"
@@@ -28755,11 -28714,11 +30543,19 @@@
#, fuzzy
#~ msgid "Capture format of audio stream."
++<<<<<<< HEAD
+#~ msgstr "Capturar lo flux d'à udio en esterèo."
+
+#, fuzzy
+#~ msgid "GSM Audio"
+#~ msgstr "Àudio"
++=======
+ #~ msgstr "Capturar lo flux à udio en esterèo."
+
+ #, fuzzy
+ #~ msgid "GSM Audio"
+ #~ msgstr "Àudio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "dc1394 input"
@@@ -28908,11 -28867,11 +30704,19 @@@
#, fuzzy
#~ msgid "General Audio Settings"
++<<<<<<< HEAD
+#~ msgstr "Paramètres generals d'à udio"
+
+#, fuzzy
+#~ msgid "General Video Settings"
+#~ msgstr "Paramètres generals de vidèo"
++=======
+ #~ msgstr "Paramètres à udio generals"
+
+ #, fuzzy
+ #~ msgid "General Video Settings"
+ #~ msgstr "Paramètres vidèo"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Input & Codecs"
@@@ -28924,7 -28883,7 +30728,11 @@@
#, fuzzy
#~ msgid "Enable Audio"
++<<<<<<< HEAD
+#~ msgstr "Activar l'Ã udio"
++=======
+ #~ msgstr "Activar audio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "HTTP Proxy"
@@@ -28932,7 -28891,7 +30740,11 @@@
#, fuzzy
#~ msgid "Preferred Subtitle Language"
++<<<<<<< HEAD
+#~ msgstr "Lenga preferida dels sostitòls"
++=======
+ #~ msgstr "Lenga per l'audio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Outline Color"
@@@ -29064,7 -29023,7 +30876,11 @@@
#, fuzzy
#~ msgid "Mute audio"
++<<<<<<< HEAD
+#~ msgstr "Activar l'Ã udio"
++=======
+ #~ msgstr "Activar audio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Audio Language"
@@@ -29228,7 -29187,7 +31044,11 @@@
#, fuzzy
#~ msgid "&Open a Media"
++<<<<<<< HEAD
+#~ msgstr "Dobrir un fichièr multimèdia"
++=======
+ #~ msgstr "&Dobrir un mèdia"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Live Update"
@@@ -29248,15 -29207,15 +31068,27 @@@
#, fuzzy
#~ msgid "Viewer"
++<<<<<<< HEAD
+#~ msgstr "Visualizar"
+
+#, fuzzy
+#~ msgid "Library"
+#~ msgstr "Bibliotèca multimèdia"
+
+#, fuzzy
+#~ msgid "No"
+#~ msgstr "&Non"
++=======
+ #~ msgstr "&Vista"
+
+ #, fuzzy
+ #~ msgid "Library"
+ #~ msgstr "Librariá de mèdia"
+
+ #, fuzzy
+ #~ msgid "No"
+ #~ msgstr "Cap"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Full Screen"
@@@ -29288,7 -29247,7 +31120,11 @@@
#, fuzzy
#~ msgid "Capture Screen"
++<<<<<<< HEAD
+#~ msgstr "Mòde de captura"
++=======
+ #~ msgstr "Periferic de &Captura..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Close"
@@@ -29308,11 -29267,11 +31144,19 @@@
#, fuzzy
#~ msgid "Remove Stream"
++<<<<<<< HEAD
+#~ msgstr "Suprimir lo causits"
+
+#, fuzzy
+#~ msgid "Create New Stream"
+#~ msgstr "Crear un repertòri"
++=======
+ #~ msgstr "Levar"
+
+ #, fuzzy
+ #~ msgid "Create New Stream"
+ #~ msgstr "Dobrir un flux..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Delete All Streams"
@@@ -29332,7 -29291,7 +31176,11 @@@
#, fuzzy
#~ msgid "Preload Directory"
++<<<<<<< HEAD
+#~ msgstr "Crear un repertòri"
++=======
+ #~ msgstr "Causir un repertòri"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Effect"
@@@ -29411,7 -29370,7 +31259,11 @@@
#~ "Select the key to go back (to the previous media item) in the browsing "
#~ "history."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Causissetz l'acorchi per anar a l'element precedent de la lista de "
++=======
+ #~ "Causissètz l'acorchi per anar a l'element precedent de la lista de "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "lectura."
#, fuzzy
@@@ -29419,7 -29378,7 +31271,11 @@@
#~ "Select the key to go forward (to the next media item) in the browsing "
#~ "history."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Causissetz l'acorchi per anar a l'element seguent de la lista de lectura."
++=======
+ #~ "Causissètz l'acorchi per anar a l'element seguent de la lista de lectura."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Caching value in ms"
@@@ -29599,7 -29558,7 +31455,11 @@@
#, fuzzy
#~ msgid "Empty Folder"
++<<<<<<< HEAD
+#~ msgstr "Dobrir lo dorsièr"
++=======
+ #~ msgstr "Repertòri"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Default Server Port"
@@@ -29796,7 -29755,7 +31656,11 @@@
#, fuzzy
#~ msgid "Settings for audio+video and miscellaneous decoders and encoders."
++<<<<<<< HEAD
+#~ msgstr "Paramètres pels codificadors e descodificadors d'à udio."
++=======
+ #~ msgstr "Paramètres per la codificacion à udio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Open &Directory..."
@@@ -29844,7 -29803,7 +31708,11 @@@
#, fuzzy
#~ msgid "CD reading failed"
++<<<<<<< HEAD
+#~ msgstr "La connexion a pas capitat"
++=======
+ #~ msgstr "Captura pas capitada"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "CDDB"
@@@ -29915,7 -29874,7 +31783,11 @@@
#, fuzzy
#~ msgid "Select None"
++<<<<<<< HEAD
+#~ msgstr "Causir lo dorsièr"
++=======
+ #~ msgstr "Causir un fichièr"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Sort Reverse"
@@@ -29923,7 -29882,7 +31795,11 @@@
#, fuzzy
#~ msgid "Sort by Path"
++<<<<<<< HEAD
+#~ msgstr "Ordenar per"
++=======
+ #~ msgstr "Ordenar per Autor"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Randomize"
@@@ -29979,7 -29938,7 +31855,11 @@@
#, fuzzy
#~ msgid "Audio:"
++<<<<<<< HEAD
+#~ msgstr "Àudio"
++=======
+ #~ msgstr "Àudio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Norm:"
@@@ -30114,7 -30073,7 +31994,11 @@@
#, fuzzy
#~ msgid "Choose directory"
++<<<<<<< HEAD
+#~ msgstr "Crear un repertòri"
++=======
+ #~ msgstr "Dobrir Repertòri"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "WinCE interface"
@@@ -30150,7 -30109,7 +32034,11 @@@
#, fuzzy
#~ msgid "GaLaktos visualization"
++<<<<<<< HEAD
+#~ msgstr "Visualizacions d'Ã udio"
++=======
+ #~ msgstr "Visualizacion à udio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Processing"
@@@ -30424,7 -30383,7 +32312,11 @@@
#, fuzzy
#~ msgid "&Simple Add File..."
++<<<<<<< HEAD
+#~ msgstr "Apondre fichièr..."
++=======
+ #~ msgstr "&Dobrir un fichièr..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "&Save Playlist..."
@@@ -30480,7 -30439,7 +32372,11 @@@
#, fuzzy
#~ msgid "Cartoon effect"
++<<<<<<< HEAD
+#~ msgstr "Efièch de color"
++=======
+ #~ msgstr "Efièch Goom"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "More Information"
@@@ -30604,7 -30563,7 +32500,11 @@@
#, fuzzy
#~ msgid "Codec Description"
++<<<<<<< HEAD
+#~ msgstr "Descripcion de la cançon "
++=======
+ #~ msgstr "Descripcion"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Video Device Name "
@@@ -30612,7 -30571,7 +32512,11 @@@
#, fuzzy
#~ msgid "Audio Device Name "
++<<<<<<< HEAD
+#~ msgstr "Nom del dispositiu d'Ã udio"
++=======
+ #~ msgstr "Nom Dispositiu Audio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Alsa Device"
@@@ -30712,4 -30671,4 +32616,8 @@@
#, fuzzy
#~ msgid "Open Subtitles"
++<<<<<<< HEAD
+#~ msgstr "Dobrir sostÃtols"
++=======
+ #~ msgstr "Dobrir de sostÃtols"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined po/or.po
index 995b6ae,d8b33b8..e933732
--- a/po/or.po
+++ b/po/or.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-09 08:20+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -133,7 -133,7 +137,11 @@@ msgstr "ବିବିଧ ଅଡ଼ିà¬
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -445,10 -445,10 +453,17 @@@ msgid "&About
msgstr "&ବିଷàŸà¬°à‡"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -487,17 -487,17 +502,29 @@@ msgid "Save...
msgstr ""
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "ସବàତକ ପàନରାବàƒà¬¤àତି କରନàତà"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "ଗà‹à¬Ÿà¬¿à¬ ପàନରାବàƒà¬¤àତି କରନàତà"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -577,7 -577,7 +604,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "ଅକàଷମ କରନàତà"
@@@ -1235,20 -1235,20 +1266,36 @@@ msgstr "ଫàରà‡à¬®à ମାନ
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "ଆପଣଙàକର ଇନପàଟà କà ଖà‹à¬²à¬¾à¬¯à¬¾à¬‡à¬ªà¬¾à¬°à¬¿à¬¬ ନାହିà¬"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "ଆପଣଙàକର ଇନପàଟà କà ଖà‹à¬²à¬¾à¬¯à¬¾à¬‡à¬ªà¬¾à¬°à¬¿à¬¬ ନାହିà¬"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC ଇନପàଟà ର ପàରକାରକà ଚିହàନଟ କରିପାରàନାହିà¬"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC ଇନପàଟà ର ପàରକାରକà ଚିହàନଟ କରିପାରàନାହିà¬"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1639,7 -1639,7 +1686,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1721,7 -1721,7 +1772,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr ""
@@@ -1745,7 -1745,7 +1800,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "à¬à¬¿à¬¡à¬¿à¬“ ସକàଷମ କରନàତà"
@@@ -1935,7 -1935,7 +1994,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "ସବàବà‡à¬³à‡ ଉପରà‡"
@@@ -1986,7 -1986,7 +2049,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -1995,7 -1995,7 +2062,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2051,7 -2051,7 +2122,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2220,7 -2220,7 +2295,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2348,12 -2348,12 +2427,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2361,7 -2361,7 +2449,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2664,7 -2664,7 +2756,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3476,7 -3476,7 +3572,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3500,8 -3500,8 +3600,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3581,10 -3581,10 +3686,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3597,10 -3597,10 +3709,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "ପà‚ରàବବରàତàତà€"
@@@ -3609,9 -3609,9 +3728,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3846,9 -3846,9 +3971,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4262,7 -4262,7 +4393,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "ଛାàŸà¬¾à¬šà¬¿à¬¤àର"
@@@ -4459,12 -4459,12 +4594,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "ବାତିଲà କରନàତà"
@@@ -5220,7 -5220,7 +5364,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7516,7 -7516,7 +7664,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8248,7 -8248,7 +8400,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9359,7 -9359,7 +9515,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9390,7 -9390,7 +9550,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9398,30 -9398,30 +9562,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10587,46 -10587,46 +10775,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "କଳା"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "ଧଳା"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "ନାଲି"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10634,61 -10634,61 +10850,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "ହଳଦିଆ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "ସବàଜ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "ନà‡à¬³à¬¿"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10818,7 -10818,7 +11070,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12605,10 -12605,10 +12861,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -12713,8 -12713,8 +12976,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13050,9 -13050,9 +13318,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "ବିରାମ"
@@@ -14931,7 -14931,7 +15205,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15110,7 -15110,7 +15388,11 @@@ msgid "VLC media player Help
msgstr "VLC ମିଡିଆ ପàଲà‡àŸà¬¾à¬° ସାହାଯààŸ"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15198,9 -15198,9 +15480,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr ""
@@@ -15339,7 -15339,7 +15627,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15359,7 -15359,7 +15651,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15369,7 -15369,7 +15665,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15389,84 -15389,84 +15689,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "ଅଦଳବଦଳ"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "ଅଦଳବଦଳ"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15502,7 -15502,7 +15873,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15685,8 -15685,8 +16060,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -15779,36 -15779,36 +16159,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15960,7 -15960,7 +16372,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16089,7 -16089,7 +16505,11 @@@ msgstr "
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr ""
@@@ -16174,15 -16174,15 +16594,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16198,30 -16198,30 +16630,56 @@@ msgstr "
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16230,7 -16230,7 +16688,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16458,7 -16458,7 +16920,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -16629,7 -16629,7 +17095,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -16858,12 -16858,12 +17328,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "ଅଗàରାଧିକାରସମà‚ହ"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17040,129 -17040,125 +17518,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17175,35 -17171,35 +17761,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19141,20 -19137,20 +19757,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22457,45 -22453,45 +23089,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22504,93 -22500,93 +23172,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/pa.po
index ae52844,b490745..87126c0
--- a/po/pa.po
+++ b/po/pa.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-10-07 13:49+0000\n"
"Last-Translator: A S Alam <apreet.alam at gmail.com>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/vlc-"
@@@ -137,7 -137,7 +141,11 @@@ msgstr "ਫà©à¨Ÿà¨•à¨² ਆਡੀਓ à¨
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -447,10 -447,10 +455,17 @@@ msgid "&About
msgstr "ਇਸ ਬਾਰੇ(&A)"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -489,17 -489,17 +504,29 @@@ msgid "Save...
msgstr "ਸੰà¨à¨¾à¨²à©‹..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "ਸਠਰਪੀਟ"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "ਇੱਕ ਰਪੀਟ"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -579,7 -579,7 +606,11 @@@ msgstr "ਫਿਲਟਰਾਂ ਦੀ à¨
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "ਆਯੋਗ"
@@@ -1243,20 -1243,20 +1274,36 @@@ msgstr "ਫਰੇਮ ਰੇਟ
msgid "Decoded format"
msgstr "ਡੀਕੋਡ ਕੀਤਾ ਫਾਰਮੈਟ"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "ਤà©à¨¹à¨¾à¨¡à©€ ਇੰਪà©à©±à¨Ÿ ਖੋਲà©à¨¹à©€ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "ਤà©à¨¹à¨¾à¨¡à©€ ਇੰਪà©à©±à¨Ÿ ਖੋਲà©à¨¹à©€ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC MRL '%s' ਨੂੰ ਖੋਲà©à¨¹à¨£ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਵਾਸਤਾ ਲਾਗ ਵੇਖੋ।"
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC ਇੰਪà©à©±à¨Ÿ ਦੇ ਫਾਰਮੈਟ ਨੂੰ ਸਮਠਨਹੀਂ ਸਕਿਆ।"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC ਇੰਪà©à©±à¨Ÿ ਦੇ ਫਾਰਮੈਟ ਨੂੰ ਸਮਠਨਹੀਂ ਸਕਿਆ।"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1660,7 -1660,7 +1707,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1742,7 -1742,7 +1793,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "ਕੋਈ ਨਹੀਂ"
@@@ -1768,7 -1768,7 +1823,11 @@@ msgstr "
"ਇਹ ਵਿਡੀਓ ਆਉਟਪà©à©±à¨Ÿ ਢੰਗ ਹੈ, ਜੋ ਕਿ VLC ਵਲੋਂ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ। ਡਿਫਾਲਟ ਰਵੱਈਆ ਆਟੋਮੈਟਿਕ ਹੀ ਸਠਤੋਂ "
"ਵਧੀਆ ਉਪਲੱਬਧ ਲਈ ਚà©à¨£à¨¿à¨† ਜਾਂਦਾ ਹੈ।"
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "ਵਿਡੀਓ ਯੋਗ"
@@@ -1960,7 -1960,7 +2019,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "ਹਮੇਸ਼ਾ ਉੱਤੇ ਰੱਖੋ"
@@@ -2011,7 -2011,7 +2074,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2020,7 -2020,7 +2087,11 @@@ msgstr "ਡਿ-ਇੰਟਰਲੇਸ
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "ਡੀਇੰਟਰਲੇਸ ਮੋਡ"
@@@ -2076,7 -2076,7 +2147,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "ਵਿੰਡੋ ਸਜਾਵਟ"
@@@ -2249,7 -2249,7 +2324,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "ਫਰੇਮ ਛੱਡੋ"
@@@ -2377,12 -2377,12 +2456,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2390,7 -2390,7 +2478,11 @@@ msgid "Default
msgstr "ਡਿਫਾਲਟ"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2693,7 -2693,7 +2785,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3511,7 -3511,7 +3607,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "ਅਣਡਿੱਠਾ"
@@@ -3535,8 -3535,8 +3635,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3616,10 -3616,10 +3721,17 @@@ msgid "Slower (fine)
msgstr "ਹੌਲੀ (ਵਧੀਆ)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3632,10 -3632,10 +3744,17 @@@ msgid "Select the hotkey to use to ski
msgstr "ਪਲੇਅਲਿਸਟ ਵਿੱਚ ਅਗਲੀ ਆਈਟਮ ਲਈ ਜਾਣ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਹਾਟ-ਕੀ ਚà©à¨£à©‹à¥¤"
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "ਪਿੱਛੇ"
@@@ -3644,9 -3644,9 +3763,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "ਪਲੇਅਲਿਸਟ ਵਿੱਚ ਪਿਛਲੀ ਆਈਟਮ ਉੱਤੇ ਜਾਣ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਹਾਟ-ਕੀ ਚà©à¨£à©‹à¥¤"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3881,9 -3881,9 +4006,15 @@@ msgid "Select the key to decrease audi
msgstr "ਆਡੀਓ ਵਾਲੀਅਮ ਘਟਾਉਣ ਲਈ ਸਵਿੱਚ ਚà©à¨£à©‹à¥¤"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "ਚà©à©±à¨ª"
@@@ -4297,7 -4297,7 +4428,11 @@@ msgstr "ਉਪਲੱਬਧ ਆਡੀà¨
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "ਸਨੈਪਸ਼ਾਟ"
@@@ -4496,12 -4496,12 +4631,21 @@@ msgstr "ਡਾਊਨਲੋਡ ਜਾਰ
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "ਰੱਦ ਕਰੋ"
@@@ -5260,7 -5260,7 +5404,11 @@@ msgstr "ਕਰੋਪ
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "ਅਕਾਰ ਅਨà©à¨ªà¨¾à¨¤"
@@@ -7556,7 -7556,7 +7704,11 @@@ msgstr "ਸਕਰੀਨ ਇੰਪà©à©±
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "ਸਕਰੀਨ"
@@@ -8288,7 -8288,7 +8440,11 @@@ msgstr "ਵਾਲੀਅਮ ਵੱਧੋ
msgid "Volume Set"
msgstr "ਵਾਲੀਅਮ ਸੈੱਟ"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9399,7 -9399,7 +9555,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "ਅਲਸਾ ਆਡੀਓ ਆਉਟਪà©à©±à¨Ÿ"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "ਆਡੀਓ ਆਉਟਪà©à©±à¨Ÿ ਫੇਲà©à¨¹"
@@@ -9430,7 -9430,7 +9590,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9438,30 -9438,30 +9602,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "ਆਡੀਓ ਜੰਤਰ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "ਆਡੀਓ ਜੰਤਰ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (ਇੰਕੋਡ ਕੀਤੀ ਆਉਟਪà©à©±à¨Ÿ)"
@@@ -10627,46 -10627,46 +10815,74 @@@ msgstr "ਸ਼ੈਡੋ
msgid "Outline"
msgstr "ਆਉਟਲਾਈਨ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "ਕਾਲਾ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "ਗਰੇ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "ਸਿਲਵਰ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "ਚਿੱਟਾ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "ਮੈਰੂਨ"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "ਲਾਲ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10674,61 -10674,61 +10890,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "ਪੀਲਾ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "ਜੈਤੂਨੀ"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "ਹਰਾ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "ਟੀਲ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "ਲਾਇਮ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "ਗੂੜਾ ਲਾਲ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "ਅਸਮਾਨੀ"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "ਨੀਲਾ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10858,7 -10858,7 +11110,11 @@@ msgstr "ਸਬ-ਟਾਈਟਲ (ਤਕà
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "ਫੋਂਟ ਕੈਸ਼ ਬਿਲਡ ਕਰਨੀ"
@@@ -12647,10 -12647,10 +12903,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "ਨਾਰਮਲ"
@@@ -12755,8 -12755,8 +13018,13 @@@ msgid "D-Bus control interface
msgstr "ਡੀਬੱਸ ਕੰਟਰੋਲ ਇੰਟਰਫੇਸ"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13092,9 -13092,9 +13360,15 @@@ msgstr "ਸ਼à©à¨°à©‚ ਕੀਤਾ à¨
msgid "Opening"
msgstr "ਖੋਲà©à¨¹à©€ ਜਾ ਰਹੀ ਹੈ"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "ਵਿਰਾਮ"
@@@ -14973,7 -14973,7 +15247,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG ਟਰਾਂਸਪੋਰਟ ਸਟਰੀਮ ਡੀਮà©à¨¸à¨°"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "ਟੈਲੀਟੈਕਸਟ"
@@@ -15152,7 -15152,7 +15430,11 @@@ msgid "VLC media player Help
msgstr "VLC ਮੀਡਿਆ ਪਲੇਅਰ ਮੱਦਦ"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "ਇੰਡੈਕਸ"
@@@ -15240,9 -15240,9 +15522,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "ਸੰà¨à¨¾à¨²à©‹"
@@@ -15381,7 -15381,7 +15669,11 @@@ msgstr "ਕੋਈ ਇੰਪà©à©±à¨Ÿ à¨
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "ਟਾਈਮ ਉੱਤੇ ਜਾਓ"
@@@ -15401,7 -15401,7 +15693,11 @@@ msgstr "
msgid "Backward"
msgstr "ਪਿੱਛੇ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15411,7 -15411,7 +15707,11 @@@ msgstr "
msgid "Forward"
msgstr "ਅੱਗੇ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15431,84 -15431,84 +15731,155 @@@ msgstr "ਪੂਰੀ ਸਕਰੀਨ à¨
msgid "Click to enable fullscreen video playback."
msgstr "ਪੂਰੀ ਸਕਰੀਨ ਵਿਡੀਓ ਪਲੇਅਬੈਕ ਚਾਲੂ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "ਪਲੇਅਲਿਸਟ ਵੇਖਾਓ/ਓਹਲੇ"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "ਪਲੇਅਲਿਸਟ ਵੇਖਾਓ/ਓਹਲੇ"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "ਰਪੀਟ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "ਪੂਰਾ ਵਾਲੀਅਮ"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "ਪੂਰਾ ਵਾਲੀਅਮ"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "ਪਰà¨à¨¾à¨µ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15544,7 -15544,7 +15915,11 @@@ msgstr "ਆਉਟਪà©à©±à¨Ÿ ਟਿਕ
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15727,8 -15727,8 +16102,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "ਕਸਟਮ"
@@@ -15821,36 -15821,36 +16201,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "ਫੇਰ ਨਾ ਪà©à©±à¨›à©‹"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "ਵੀà¨à¨²à¨¸à©€ ਮੀਡਿਆ ਪਲੇਅਬੈ"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "ਕੋਈ ਕਰੈਸ਼-ਲਾਗ ਨਹੀਂ ਹੈ"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "ਵੀà¨à¨²à¨¸à©€ ਮੀਡਿਆ ਪਲੇਅਬੈ"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "ਕੋਈ ਕਰੈਸ਼-ਲਾਗ ਨਹੀਂ ਹੈ"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "ਜਾਰੀ ਰੱਖੋ"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "ਪà©à¨°à¨¾à¨£à©€ ਪਸੰਦ ਹਟਾਉਣੀ ਹੈ?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "ਰੱਦੀ ਵਿੱਚ à¨à©‡à¨œà©‹ ਅਤੇ VLC ਮà©à©œ-ਚਾਲੂ"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "ਪà©à¨°à¨¾à¨£à©€ ਪਸੰਦ ਹਟਾਉਣੀ ਹੈ?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "ਰੱਦੀ ਵਿੱਚ à¨à©‡à¨œà©‹ ਅਤੇ VLC ਮà©à©œ-ਚਾਲੂ"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16002,7 -16002,7 +16414,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "ਅਕਾਰ ਰੇਸ਼ੋ ਲਾਕ ਕਰੋ"
@@@ -16131,7 -16131,7 +16547,11 @@@ msgstr "VLC ਓਹਲੇ
msgid "Hide Others"
msgstr "ਹੋਰ ਓਹਲੇ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "ਸਠਵੇਖੋ"
@@@ -16216,15 -16216,15 +16636,27 @@@ msgstr "ਟਰੈਕ ਸੈਕਰੋਨ
msgid "A→B Loop"
msgstr "A→B ਲੂਪ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "ਚਲਾਉਣ ਬਾਅਦ ਬੰਦ ਕਰੋ"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "ਅੱਗੇ ਜਾਓ"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "ਚਲਾਉਣ ਬਾਅਦ ਬੰਦ ਕਰੋ"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "ਅੱਗੇ ਜਾਓ"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "ਪਿੱਛੇ ਜਾਓ"
@@@ -16240,30 -16240,30 +16672,56 @@@ msgstr "ਵਾਲੀਅਮ ਘਟਾਓ
msgid "Audio Device"
msgstr "ਆਡੀਓ ਜੰਤਰ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "ਅੱਧਾ ਸਾਈਜ਼"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "ਆਮ ਸਾਈਜ਼"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "ਡਬਲ ਸਾਈਜ਼"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "ਸਕਰੀਨ ਉੱਤੇ ਫਿੱਟ"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "ਅੱਧਾ ਸਾਈਜ਼"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "ਆਮ ਸਾਈਜ਼"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "ਡਬਲ ਸਾਈਜ਼"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "ਸਕਰੀਨ ਉੱਤੇ ਫਿੱਟ"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "ਉੱਤੇ ਤੈਰਦਾ ਰੱਖੋ"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "ਪੂਰੀ ਸਕਰੀਨ ਵਿਡੀਓ ਜੰਤਰ"
@@@ -16272,7 -16272,7 +16730,11 @@@
msgid "Post processing"
msgstr "ਪੋਸਟ ਪਰੋਸੈਸਿੰਗ"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16500,7 -16500,7 +16962,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "ਚà©à¨£à©‹..."
@@@ -16671,7 -16671,7 +17137,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "ਫੋਂਟ ਸਾਈਜ਼"
@@@ -16900,12 -16900,12 +17370,20 @@@ msgstr "ਮੇਟਾ ਸੰà¨à¨¾à¨²à¨
msgid "VLC was unable to save the meta data."
msgstr "VLC ਮੇਟਾ ਡਾਟਾ ਸੰà¨à¨¾à¨²à¨£ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "ਪਸੰਦ"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "ਸਠਰੀ-ਸੈੱਟ"
@@@ -17082,129 -17082,125 +17560,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "ਡਿਫਾਲਟ ਇੰਕੋਡਿੰਗ"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "ਡਿਸਪਲੇਅ ਸੈਟਿੰਗ"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "ਡਿਫਾਲਟ ਇੰਕੋਡਿੰਗ"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "ਡਿਸਪਲੇਅ ਸੈਟਿੰਗ"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "ਫੋਂਟ ਰੰਗ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "ਫੋਂਟ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OSD ਯੋਗ"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OSD ਯੋਗ"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "ਧà©à©°à¨¦à¨²à¨¾à¨ªà¨¨"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "ਪੂਰੀ ਸਕਰੀਨ ਮੋਡ ਵਿੱਚ ਕਾਲੀਆਂ ਸਕਰੀਨਾਂ"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "ਪੂਰੀ ਸਕਰੀਨ ਮੋਡ ਵਿੱਚ ਕਾਲੀਆਂ ਸਕਰੀਨਾਂ"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "ਡਿਸਪਲੇਅ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "ਆਉਟਪà©à©±à¨Ÿ ਮੋਡੀਊਲ"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "ਵਿਡੀਓ ਸਨੈਪਸ਼ਾਟ"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "ਫੋਲਡਰ"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "ਫਾਰਮੈਟ"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "ਪà©à¨°à©€-ਫਿਕਸ"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "ਆਖਰੀ ਚੈੱਕ ਕੀਤਾ: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "ਕੋਈ ਚੈੱਕ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ।"
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "ਆਉਟਪà©à©±à¨Ÿ ਮੋਡੀਊਲ"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "ਵਿਡੀਓ ਸਨੈਪਸ਼ਾਟ"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "ਫੋਲਡਰ"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "ਫਾਰਮੈਟ"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "ਪà©à¨°à©€-ਫਿਕਸ"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "ਆਖਰੀ ਚੈੱਕ ਕੀਤਾ: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "ਕੋਈ ਚੈੱਕ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ।"
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "ਘੱਟ ਲੇਟਨਸੀ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "ਘੱਟ ਲੇਟਨਸੀ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "ਉੱਚ ਲੇਟਨਸੀ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "ਉੱਚ ਲੇਟਨਸੀ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "ਪਸੰਦ ਰੀ-ਸੈੱਟ ਕਰੋ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17217,20 -17213,20 +17803,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "ਚà©à¨£à©‹"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "ਚà©à¨£à©‹"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -17238,16 -17234,16 +17841,29 @@@ msgstr "
"\"%@\"\n"
"ਲਈ ਨਵੀਂ ਸਵਿੱਚ ਦੱਬੋ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "ਅਢà©à©±à¨•à¨µà¨¾à¨‚ ਕੰਬੀਨੇਸ਼ਨ"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "ਅਢà©à©±à¨•à¨µà¨¾à¨‚ ਕੰਬੀਨੇਸ਼ਨ"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19185,20 -19181,20 +19801,36 @@@ msgstr "ਚà©à¨£à¨¿à¨† ਪਰੋਫਾ
msgid "Create a new profile"
msgstr "ਨਵਾਂ ਪਰੋਫਾਇਲ ਬਣਾਓ"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "ਬਣਾਓ"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " ਪਰੋਫਾਇਲ ਨਾਂ ਨਹੀਂ ਦਿੱਤਾ"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " ਪਰੋਫਾਇਲ ਨਾਂ ਨਹੀਂ ਦਿੱਤਾ"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "ਤà©à¨¹à¨¾à¨¨à©‚à©° ਪਰੋਫਾਇਲ ਲਈ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
@@@ -22505,45 -22501,45 +23137,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr "ਓਵਰਲੇ/ਸਬ-ਟਾਈਟਲ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "ਫੋਂਟ ਵਰਗ, ਫੋਂਟ ਲਈ, ਜੋ ਤà©à¨¸à©€à¨‚ ਵਰਤੇ ਚਾਹà©à©°à¨¦à©‡ ਹੋ"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "ਫੋਂਟ ਵਰਗ, ਫੋਂਟ ਲਈ, ਜੋ ਤà©à¨¸à©€à¨‚ ਵਰਤੇ ਚਾਹà©à©°à¨¦à©‡ ਹੋ"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "ਪਿਕਸਲ ਵਿੱਚ ਫੋਂਟ ਸਾਈਜ਼"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "ਫੋਂਟ ਵਰਗ, ਫੋਂਟ ਲਈ, ਜੋ ਤà©à¨¸à©€à¨‚ ਵਰਤੇ ਚਾਹà©à©°à¨¦à©‡ ਹੋ"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "ਫੋਂਟ ਵਰਗ, ਫੋਂਟ ਲਈ, ਜੋ ਤà©à¨¸à©€à¨‚ ਵਰਤੇ ਚਾਹà©à©°à¨¦à©‡ ਹੋ"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "ਪਿਕਸਲ ਵਿੱਚ ਫੋਂਟ ਸਾਈਜ਼"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "ਟੈਕਸਟ ਡਿਫਾਲਟ ਰੰਗ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22552,93 -22548,93 +23220,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "ਢà©à©±à¨•à¨µà¨¾à¨‚ ਫੋਂਟ ਸਾਈਜ਼"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "ਬੈਕਗਰਾਊਂਡ ਧà©à©°à¨¦à¨²à¨¾à¨ªà¨¨"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "ਸ਼ੈਡੋ ਰੰਗ"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "ਸ਼ੈਡੋ ਕੋਣ"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "ਸ਼ੈਡੋ ਦੂਰੀ"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "ਬੈਕਗਰਾਊਂਡ ਧà©à©°à¨¦à¨²à¨¾à¨ªà¨¨"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "ਸ਼ੈਡੋ ਰੰਗ"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "ਸ਼ੈਡੋ ਕੋਣ"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "ਸ਼ੈਡੋ ਦੂਰੀ"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "ਬਹà©à¨¤ ਛੋਟਾ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "ਛੋਟਾ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "ਵੱਡਾ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "ਹੋਰ ਵੱਡਾ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "ਟੈਕਸਟ ਰੈਂਡਰਰ"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 ਫੋਂਟ ਰੈਂਡਰਰ"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "ਟੈਕਸਟ ਰੈਂਡਰਰ"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 ਫੋਂਟ ਰੈਂਡਰਰ"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/pl.po
index 5985ec4,80e43c9..74f5c98
--- a/po/pl.po
+++ b/po/pl.po
@@@ -4,16 -4,15 +4,25 @@@
#
# Translators:
# Marcin Szymański <cysioland at gmail.com>, 2013
++<<<<<<< HEAD
+# Gootector <gootector at o2.pl>, 2013
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# Michał Trzebiatowski <hippie_1968 at hotmail.com>, 2007-2013
# robaks, 2013
msgid ""
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-12-08 13:51+0000\n"
+"Last-Translator: M T\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-09-26 18:45+0000\n"
+ "Last-Translator: M T <michtrz at gmail.com>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Polish (http://www.transifex.com/projects/p/vlc-trans/"
"language/pl/)\n"
"Language: pl\n"
@@@ -43,7 -42,7 +52,11 @@@ msgstr "Preferencje VLC
#: include/vlc_config_cat.h:35
msgid "Select \"Advanced Options\" to see all options."
++<<<<<<< HEAD
+msgstr "Wybierz \"Zaawansowane opcje\", żeby wyświetlić wszystkie opcje."
++=======
+ msgstr "Wybierz \"Zaawansowane opcje\" żeby wyświetlić wszystkie opcje"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:38 modules/gui/macosx/simple_prefs.m:269
#: modules/gui/qt4/components/simple_preferences.cpp:220
@@@ -143,7 -142,7 +156,11 @@@ msgstr "Różne ustawienia dźwięku i
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -165,7 -164,7 +182,11 @@@ msgstr "Ogólne ustawienia obrazu
#: include/vlc_config_cat.h:78
msgid "Choose your preferred video output and configure it here."
++<<<<<<< HEAD
+msgstr "Wybierz swój preferowany obraz wyjściowy i skonfiguruj go tutaj."
++=======
+ msgstr "Wybierz twój preferowany obraz wyjściowy i skonfiguruj go tutaj."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:82
msgid "Video filters are used to process the video stream."
@@@ -211,7 -210,7 +232,11 @@@ msgid "
"Stream filters are special modules that allow advanced operations on the "
"input side of VLC. Use with care..."
msgstr ""
++<<<<<<< HEAD
+"Filtry strumieniowania są specjalnymi modułami, które pozwalają na "
++=======
+ "Filtry strumieniowania są specjalnymi modułami które pozwalają na "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"zaawansowaną obróbkę wejścia VLC. Używaj ostrożnie..."
#: include/vlc_config_cat.h:108
@@@ -236,7 -235,7 +261,11 @@@ msgstr "Kodeki dźwięku
#: include/vlc_config_cat.h:115
msgid "Settings for the audio-only decoders and encoders."
++<<<<<<< HEAD
+msgstr "Ustawienia tylko dekoderów i koderów dźwiękowych."
++=======
+ msgstr "Ustawienia dekoderów i koderów tylko dźwiękowych."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:117
msgid "Subtitle codecs"
@@@ -287,11 -286,10 +316,18 @@@ msgid "
"always force a specific muxer. You should probably not do that.\n"
"You can also set default parameters for each muxer."
msgstr ""
++<<<<<<< HEAD
+"Muksery tworzą formaty enkapsułkowania, które są wykorzystywane do "
+"połączenia wszystkich podstawowych strumieni (wideo, audio, ...). To "
+"ustawienie pozwala zawsze na wymuszenie określonego muksera. Nie powinno się "
+"tego zmieniać.\n"
+"Można również ustawić domyślne parametry dla każdego muksera."
++=======
+ "Muxery tworzą formaty enkapsułkowania, które są wykorzystywane do połączenia "
+ "wszystkich podstawowych strumieni (wideo, audio, ...). To ustawienie pozwala "
+ "zawsze na wymuszenie określonego muxera. Nie powinno się tego zmieniać.\n"
+ "Można również ustawić domyślne parametry dla każdego muxera."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:143
msgid "Access output"
@@@ -341,11 -339,11 +377,19 @@@ msgstr "
#: include/vlc_config_cat.h:164
msgid "VOD"
++<<<<<<< HEAD
+msgstr "Wideo na życzenie (VOD)"
+
+#: include/vlc_config_cat.h:165
+msgid "VLC's implementation of Video On Demand"
+msgstr "Implementacja Wideo na życzenie (VOD) w VLC"
++=======
+ msgstr "Wideo na żądanie (VOD)"
+
+ #: include/vlc_config_cat.h:165
+ msgid "VLC's implementation of Video On Demand"
+ msgstr "Implementacja Wideo na żądanie (VOD) w VLC"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:169 src/libvlc-module.c:2002
#: src/playlist/engine.c:256 modules/demux/playlist/playlist.c:64
@@@ -363,7 -361,7 +407,11 @@@ msgid "
"that automatically add items to the playlist (\"service discovery\" modules)."
msgstr ""
"Ustawienia dotyczÄ…ce zachowania listy odtwarzania (np. tryb odtwarzania) i "
++<<<<<<< HEAD
+"modułów, które automatycznie dodają pozycje do listy odtwarzania (moduły "
++=======
+ "modułów które automatycznie dodają pozycje do listy odtwarzania (moduły "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"\"wykrywania usług\")."
#: include/vlc_config_cat.h:174
@@@ -489,10 -487,10 +537,17 @@@ msgid "&About
msgstr "&O"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -531,17 -529,17 +586,29 @@@ msgid "Save...
msgstr "Zapisz..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Powtórz wszystko"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Powtórz jeden"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -630,7 -628,7 +697,11 @@@ msgstr "
"videolan.org/support/faq.html\">FAQ</a>.</p><p>Można wówczas uzyskać (i dać) "
"pomoc na <a href=\"http://forum.videolan.org\">forach</a>, <a href=\"http://"
"www.videolan.org/vlc/lists.html\">listach mailingowych</a> lub naszym kanale "
++<<<<<<< HEAD
+"IRC (<em>#videolan</em></a> na irc.freenode.net).</p><h3>Przyczyń się do "
++=======
+ "IRC (<em>#videolan</em></a> na irc.freenode.net ).</p><h3>Przyczyń się do "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"projektu</h3><p>Możesz pomóc projekcie VideoLAN oferując trochę swojego "
"czasu, aby pomóc społeczności, zaprojektować skóry, przetłumaczyć "
"dokumentację albo przetestować i kodować program. Możesz również podać "
@@@ -648,7 -646,7 +719,11 @@@ msgstr "Została osiągnięta maksymaln
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Wyłącz"
@@@ -752,7 -750,7 +827,11 @@@ msgstr "liczba zmiennoprzecinkowa
#: src/config/file.c:479 src/config/help.c:447
msgid "string"
++<<<<<<< HEAD
+msgstr "ciąg znaków"
++=======
+ msgstr "łańcuch znaków"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/help.c:127
msgid "To get exhaustive help, use '-H'."
@@@ -865,7 -863,7 +944,11 @@@ msgid "
"No matching module found. Use --list or --list-verbose to list available "
"modules."
msgstr ""
++<<<<<<< HEAD
+"Nie znaleziono pasującego modułu. Użyj --list lub --list-verbose, aby "
++=======
+ "Nie znaleziono pasującego modułu. Użyj --list lub --list-verbose aby "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"wyświetlić dostępne moduły."
#: src/config/help.c:790
@@@ -897,7 -895,7 +980,11 @@@ msgid "
"Press the RETURN key to continue...\n"
msgstr ""
"\n"
++<<<<<<< HEAD
+"Naciśnij klawisz ENTER, aby kontynuować...\n"
++=======
+ "Naciśnij klawisz ENTER aby kontynuować...\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:56
msgid "Backspace"
@@@ -1204,7 -1202,7 +1291,11 @@@ msgstr "VLC nie może otworzyć moduł
#: src/input/decoder.c:468
msgid "VLC could not open the decoder module."
++<<<<<<< HEAD
+msgstr "VLC nie może otworzyć modułu dekodera."
++=======
+ msgstr "VLC nie może otworzyć modułu dekodera"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/decoder.c:720
msgid "No suitable decoder module"
@@@ -1313,7 -1311,7 +1404,11 @@@ msgstr "Bitów na próbkę
#: modules/gui/macosx/ConvertAndSave.m:188 modules/gui/qt4/ui/profiles.h:712
#: modules/gui/qt4/ui/profiles.h:738
msgid "Bitrate"
++<<<<<<< HEAD
+msgstr "Bitrate"
++=======
+ msgstr "Przepływność"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/es_out.c:2930
#, c-format
@@@ -1354,27 -1352,26 +1449,47 @@@ msgstr "Liczba klatek/s
msgid "Decoded format"
msgstr "Zdekodowany format"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Twoje dane wejściowe nie może być otwarte"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Twoje dane wejściowe nie może być otwarte"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"Program VLC nie może otworzyć MRL '%s'. Szczegóły błędu można znaleźć w "
"dzienniku."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC nie rozpoznaje formatu wejścia"
+
+#: src/input/input.c:2550
+#, c-format
+msgid ""
+"The format of '%s' cannot be detected. Have a look at the log for details."
+msgstr ""
+"Format '%s' nie może być usunięty. Zajrzyj do dziennika dla szczegółów."
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC nie rozpoznaje formatu wejścia"
+
+ #: src/input/input.c:2549
+ #, c-format
+ msgid ""
+ "The format of '%s' cannot be detected. Have a look at the log for details."
+ msgstr "Format '%s' nie może być usunięty. Zajrzyj do dziennika dla szczegół."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/meta.c:55 src/input/var.c:177 modules/gui/macosx/MainMenu.m:69
#: modules/gui/macosx/MainMenu.m:372 modules/gui/macosx/MainMenu.m:373
@@@ -1545,7 -1542,7 +1660,11 @@@ msgid "
"Running vlc with the default interface. Use 'cvlc' to use vlc without "
"interface."
msgstr ""
++<<<<<<< HEAD
+"Uruchamianie vlc z domyślnym interfejsem. Użyj 'cvlc', aby używać vlc bez "
++=======
+ "Uruchamianie vlc z domyślnym interfejsem. Użyj 'cvlc' aby używać vlc bez "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"interfejsu."
#: src/libvlc.h:134 src/libvlc-module.c:1401 src/libvlc-module.c:1402
@@@ -1588,7 -1585,7 +1707,11 @@@ msgid "
"This is the main interface used by VLC. The default behavior is to "
"automatically select the best module available."
msgstr ""
++<<<<<<< HEAD
+"To jest główny interfejs używany przez VLC. Domyślnym zachowaniem jest "
++=======
+ "To główny interfejs używany przez VLC. Domyślnym zachowaniem jest "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"automatyczny wybór najlepszego dostępnego modułu."
#: src/libvlc-module.c:74 modules/control/ntservice.c:58
@@@ -1649,7 -1646,7 +1772,11 @@@ msgid "
"needs Linux color support for this to work."
msgstr ""
"Ta opcja włącza kolorowanie komunikatów wysyłanych do konsoli. Aby to "
++<<<<<<< HEAD
+"zadziałało, Twój terminal musi wspierać kolory Linuksa."
++=======
+ "zadziałało, twój terminal musi wspierać kolory Linuksa."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:103
msgid "Show advanced options"
@@@ -1804,7 -1801,7 +1931,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1834,7 -1831,7 +1965,11 @@@ msgstr "
#: src/libvlc-module.c:199
msgid "This adds visualization modules (spectrum analyzer, etc.)."
++<<<<<<< HEAD
+msgstr "Ta opcja dodaje moduły wizualizacyjne (analizator widma itd.)."
++=======
+ msgstr "Ta opcja dodaje moduły wizualizacyjne (analizator widma, itd.)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:203
msgid "Replay gain mode"
@@@ -1863,8 -1860,8 +1998,13 @@@ msgstr "Domyślna normalizacja głośno
#: src/libvlc-module.c:214
msgid "This is the gain used for stream without replay gain information"
msgstr ""
++<<<<<<< HEAD
+"Ta opcja ustala domyślną normalizację głośności dla strumieni "
+"nieposiadajÄ…cych takiej informacji"
++=======
+ "Ta opcja ustala domyślną normalizację głośności dla strumieni nie "
+ "posiadajÄ…cych takiej informacji"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:216
msgid "Peak protection"
@@@ -1894,7 -1891,7 +2034,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Brak"
@@@ -1908,7 -1905,7 +2052,11 @@@ msgid "
"options."
msgstr ""
"Opcje te pozwalają modyfikować zachowanie wyjścia obrazu podsystemu. Można "
++<<<<<<< HEAD
+"na przykład włączyć filtry obrazu (usuwanie, dostosowanie obrazu itp.). "
++=======
+ "na przykład włączyć filtry obrazu (usuwanie, dostosowanie obrazu, itp.). "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Włącz tutaj te filtry i skonfiguruj je w sekcji modułów \"filtry obrazu\" . "
"Można także ustawić wiele różnych opcji obrazu."
@@@ -1924,7 -1921,7 +2072,11 @@@ msgstr "
"To jest używana metoda wyjścia obrazu przez VLC. Domyślne zachowanie to "
"automatyczny wybór najlepszej, dostępnej metody."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "WÅ‚Ä…cz obraz"
@@@ -1996,7 -1993,7 +2148,11 @@@ msgid "
"Custom title for the video window (in case the video is not embedded in the "
"interface)."
msgstr ""
++<<<<<<< HEAD
+"Dowolny tytuł dla okna obrazu (w wypadku, gdy obraz nie jest złączony z "
++=======
+ "Dowolny tytuł dla okna obrazu (w wypadku gdy obraz nie jest złączony z "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"interfejsem)."
#: src/libvlc-module.c:279
@@@ -2125,12 -2122,12 +2281,20 @@@ msgid "
"Overlay is the hardware acceleration capability of your video card (ability "
"to render video directly). VLC will try to use it by default."
msgstr ""
++<<<<<<< HEAD
+"Overlay to sprzętowe przyspieszenie Twojej katy graficznej (umożliwia "
++=======
+ "Overlay to sprzętowe przyspieszenie twojej katy graficznej (umożliwia "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"bezpośredniego wyświetlania obrazu na ekranie). Domyślnie, VLC próbuje "
"używać tej opcji."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Zawsze na wierzchu"
@@@ -2184,7 -2181,7 +2348,11 @@@ msgstr "Ukryj kursor i kontroler pełno
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2193,7 -2190,7 +2361,11 @@@ msgstr "Usuwanie przeplotu
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Tryb anty-przeplotowy"
@@@ -2251,7 -2248,7 +2423,11 @@@ msgstr "
"Wstrzymaj daemona zarządzania zasilaniem podczas każdego odtwarzania, aby "
"uniknąć uśpienia komputera z powodu bezczynności."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Elementy okna"
@@@ -2261,7 -2258,7 +2437,11 @@@ msgid "
"VLC can avoid creating window caption, frames, etc... around the video, "
"giving a \"minimal\" window."
msgstr ""
++<<<<<<< HEAD
+"VLC może zapobiec tworzenia nagłówki okna, ramki itd... wokół obrazu, żeby "
++=======
+ "VLC może zapobiec tworzenia nagłówki okna, ramki, itd... wokół obrazu, żeby "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"otrzymać \"minimalne\" okno."
#: src/libvlc-module.c:379
@@@ -2281,7 -2278,7 +2461,11 @@@ msgid "
"This adds post-processing filters to enhance the picture quality, for "
"instance deinterlacing, or distort the video."
msgstr ""
++<<<<<<< HEAD
+"Ta opcja dodaje filtry przetwarzania końcowego, aby zwiększyć jakość obrazu "
++=======
+ "Ta opcja dodaje filtry przetwarzania końcowego aby zwiększyc jakośc obrazu, "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"dla anty-przeplotu, albo zniekształcić obraz."
#: src/libvlc-module.c:389
@@@ -2290,7 -2287,7 +2474,11 @@@ msgstr "Folder zrzutów obrazu wideo (l
#: src/libvlc-module.c:391
msgid "Directory where the video snapshots will be stored."
++<<<<<<< HEAD
+msgstr "Folder, w którym będą zapisywane zrzuty ekranu."
++=======
+ msgstr "Folder w którym będą zapisywane zrzuty ekranu."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:393 src/libvlc-module.c:395
msgid "Video snapshot file prefix"
@@@ -2302,7 -2299,7 +2490,11 @@@ msgstr "Format zrzutów obrazu wideo
#: src/libvlc-module.c:399
msgid "Image format which will be used to store the video snapshots"
++<<<<<<< HEAD
+msgstr "Format pliku, w którym będą zapisywane zrzuty ekranu."
++=======
+ msgstr "Format pliku w którym będą zapisywane zrzuty ekranu."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:401
msgid "Display video snapshot preview"
@@@ -2354,7 -2351,7 +2546,11 @@@ msgid "
"This forces the cropping of the source video. Accepted formats are x:y (4:3, "
"16:9, etc.) expressing the global image aspect."
msgstr ""
++<<<<<<< HEAD
+"To wymusza kadrowanie źródła obrazu. Dozwolone formaty to x:y (4:3, 16:9 "
++=======
+ "To wymusza kadrowanie źródła obrazu. Dozwolone formaty to x:y (4:3, 16:9, "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"itp.) utrzymujÄ…ce stosunek rozmiaru obrazu."
#: src/libvlc-module.c:427
@@@ -2369,11 -2366,11 +2565,19 @@@ msgid "
"y (4:3, 16:9, etc.) expressing the global image aspect, or a float value "
"(1.25, 1.3333, etc.) expressing pixel squareness."
msgstr ""
++<<<<<<< HEAD
+"To wymusza stosunek rozmiaru źródła. Na przykład niektóre płyty DVD żądają "
+"rozmiaru 16:9, gdyż są rzeczywiście w 4:3. Może to być też wskazówką dla "
+"VLC, gdy film nie posiada żadnej informacji o stosunku rozmiarów. Dozwolone "
+"formaty to x:y (4:3, 16:9 itp.) utrzymujÄ…ce stosunek rozmiaru obrazu albo "
+"liczba zmiennoprzecinkowa (1.25, 1.3333 itp.), żeby określić szerokość "
++=======
+ "To wymusza stosunek rozmiaru źródła. Na przykład, niektóre płyty DVD żądają "
+ "rozmiaru 16:9 gdyż są rzeczywiście w 4:3. Może to być też wskazówką dla VLC "
+ "gdy film nie posiada żadnej informacji o stosunku rozmiarów. Dozwolone "
+ "formaty to x:y (4:3, 16:9, itp.) utrzymujÄ…ce stosunek rozmiaru obrazu albo "
+ "liczba zmiennoprzecinkowa (1.25, 1.3333, itp.) żeby określić szerokość "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"pikseli."
#: src/libvlc-module.c:436
@@@ -2393,8 -2390,8 +2597,13 @@@ msgid "
"Scaling factor used when Auto Scaling is disabled.\n"
"Default value is 1.0 (original video size)."
msgstr ""
++<<<<<<< HEAD
+"Czynnik skalujący jest używany, gdy skalowanie automatyczne jest wyłączone.\n"
+"Domyślna wartość to 1.0 (oryginalny rozmiar video)."
++=======
+ "Czynnik skalujący jest używany gdy Auto Skalowanie jest wyłączone.\n"
+ "Domyślna wartość to 1.0 (oryginalny rozmiar video)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:445
msgid "Custom crop ratios list"
@@@ -2405,8 -2402,8 +2614,13 @@@ msgid "
"Comma separated list of crop ratios which will be added in the interface's "
"crop ratios list."
msgstr ""
++<<<<<<< HEAD
+"Lista proporcji kadrowania dzielonych przecinkiem, które będą dodane do "
+"listy proporcji kadrowania w interfejsie."
++=======
+ "Lista proporcji kadrowania dzielonych przecinkiem które będą dodane do listy "
+ "proporcji kadrowania w interfejsie."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:450
msgid "Custom aspect ratios list"
@@@ -2417,7 -2414,7 +2631,11 @@@ msgid "
"Comma separated list of aspect ratios which will be added in the interface's "
"aspect ratio list."
msgstr ""
++<<<<<<< HEAD
+"Lista stosunków rozmiaru dzielonych przecinkiem, które będą dodane do listy "
++=======
+ "Lista stosunków rozmiaru dzielonych przecinkiem które będą dodane do listy "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"stosunków rozmiaru w interfejsie."
#: src/libvlc-module.c:455
@@@ -2432,7 -2429,7 +2650,11 @@@ msgid "
msgstr ""
"To pozwala na poprawne używanie formatu obrazu HDTV-1080 nawet jeśli enkoder "
"ustalił wysokość na 1088 linijek. Powinieneś wyłączyć tą opcje tylko wtedy, "
++<<<<<<< HEAD
+"jeśli Twój obraz ma niestandardowy format potrzebujący wszystkie 1088 "
++=======
+ "jeśli twój obraz ma niestandardowy format potrzebujący wszystkie 1088 "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"linijki."
#: src/libvlc-module.c:462
@@@ -2446,10 -2443,10 +2668,17 @@@ msgid "
"order to keep proportions."
msgstr ""
"To wymusza stosunek rozmiaru monitora. Większość monitorów ma kwadratowe "
++<<<<<<< HEAD
+"piksele (1:1). Jeśli masz ekran 16:9 to możesz zmienić to na 4:3, żeby "
+"zachować proporcje."
+
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ "piksele (1:1). Jeśli masz ekran 16:9 to możesz zmienić to na 4:3 żeby "
+ "zachować proporcje."
+
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Pomijaj klatki obrazu"
@@@ -2459,7 -2456,7 +2688,11 @@@ msgid "
"computer is not powerful enough"
msgstr ""
"Ta opcja umożliwia pomijanie klatek w strumieniu MPEG2. Pomijanie klatek "
++<<<<<<< HEAD
+"zdarza się, gdy Twój komputer jest za słaby"
++=======
+ "zdarza się gdy twój komputer jest za słaby"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:473
msgid "Drop late frames"
@@@ -2506,7 -2503,7 +2739,11 @@@ msgid "
"as the DVD or VCD device, the network interface settings or the subtitle "
"channel."
msgstr ""
++<<<<<<< HEAD
+"Ta opcja pozwala na modyfikację zachowania wejść podsystemu, takich jak "
++=======
+ "Ta opcja pozwala na modyfikację zachowania wejść podsystemu takich jak "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"urządzenia DVD lub VCD, interfejs sieciowy lub kanał napisów."
#: src/libvlc-module.c:501
@@@ -2563,7 -2560,7 +2800,11 @@@ msgid "
"sources. Use this if you experience jerky playback of network streams."
msgstr ""
"Jest możliwość wyłączenia wejścia synchronizacji z zegarem dla rzeczywistych "
++<<<<<<< HEAD
+"źródeł. Użyj tego jeśli uważasz, że odtwarzanie strumieni sieciowych jest "
++=======
+ "źródeł. Użyj tego jeśli uważasz że odtwarzanie strumieni sieciowych jest "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"nierówne."
#: src/libvlc-module.c:528
@@@ -2593,12 -2590,12 +2834,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2606,7 -2603,7 +2856,11 @@@ msgid "Default
msgstr "Domyślnie"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2782,7 -2779,7 +3036,11 @@@ msgstr "Liczba powtórek wejścia
#: src/libvlc-module.c:623
msgid "Number of time the same input will be repeated"
++<<<<<<< HEAD
+msgstr "Ilość czasu, w którym to samo wejście będzie powtarzane"
++=======
+ msgstr "Ilość czasu w którym to samo wejście będzie powtarzane"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:625 modules/gui/macosx/open.m:150
msgid "Start time"
@@@ -2833,8 -2830,8 +3091,13 @@@ msgid "
"You can give a comma-separated list of inputs that will be concatenated "
"together after the normal one."
msgstr ""
++<<<<<<< HEAD
+"Możesz podać listę wejść dzieloną przecinkiem, która będzie związana razem "
+"po normalnej."
++=======
+ "Możesz podać listę wejść dzieloną przecinkiem która będzie związana razem po "
+ "normalnej."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:650
msgid "Input slave (experimental)"
@@@ -2928,8 -2925,8 +3191,13 @@@ msgid "
"section. You can also set many miscellaneous subpictures options."
msgstr ""
"Te opcje umożliwiają modyfikację zachowania podobrazów podsystemu. Możesz "
++<<<<<<< HEAD
+"dla przykładu włączyć źródła podobrazów (logo itp.). Włącz te filtry tutaj i "
+"konfiguruj je w sekcji modułów \"filtry podobrazów\". Możesz także ustawić "
++=======
+ "dla przykładu włączyć źródła podobrazów (logo, itp.). Włącz te filtry tutaj "
+ "i konfiguruj je w sekcji modułów \"filtry podobrazów\". Możesz także ustawić "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"wiele różnych opcji podobrazów."
#: src/libvlc-module.c:694 modules/gui/qt4/ui/sprefs_subtitles.h:302
@@@ -2953,7 -2950,7 +3221,11 @@@ msgid "You can completely disable the s
msgstr "Można zupełnie wyłączyć przetwarzanie podobrazow."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3012,7 -3009,7 +3284,11 @@@ msgid "
"Automatically detect a subtitle file, if no subtitle filename is specified "
"(based on the filename of the movie)."
msgstr ""
++<<<<<<< HEAD
+"Automatycznie znajduje plik napisów, jeśli nie jest podana szczególna nazwa "
++=======
+ "Automatycznie znajduje plik napisow, jesli nie jest podana szczególna nazwa "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"pliku (oparty na nazwie film)."
#: src/libvlc-module.c:727
@@@ -3033,8 -3030,8 +3309,13 @@@ msgstr "
"0 = nie szukaj napisów\n"
"1 = każdy plik z napisami\n"
"2 = każdy plik z napisami zawierający nazwę filmu\n"
++<<<<<<< HEAD
+"3 = napisy, które zawierają nazwę filmu z dodatkowymi znakami\n"
+"4 = napisy, które zawierają dokładną nazwę filmu"
++=======
+ "3 = napisy które zawierają nazwę filmu z dodatkowymi znakami\n"
+ "4 = napisy które zawierają dokładną nazwę filmu"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:737
msgid "Subtitle autodetection paths"
@@@ -3045,7 -3042,7 +3326,11 @@@ msgid "
"Look for a subtitle file in those paths too, if your subtitle file was not "
"found in the current directory."
msgstr ""
++<<<<<<< HEAD
+"Szukaj pliku napisów też w tych ścieżkach, jeżeli nie można znaleźć Twojego "
++=======
+ "Szukaj pliku napisów też w tych ścieżkach, jeżeli nie można znaleźć twojego "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"pliku z napisami w aktualnym folderze."
#: src/libvlc-module.c:742
@@@ -3231,7 -3228,7 +3516,11 @@@ msgid "
"This file contains an optional CRL to prevent remote clients from using "
"revoked certificates in TLS sessions."
msgstr ""
++<<<<<<< HEAD
+"Ten plik zawiera opcjonalną listę CRL, aby zapobiec używaniu unieważnionych "
++=======
+ "Ten plik zawiera opcjonalną listę CRL by zapobiec używaniu unieważnionych "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"certyfikatów podczas sesji TLS."
#: src/libvlc-module.c:845
@@@ -3346,9 -3343,9 +3635,15 @@@ msgid "
"try the dummy and a52 codecs before trying the other ones. Only advanced "
"users should alter this option as it can break playback of all your streams."
msgstr ""
++<<<<<<< HEAD
+"Lista kodeków, których VLC będzie używać w pierwszeństwie. Na przykład, "
+"'dummy,a52' próbuje najpierw fikcyjnego i kodeków a52 przed próbowaniem "
+"innych. Tylko zaawansowani użytkownicy powinni zmieniać tę opcję."
++=======
+ "Lista kodeków których VLC będzie używać w pierwszeństwie. Na przykład, "
+ "'dummy,a52' próbuje najpierw fikcyjnego i kodeków a52 przed próbowaniem "
+ "innych. Tylko zaawansowani użytkownicy powinni zmieniać tę opcję, ponieważ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:903
msgid "Preferred encoders list"
@@@ -3379,8 -3376,8 +3674,13 @@@ msgid "
"all streams."
msgstr ""
"Możesz podać tutaj domyślny łańcuch wyjścia strumienia. Zajrzyj do "
++<<<<<<< HEAD
+"dokumentacji, aby nauczyć się jak zbudować takie łańcuchy. Uwaga: ten "
+"łańcuch będzie aktywny dla wszystkich strumieni."
++=======
+ "dokumentacji aby nauczyć się jak zbudować takie łańcuchy. Uwaga: ten łańcuch "
+ "będzie aktywny dla wszystkich strumieni."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:923
msgid "Enable streaming of all ES"
@@@ -3396,7 -3393,7 +3696,11 @@@ msgstr "Wyświetlaj strumień podczas n
#: src/libvlc-module.c:929
msgid "Play locally the stream while streaming it."
++<<<<<<< HEAD
+msgstr "Odtwórz strumień lokalnie, gdy go strumieniujesz."
++=======
+ msgstr "Odtwórz strumień lokalnie podczas gdy go strumieniujesz."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:931
msgid "Enable video stream output"
@@@ -3431,7 -3428,7 +3735,11 @@@ msgid "
"Choose whether the SPU streams should be redirected to the stream output "
"facility when this last one is enabled."
msgstr ""
++<<<<<<< HEAD
+"Wybierz czy strumienie SPU powinny być przeadresowane do usługi wyjścia "
++=======
+ "Wybierz czy strumienie SPU powinni być przeadresowane do usługi wyjścia "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"strumienia, gdy chociaż jedna jest włączona."
#: src/libvlc-module.c:946
@@@ -3450,14 -3447,14 +3758,22 @@@ msgstr "
#: src/libvlc-module.c:952
msgid "Stream output muxer caching (ms)"
++<<<<<<< HEAD
+msgstr "Mukser buforowania strumienia wyjściowego (ms)"
++=======
+ msgstr "Muxer buforowania strumienia wyjściowego (ms)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:954
msgid ""
"This allow you to configure the initial caching amount for stream output "
"muxer. This value should be set in milliseconds."
msgstr ""
++<<<<<<< HEAD
+"To pozwala skonfigurować początkową kwotę buforowania dla muksera strumienia "
++=======
+ "To pozwala skonfigurować początkową kwotę buforowania dla muxera strumienia "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"wyjściowego. Ta wartość powinna podana być w milisekundach."
#: src/libvlc-module.c:957
@@@ -3468,7 -3465,7 +3784,11 @@@ msgstr "Preferowana lista pakietowców
msgid ""
"This allows you to select the order in which VLC will choose its packetizers."
msgstr ""
++<<<<<<< HEAD
+"To pozwala ci na wybór kolejności, w której VLC będzie wybierał pakietowce."
++=======
+ "To pozwala ci na wybór kolejności w której VLC będzie wybierał pakietowce."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:962
msgid "Mux module"
@@@ -3550,7 -3547,7 +3870,11 @@@ msgid "
msgstr ""
"Demultipleksery używane są do rozdzielenia \"podstawowych\" strumieni "
"(takich jak strumienie dźwięku i obrazu). Możesz to użyć, jeśli poprawny "
++<<<<<<< HEAD
+"demukser nie jest automatycznie wykrywany. Nie powinieneś używać tej opcji "
++=======
+ "demuxer nie jest automatycznie wykrywany. Nie powinieneś używać tej opcji "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"powszechnie, chyba że naprawdę wiesz co robisz."
#: src/libvlc-module.c:1006
@@@ -3562,8 -3559,8 +3886,13 @@@ msgid "
"You can select which VoD server module you want to use. Set this to "
"`vod_rtsp' to switch back to the old, legacy module."
msgstr ""
++<<<<<<< HEAD
+"Możesz wybrać moduł serwera VoD, którego chcesz używać. Ustaw to na "
+"`vod_rtsp', aby wrócić do starej wersji modułu."
++=======
+ "Możesz wybrać moduł serwera VoD którego chcesz używać. Ustaw to na "
+ "`vod_rtsp' aby wrócić do starej wersji modułu."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1011
msgid "Allow real-time priority"
@@@ -3578,8 -3575,8 +3907,13 @@@ msgid "
msgstr ""
"Uruchomienie VLC w priorytecie real-time pozwala na bardziej precyzyjne "
"planowanie i wykorzystanie, szczególnie dla strumieniowania zawartości. Może "
++<<<<<<< HEAD
+"jednak zawiesić cały komputer lub sprawić, że będzie naprawdę wolny. "
+"Powinieneś to aktywować, tylko gdy wiesz co robisz."
++=======
+ "jednak zawiesić cały komputer lub sprawić że będzie naprawdę wolny. "
+ "Powinieneś to aktywować tylko gdy wiesz co robisz."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1019
msgid "Adjust VLC priority"
@@@ -3700,8 -3697,8 +4034,13 @@@ msgstr "
"pożyteczne, na przykład wtedy gdy VLC połączony jest z kilkoma plikami i nie "
"życzysz sobie zawsze nowej instancji VLC, podczas otwierania pliku w "
"menedżerze plików. Ta opcja odtwarza plik w bieżącej instancji lub załącza "
++<<<<<<< HEAD
+"go do listy. Ta opcja wymaga aktywnej sesji daemona D-Bus i otwartÄ… "
+"instancję VLC, aby korzystać z interfejsu D-Bus."
++=======
+ "go do isty. Ta opcja wymaga aktywnej sesji daemona D-Bus i otwartÄ… instancjÄ™ "
+ "VLC, aby korzystać z interfejsu D-Bus."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1080
msgid "VLC is started from file association"
@@@ -3714,7 -3711,7 +4053,11 @@@ msgstr "Donieść VLC, że został uruc
#: src/libvlc-module.c:1085 modules/gui/qt4/ui/sprefs_interface.h:538
msgid "Use only one instance when started from file manager"
msgstr ""
++<<<<<<< HEAD
+"Używaj tylko jednej instancji, gdy uruchomiony został przez menedżera plików"
++=======
+ "Używaj tylko jednej instancji gdy uruchomiony został przez menedżera plików."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1087
msgid "Increase the priority of the process"
@@@ -3729,7 -3726,7 +4072,11 @@@ msgid "
"render the whole system unresponsive which might require a reboot of your "
"machine."
msgstr ""
++<<<<<<< HEAD
+"Podwyższenie priorytetu procesu, wzbogaci Twoje doznanie odtwarzania, bo "
++=======
+ "Podwyższenie priorytetu procesu, wzbogaci twoje doznanie odtwarzania, bo "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"nakazuje innym programom, które zabierają za dużo mocy procesora, nie "
"przeszkadzać VLC. Jednak uświadom sobie, że w pewnych sytuacjach (błędy) VLC "
"może zabrać całą moc procesora i spowodować całkowitą blokadę systemu, która "
@@@ -3909,7 -3906,7 +4256,11 @@@ msgstr "
"Te ustawienia są globalne skróty klawiszowe VLC, znane jako \"skróty "
"klawiszowe\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignoruj"
@@@ -3935,8 -3932,8 +4286,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4016,10 -4013,10 +4372,17 @@@ msgid "Slower (fine)
msgstr "Wolniej (delikatnie)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4032,10 -4029,10 +4395,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Wybierz klawisz dla przeskoku następnej pozycji w liście odtwarzania."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Poprzedni"
@@@ -4045,9 -4042,9 +4415,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"Wybierz klawisz dla przeskoku poprzedniej pozycji w liście odtwarzania."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4172,7 -4169,7 +4548,11 @@@ msgstr "Długość dużego przeskoku
#: src/libvlc-module.c:1268
msgid "Long jump length, in seconds."
++<<<<<<< HEAD
+msgstr "Długość dużego przeskoku, w sekundach."
++=======
+ msgstr "Długość dużego przeskoku, w sekundach"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1270 modules/control/hotkeys.c:159
#: modules/gui/qt4/components/controller.hpp:119
@@@ -4282,9 -4279,9 +4662,15 @@@ msgid "Select the key to decrease audi
msgstr "Wybierz klawisz dla zmniejszenia głośności."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Wycisz"
@@@ -4710,7 -4707,7 +5096,11 @@@ msgstr "Przewijanie dostępnych urządz
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Zrzut ekranu"
@@@ -4915,12 -4912,12 +5305,21 @@@ msgstr "Pobieranie ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Anuluj"
@@@ -5686,7 -5683,7 +6085,11 @@@ msgstr "Kadrowanie
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Stosunek rozmiarów"
@@@ -5808,7 -5805,7 +6211,11 @@@ msgid "
"This Blu-ray Disc needs a library for AACS decoding, and your system does "
"not have it."
msgstr ""
++<<<<<<< HEAD
+"Ta płyta Blu-ray wymaga biblioteki do dekodowania AACS, a Twój system jej "
++=======
+ "Ta płyta Blu-ray wymaga biblioteki do dekodowania AACS, a twój system jej "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"nie posiada."
#: modules/access/bluray.c:272
@@@ -5844,7 -5841,7 +6251,11 @@@ msgid "
"This Blu-ray Disc needs a library for BD+ decoding, and your system does not "
"have it."
msgstr ""
++<<<<<<< HEAD
+"Ta płyta Blu-ray wymaga biblioteki do dekodowania BD+, a Twój system jej nie "
++=======
+ "Ta płyta Blu-ray wymaga biblioteki do dekodowania BD+, a twój system jej nie "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"posiada."
#: modules/access/bluray.c:308
@@@ -6059,8 -6056,8 +6470,13 @@@ msgid "
"Name of the video device that will be used by the DirectShow plugin. If you "
"don't specify anything, the default device will be used."
msgstr ""
++<<<<<<< HEAD
+"Nazwa urządzenia obrazu, które ma być używane przez wtyczkę DirectShow. "
+"Jeśli nic nie podałeś, to będzie używane urządzenie domyślne."
++=======
+ "Nazwa urządzenia obrazu które ma być używane przez wtyczkę DirectShow. Jeśli "
+ "nic nie podałeś to będzie używane urządzenie domyślne."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:135
#: modules/gui/qt4/components/open_panels.cpp:812
@@@ -6073,8 -6070,8 +6489,13 @@@ msgid "
"Name of the audio device that will be used by the DirectShow plugin. If you "
"don't specify anything, the default device will be used. "
msgstr ""
++<<<<<<< HEAD
+"Nazwa urządzenia dźwięku, które ma być używane przez wtyczkę DirectShow. "
+"Jeśli nic nie podałeś, to będzie używane urządzenie domyślne."
++=======
+ "Nazwa urządzenia dźwięku które ma być używane przez wtyczkę DirectShow. "
+ "Jeśli nic nie podałeś to będzie używane urządzenie domyślne."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:140
#: modules/gui/qt4/components/open_panels.cpp:779
@@@ -6088,7 -6085,7 +6509,11 @@@ msgid "
"can specify a standard size (cif, d1, ...) or <width>x<height>."
msgstr ""
"Rozmiar obrazu, który będzie wyświetlany przez wtyczkę DirectShow. Jeśli nic "
++<<<<<<< HEAD
+"nie podałeś, to będzie używany domyślny rozmiar dla Twojego urządzenia. "
++=======
+ "nie podałeś to będzie używany domyślny rozmiar dla twojego urządzenia. "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Możesz podać standardowy rozmiar (cif, d1, ...) lub <szerokość>x<wysokość>."
#: modules/access/dshow/dshow.cpp:145 modules/access/v4l2/v4l2.c:196
@@@ -6109,7 -6106,7 +6534,11 @@@ msgid "
"(default), RV24, etc.)"
msgstr ""
"Wymuś używanie specjalnego formatu chromy dla wyjścia obrazu DirectShow (np. "
++<<<<<<< HEAD
+"I420 (domyślny), RV24 itp.)"
++=======
+ "I420 (domyślny), RV24, itp.)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:151
msgid "Video input frame rate"
@@@ -6121,7 -6118,7 +6550,11 @@@ msgid "
"default, 25, 29.97, 50, 59.94, etc.)"
msgstr ""
"Wymuś używanie specjalnej liczby klatek dla wejścia obrazu DirectShow (np. 0 "
++<<<<<<< HEAD
+"to domyślna, 25, 29.97, 50, 59.94 itp.)"
++=======
+ "to domyślna, 25, 29.97, 50, 59.94, itp.)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:155
msgid "Device properties"
@@@ -6171,7 -6168,7 +6604,11 @@@ msgid "
"Set the tuner country code that establishes the current channel-to-frequency "
"mapping (0 means default)."
msgstr ""
++<<<<<<< HEAD
+"Ustaw kod kraju tunera, który zgadza się z # bieżącymi frekwencjami kanałów "
++=======
+ "Ustaw kod kraju tunera który zgadza się z # bieżącymi frekwencjami kanałów "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"(0 to domyślny)."
#: modules/access/dshow/dshow.cpp:173
@@@ -6193,10 -6190,10 +6630,17 @@@ msgid "
"\"Device config\" area, and use those numbers here. -1 means that settings "
"will not be changed."
msgstr ""
++<<<<<<< HEAD
+"Wybierz źródło wejścia obrazu, takie jak composite, s-video lub tuner. Skoro "
+"te ustawienia są powiązane ze sprzętem, powinieneś znaleźć dobre ustawienia "
+"w miejscu \"Konfiguracja urządzenia\", i używać tych liczb tutaj. -1 "
+"oznacza, że ustawienia nie będą zmieniane."
++=======
+ "Wybierz źródło wejścia obrazu, takie jak composite, s-video, lub tuner. "
+ "Skoro te ustawienia są powiązane ze sprzętem, powinieneś znaleźć dobre "
+ "ustawienia w miejscu \"Konfiguracja urządzenia\", i używać tych liczb tutaj. "
+ "-1 oznacza że ustawienia nie będą zmieniane."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:182
msgid "Audio input pin"
@@@ -6286,7 -6283,7 +6730,11 @@@ msgstr "Żadne urządzenie audio ani wi
msgid "VLC cannot open ANY capture device. Check the error log for details."
msgstr ""
"VLC nie może otworzyć jakiegokolwiek urządzenia przechwytywania. Sprawdź "
++<<<<<<< HEAD
+"dziennik błędów, aby uzyskać szczegóły."
++=======
+ "dziennik błędów by uzyskać szczegóły."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:1049
msgid ""
@@@ -6702,7 -6699,7 +7150,11 @@@ msgstr "Kod zakresu satelity
#: modules/access/dtv/access.c:228
msgid "Satellite range code as defined by manufacturer e.g. DISEqC switch code"
msgstr ""
++<<<<<<< HEAD
+"Kod satelitarnego zasięgu, tak jak zdefiniowany przez producenta np. DISEqC "
++=======
+ "Kod satelitarnego zasięgu tak jak zdefiniowany przez producenta np. DISEqC "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"switch code"
#: modules/access/dtv/access.c:232
@@@ -7040,7 -7037,7 +7492,11 @@@ msgstr "Hasło proxy HTTP
#: modules/access/http.c:72
msgid "If your HTTP proxy requires a password, set it here."
++<<<<<<< HEAD
+msgstr "Jeśli Twój HTTP proxy wymaga podania hasła, ustaw je tutaj."
++=======
+ msgstr "Jeśli twój HTTP proxy wymaga podania hasła, ustaw je tutaj."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/http.c:74
msgid "Auto re-connect"
@@@ -7215,7 -7212,7 +7671,11 @@@ msgstr "Liczba klatek obrazu podstawowe
#: modules/access/imem.c:97
msgid "Callback cookie string"
++<<<<<<< HEAD
+msgstr "Ciąg ciasteczek wywołań zwrotnych"
++=======
+ msgstr "String ciasteczek wywołań zwrotnych"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/imem.c:99
msgid "Text identifier for the callback functions"
@@@ -7478,15 -7475,16 +7938,28 @@@ msgid "
"You can choose to select all of them."
msgstr ""
"Strumienie MMS mogą zawierać kilka podstawowych strumieni, z różnymi "
++<<<<<<< HEAD
+"bitrate. Możesz wybrać je wszystkie."
+
+#: modules/access/mms/mms.c:54
+msgid "Maximum bitrate"
+msgstr "Maksymalny bitrate"
+
+#: modules/access/mms/mms.c:56
+msgid "Select the stream with the maximum bitrate under that limit."
+msgstr "Wybierz strumień z maksymalną wartością bitrate w ramach tego limitu."
++=======
+ "wartościami bitowymi. Możesz wybrać je wszystkie."
+
+ #: modules/access/mms/mms.c:54
+ msgid "Maximum bitrate"
+ msgstr "Maksymalna przepływność"
+
+ #: modules/access/mms/mms.c:56
+ msgid "Select the stream with the maximum bitrate under that limit."
+ msgstr ""
+ "Wybierz strumień z maksymalną wartością przepływności w ramach tego limitu."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/mms/mms.c:60
msgid ""
@@@ -7574,7 -7572,7 +8047,11 @@@ msgstr "Dołącz do pliku
#: modules/access_output/file.c:69
msgid "Append to file if it exists instead of replacing it."
++<<<<<<< HEAD
+msgstr "Dołącz do pliku jeżeli już istnieje zamiast go zastąpić."
++=======
+ msgstr "Dołącz do pliku jeżeli już istnieje zamiast go zastąpić"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/file.c:71
msgid "Format time and date"
@@@ -7619,7 -7617,7 +8096,11 @@@ msgstr "Nazwa użytkownika
#: modules/access_output/http.c:52 modules/stream_out/rtp.c:178
msgid "User name that will be requested to access the stream."
++<<<<<<< HEAD
+msgstr "Nazwa użytkownika, która będzie wymagana dla dostępu strumienia."
++=======
+ msgstr "Nazwa użytkownika która będzie wymagana dla dostępu strumienia."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/http.c:54 modules/access/vnc.c:47
#: modules/gui/macosx/coredialogs.m:60 modules/gui/macosx/simple_prefs.m:314
@@@ -7632,7 -7630,7 +8113,11 @@@ msgstr "Hasło
#: modules/access_output/http.c:55 modules/stream_out/rtp.c:181
msgid "Password that will be requested to access the stream."
++<<<<<<< HEAD
+msgstr "Hasło, które będzie wymagane dla dostępu strumienia."
++=======
+ msgstr "Hasło która będzie wymagane dla dostępu strumienia."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/http.c:57 modules/demux/playlist/qtl.c:241
#: modules/demux/playlist/shoutcast.c:324
@@@ -7772,7 -7770,7 +8257,11 @@@ msgstr "Opis strumienia
#: modules/access_output/shout.c:69
msgid "Description of the stream content or information about your channel."
++<<<<<<< HEAD
+msgstr "Opis zawartości strumienia lub informacje o Twoim kanale."
++=======
+ msgstr "Opis zawartości strumienia lub informacje o twoim kanale."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/shout.c:72
msgid "Stream MP3"
@@@ -7805,7 -7803,7 +8294,11 @@@ msgstr "Adres URL z informacjami na tem
#: modules/access_output/shout.c:93
msgid "Bitrate information of the transcoded stream. "
++<<<<<<< HEAD
+msgstr "Informacja o bitrate transkodowanego strumienia."
++=======
+ msgstr "Informacja przepływności bitowej transkodowanego strumienia."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/shout.c:96
msgid "Samplerate information of the transcoded stream. "
@@@ -7838,7 -7836,7 +8331,11 @@@ msgid "
"information specified for shoutcast. Requires Ogg streaming for icecast."
msgstr ""
"Ogólnie udostępnij serwera na 'Yellow Pages' (zawartość katalogu strumieni) "
++<<<<<<< HEAD
+"na stronie icecast/shoutcast. Wymaga informacje o bitrate określone dla "
++=======
+ "na stronie icecast/shoutcast. Wymaga informacje przepływności określone dla "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"shoutcast. Wymaga strumieniowanie Ogg dla icecast."
#: modules/access_output/shout.c:111
@@@ -7976,7 -7974,7 +8473,11 @@@ msgid "
"RTP packets will be authenticated and deciphered with this Secure RTP master "
"shared secret key. This must be a 32-character-long hexadecimal string."
msgstr ""
++<<<<<<< HEAD
+"Pakiety RTP będą uwierzytelnione i odcyfrowane z tym wspólnym tajnym kluczem "
++=======
+ "Pakiety RTP będa uwierzytelnione i odcyfrowane z tym wspólnym tajnym kluczem "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"mastera Secure RTP. Musi to być 32-znakowy ciąg szesnastkowy."
#: modules/access/rtp/rtp.c:56 modules/stream_out/rtp.c:154
@@@ -8169,7 -8167,7 +8670,11 @@@ msgstr "Wejście ekranu
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Ekran"
@@@ -8341,7 -8339,7 +8846,11 @@@ msgstr "Domena SMB
#: modules/access/smb.c:63
msgid "Domain/Workgroup that will be used for the connection."
++<<<<<<< HEAD
+msgstr "Domena/Grupa Robocza, która będzie używana dla połączenia."
++=======
+ msgstr "Domena/Grupa Robocza która będzie używana dla połączenia."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/smb.c:66
msgid "Samba (Windows network shares) input"
@@@ -8920,7 -8918,7 +9429,11 @@@ msgstr "Maks. głośność #
msgid "Volume Set"
msgstr "Ustawiona głośność"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9332,9 -9330,9 +9845,15 @@@ msgid "
"disturbing for the synchronization between lips-movement and speech. In "
"case, turn this on to compensate."
msgstr ""
++<<<<<<< HEAD
+"Opóźnienie, które zostaje wywoływane przez algorytm fizyczny, może czasami "
+"przeszkadzać w synchronizacji miedzy ruchami ust i mową. W tym wypadku "
+"uruchom tą opcję, aby to wyrównywać."
++=======
+ "Opóźnienie które zostaje wywoływane przez algorytm fizyczny, może czasami "
+ "przeszkadzać w synchronizacji miedzy ruchami ust i mową. W tym wypadku "
+ "uruchom tą opcje aby to wyrównywać."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/channel_mixer/headphone.c:69
msgid "No decoding of Dolby Surround"
@@@ -9663,7 -9661,7 +10182,11 @@@ msgstr "Ustaw globalne wzmocnienie w d
#: modules/audio_filter/equalizer.c:80
msgid "Equalizer with 10 bands"
++<<<<<<< HEAD
+msgstr "Korektor dziesięciopasmowy"
++=======
+ msgstr "Korektor dziesieciopasmowy"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/equalizer_presets.h:40
msgid "Flat"
@@@ -9776,8 -9774,8 +10299,13 @@@ msgid "
"A higher number of buffers will increase the response time of the filter to "
"a spike but will make it less sensitive to short variations."
msgstr ""
++<<<<<<< HEAD
+"To jest ilość buforów dźwięku, na których będzie mierzona wartość przebiegu. "
+"Większa ilość buforów zmniejsza czas odpowiedzi filtra na wartość szczytową, "
++=======
+ "To jest ilość buforów dźwięku na których będzie mierzona wartość przebiegu. "
+ "Większa ilość buforów zmniejsza czas odpowiedzi filtra na wartość szczytową "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"ale filtr staje się mniej wrażliwy na krótkie zmiany."
#: modules/audio_filter/normvol.c:71
@@@ -10106,7 -10104,7 +10634,11 @@@ msgstr "Dźwięk przestrzenny 7.1
msgid "ALSA audio output"
msgstr "Wyjście dźwiękowe ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Błąd wyjścia dźwiękowego"
@@@ -10139,7 -10137,7 +10671,11 @@@ msgstr "Wyjście dźwiękowe AudioQueu
msgid "Android AudioTrack audio output"
msgstr "Wyjście audio Android AudioTrack"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "Wyjście AudioUnit dla iOS"
@@@ -10147,34 -10145,34 +10683,61 @@@
msgid "Last audio device"
msgstr "Ostatnie urzÄ…dzenie audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Wyjście HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Wyjście HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Wybrane urządzenie wyjściowe dźwięku jest wyłącznie używane przez inny "
"program."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Urządzenie dźwiękowe nie jest skonfigurowane"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Urządzenie dźwiękowe nie jest skonfigurowane"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+"Skonfiguruj swój układ głośników narzędziem \"Audio Midi Setup\" w /"
+"Aplikacje/Narzędzia. VLC używa tylko stereo."
+
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Urządzenie wyjściowe dźwięku systemowego"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ "Skonfiguruj twój układ głośników narzędziem \"Audio Midi Setup\" w /"
+ "Aplikacje/Narzędzia. VLC używa tylko stereo."
+
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Urządzenie wyjściowe dźwięku systemowego"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Kodowane Wyjście)"
@@@ -10220,7 -10218,7 +10783,11 @@@ msgid "
"By default (0), all the channels of the incoming will be saved but you can "
"restrict the number of channels here."
msgstr ""
++<<<<<<< HEAD
+"Domyślnie (0), wszystkie nadchodzące kanały będą zapisywane, ale możesz "
++=======
+ "Domyślnie (0), wszystkie nadchodzące kanały będą zapisywane ale możesz "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"ograniczać tutaj ilość tych kanałów."
#: modules/audio_output/file.c:86
@@@ -10265,7 -10263,7 +10832,11 @@@ msgid "
"If automatic connection is enabled, only JACK clients whose names match this "
"regular expression will be considered for connection."
msgstr ""
++<<<<<<< HEAD
+"Jeśli aktywne jest automatyczne łączenie, tylko klienci JACK, których nazwy "
++=======
+ "Jeśli aktywne jest automatyczne łączenie, tylko klienty JACK, których nazwy "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"pasują do tego regularnego wyrażenia, będą rozważane dla połączenia."
#: modules/audio_output/jack.c:97
@@@ -10288,7 -10286,8 +10859,12 @@@ msgstr "Otwórz dźwiÄ™k w trybie wyÅ‚Ä
msgid ""
"Enable this option if you want your audio not to be interrupted by the other "
"audio."
++<<<<<<< HEAD
+msgstr "Włącz tę opcję, aby Twój dźwięk nie został zakłócany przez inny."
++=======
+ msgstr ""
+ "Włącz tę opcję, aby twój dźwięk nie został zakłócany przez inny dźwięk."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/kai.c:110
msgid "K Audio Interface audio output"
@@@ -10455,9 -10454,9 +11031,15 @@@ msgid "
"Valid values range from 0 to 4 (0 disables all errors resilience)."
msgstr ""
"libavcodec może rozpoznawać błędy.\n"
++<<<<<<< HEAD
+"Jednakże z błędnym koderem (np. ISO MPEG-4 od M$) może to wywołać dużo "
+"błędów\n"
+"Poprawne wartości od 0 do 4 (0 wyłącza jakiekolwiek rozpoznawanie błędów)."
++=======
+ "Jednakże, z błędnym koderem (np. ISO MPEG-4 od M$) może to wywołać dużo "
+ "błędów\n"
+ "Porpawne wartości od 0 do 4 (0 wyłącza jakiekolwiek rozpoznawanie błędów)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:79
msgid "Workaround bugs"
@@@ -10636,11 -10635,11 +11218,19 @@@ msgstr "
#: modules/codec/avcodec/avcodec.h:158
msgid "Video bitrate tolerance"
++<<<<<<< HEAD
+msgstr "Tolerancja bitrate obrazu"
+
+#: modules/codec/avcodec/avcodec.h:159
+msgid "Video bitrate tolerance in kbit/s."
+msgstr "Tolerancja bitrate obrazu w kbit/s."
++=======
+ msgstr "Tolerancja przepływności obrazu"
+
+ #: modules/codec/avcodec/avcodec.h:159
+ msgid "Video bitrate tolerance in kbit/s."
+ msgstr "Tolerancja przepływności obrazu w kbit/s."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:161
msgid "Interlaced encoding"
@@@ -10711,7 -10710,7 +11301,11 @@@ msgid "
"bitrate, at the expense of lower quality frames."
msgstr ""
"Włącz prosty algorytm redukcji szumów, aby obniżyć długość kodowania i "
++<<<<<<< HEAD
+"bitrate, kosztem klatek niższej jakości."
++=======
+ "przepływności, kosztem klatek niższej jakości."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:192
msgid "MPEG4 quantization matrix"
@@@ -10907,7 -10906,7 +11501,11 @@@ msgstr "
"Wydaje się że twoja instalacja Libav/FFmpeg (libavcodec) nie ma "
"następującego kodera:\n"
"%s.\n"
++<<<<<<< HEAD
+"Jeśli nie wiesz jak rozwiązać ten problem, zwrócić się o wsparcie do Twojego "
++=======
+ "Jeśli nie wiesz jak rozwiązać ten problem, zwrócić się o wsparcie do twojego "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"dystrybutora.\n"
"\n"
"To nie jest błąd wewnątrz VLC media playera.\n"
@@@ -10987,15 -10986,15 +11585,27 @@@ msgstr "Stały współczynnik jakości
#: modules/codec/dirac.c:62
msgid "If bitrate=0, use this value for constant quality"
++<<<<<<< HEAD
+msgstr "Jeśli bitrate=0, zastosuj tą wartość dla stałej jakości"
+
+#: modules/codec/dirac.c:65 modules/codec/schroedinger.c:117
+msgid "CBR bitrate (kbps)"
+msgstr "Stały bitrate (kbps)"
+
+#: modules/codec/dirac.c:66
+msgid "A value > 0 enables constant bitrate mode"
+msgstr "Wartość > 0 włącza tryb stałego bitrate"
++=======
+ msgstr "Jeśli przepływność=0, zastosuj tą wartość dla stałej jakości"
+
+ #: modules/codec/dirac.c:65 modules/codec/schroedinger.c:117
+ msgid "CBR bitrate (kbps)"
+ msgstr "Stała przepływność (kbps)"
+
+ #: modules/codec/dirac.c:66
+ msgid "A value > 0 enables constant bitrate mode"
+ msgstr "Wartość > 0 włącza tryb stałej przepływności"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/dirac.c:69
msgid "Enable lossless coding"
@@@ -11006,8 -11005,8 +11616,13 @@@ msgid "
"Lossless coding ignores bitrate and quality settings, allowing for perfect "
"reproduction of the original"
msgstr ""
++<<<<<<< HEAD
+"Bezstratne kodowanie ignoruje bitrate i ustawienia jakości, co pozwala na "
+"idealne odtworzenie oryginału"
++=======
+ "Bezstratne kodowanie ignoruje przepływność i ustawienia jakości, co pozwala "
+ "na idealne odtworzenie oryginału"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/dirac.c:74 modules/codec/schroedinger.c:134
msgid "Prefilter"
@@@ -11184,7 -11183,8 +11799,12 @@@ msgstr "Wyłącz kodowanie arytmetyczne
#: modules/codec/dirac.c:179 modules/codec/schroedinger.c:256
msgid "Use variable length codes instead, useful for very high bitrates"
++<<<<<<< HEAD
+msgstr "Użyj kodów o zmiennej długości, przydatne dla bardzo wysokich bitrate"
++=======
+ msgstr ""
+ "Użyj kodów o zmiennej długości, przydatne dla bardzo wysokich przepływności"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/dirac.c:184
msgid "cycles per degree"
@@@ -11446,7 -11446,7 +12066,11 @@@ msgid "
msgstr ""
"Strumienie Kate pozwalają na formatowanie tekstu. VLC częściowo realizuje "
"to, ale możesz wyłączyć wszystkie formatowania. Zauważ, że nie ma to żadnego "
++<<<<<<< HEAD
+"wpływu, jeśli włączone jest renderowanie Tigera."
++=======
+ "wpływu jeśli włączone jest renderowanie Tigera."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/kate.c:202
msgid "Shadow"
@@@ -11456,46 -11456,46 +12080,74 @@@ msgstr "Cień
msgid "Outline"
msgstr "Kontury"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Czarny"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Szary"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Srebrny"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Biały"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Kasztanowy"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Czerwony"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11503,61 -11503,61 +12155,97 @@@ msgid "Fuchsia
msgstr "Fuksja"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Żółty"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Oliwkowy"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Zielony"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Akwamaryna"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lime"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Purpurowy"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Niebieski-Navy"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Niebieski"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11620,7 -11620,7 +12308,11 @@@ msgid "
"font parameters where appropriate."
msgstr ""
"Używany opis czcionek, jeśli strumień Kate nie określa poszczególnych "
++<<<<<<< HEAD
+"parametrów czcionki (nazwa, rozmiar itp.). W razie potrzeby, pusta nazwa "
++=======
+ "parametrów czcionki (nazwa, rozmiar, itp.). W razie potrzeby, pusta nazwa "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"pozwoli na wybór parametrów czcionki przez Tigera."
#: modules/codec/kate.c:240
@@@ -11709,7 -11709,7 +12401,11 @@@ msgstr "Napisy (zaawansowane)
msgid "Subtitle renderers using libass"
msgstr "Rendery napisów używające libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Aktualizacja podręcznej pamięci czcionek"
@@@ -11800,8 -11800,8 +12496,13 @@@ msgid "
"'high'"
msgstr ""
"Określ jawnie profil kodeka. Jeśli tego nie zrobisz, kodek określi "
++<<<<<<< HEAD
+"odpowiedni profil z innych źródeł, takich jak rozdzielczość i bitrate. Np. "
+"'wysoki'"
++=======
+ "odpowiedni profil z innych źródeł, takich jak rozdzielczość i przepływność. "
+ "Np. 'wysoki'"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:67
msgid "Codec Level"
@@@ -11814,8 -11814,8 +12515,13 @@@ msgid "
"'4.2' for mpeg4-part10 or 'low' for mpeg2"
msgstr ""
"Określ jawnie poziom kodeka. Jeśli tego nie zrobisz, kodek określi "
++<<<<<<< HEAD
+"odpowiedni profil z innych źródeł, takich jak rozdzielczość i bitrate. Np. "
+"'4.2' dla mpeg4-part10 lub 'niski' dla mpeg2"
++=======
+ "odpowiedni profil z innych źródeł, takich jak rozdzielczość i przepływność. "
+ "Np. '4.2' dla mpeg4-part10 lub 'niski' dla mpeg2"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:73
msgid "Group of Picture size"
@@@ -11872,7 -11872,7 +12578,11 @@@ msgid "
msgstr ""
"Dla H.264, IdrInterval określa interwał IDR-klatki w zakresie I-klatek; "
"jeśli IdrInterval=0, to każda I-klatka jest IDR-klatą. Jeśli IdrInterval=1, "
++<<<<<<< HEAD
+"to każda następna I-klatka jest IDR-klatą itp. Dla MPEG2, IdrInterval "
++=======
+ "to każda następna I-klatka jest IDR-klatą, itp. Dla MPEG2, IdrInterval "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"określa nagłówka sekwencji w zakresie I-klatek. Jeśli IdrInterval=N, SDK "
"wstawia nagłówek sekwencji przed każdych n-tych I-klatek. Jeśli "
"IdrInterval=0 (domyślnie), SDK wstawia nagłówek sekwencji na początku "
@@@ -11902,7 -11902,7 +12612,11 @@@ msgid "
msgstr ""
"Parametr kwantyzacji dla wszystkich typów klatek. Te parametry ustawiają "
"qpi, qpp i qpp. Ma mniejszy priorytet niż wyżej wymienione parametry. "
++<<<<<<< HEAD
+"Używany tylko, gdy rc_method jest 'qp'."
++=======
+ "Używany tylko gdy rc_method jest 'qp'."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:110
msgid "Quantization parameter for I-frames"
@@@ -11914,7 -11914,7 +12628,11 @@@ msgid "
"globally. Used only if rc_method is 'qp'."
msgstr ""
"Parametr kwantyzacji dla I-klatek. Ten parametr zastępuje globalnie dowolny "
++<<<<<<< HEAD
+"zestaw qp. Używany tylko, gdy rc_method jest 'qp'."
++=======
+ "zestaw qp. Używany tylko gdy rc_method jest 'qp'."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:114
msgid "Quantization parameter for P-frames"
@@@ -11926,7 -11926,7 +12644,11 @@@ msgid "
"globally. Used only if rc_method is 'qp'."
msgstr ""
"Parametr kwantyzacji dla P-klatek. Ten parametr zastępuje globalnie dowolny "
++<<<<<<< HEAD
+"zestaw qp. Używany tylko, gdy rc_method jest 'qp'."
++=======
+ "zestaw qp. Używany tylko gdy rc_method jest 'qp'."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:118
msgid "Quantization parameter for B-frames"
@@@ -11938,11 -11938,11 +12660,19 @@@ msgid "
"globally. Used only if rc_method is 'qp'."
msgstr ""
"Parametr kwantyzacji dla B-klatek. Ten parametr zastępuje globalnie dowolny "
++<<<<<<< HEAD
+"zestaw qp. Używany tylko, gdy rc_method jest 'qp'."
+
+#: modules/codec/qsv.c:122
+msgid "Maximum Bitrate"
+msgstr "Maksymalny bitrate"
++=======
+ "zestaw qp. Używany tylko gdy rc_method jest 'qp'."
+
+ #: modules/codec/qsv.c:122
+ msgid "Maximum Bitrate"
+ msgstr "Maksymalna przepływność"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:123
msgid ""
@@@ -11950,9 -11950,9 +12680,15 @@@
"method. If not set, this parameter. is computed from other sources such as "
"bitrate, profile, level, etc."
msgstr ""
++<<<<<<< HEAD
+"Określa maksymalny bitrate w Kpbs (1000bitów /s) dla funkcji Rate Control "
+"metodą VBR. Jeśli nie jest ustawiony, parametr zostanie obliczany z innych "
+"źródeł, takich jak bitrate, profil, poziom itd."
++=======
+ "Określa maksymalną przepływność w Kpbs (1000bitów /s) dla funkcji Rate "
+ "Control metodą VBR. Jeśli nie jest ustawiony, parametr zostanie obliczany z "
+ "innych źródeł, takich jak przepływności, profilu, poziomu, itd."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:127
msgid "Accuracy of RateControl"
@@@ -11965,10 -11965,10 +12701,17 @@@ msgid "
"880 kpbs and under 730 kpbs. The targeted accuracy is only reached after a "
"certained convergence period. See the convergence parameter"
msgstr ""
++<<<<<<< HEAD
+"Tolerancja metody 'avbr' (średnia zmiennego bitrate) w procentach. (Np. 10 w "
+"bitrate 800 kpbs oznacza, że koder nie próbuje przejść powyżej 880 kpbs i "
+"poniżej 730 kpbs.) Skierowana dokładność osiągana jest tylko po pewnym "
+"okresie konwergencji. Zobacz parametr konwergencji."
++=======
+ "Tolerancja metody 'avbr' (średnia zmiennej przepływności) w procentach. (np. "
+ "10 w przepływności 800 kpbs oznacza że koder nie próbuje przejść powyżej 880 "
+ "kpbs i poniżej 730 kpbs. Skierowana dokładność osiągana jest tylko po po "
+ "pewnym okresie konwergencji. Zobacz parametr konwergencji."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:134
msgid "Convergence time of 'avbr' RateControl"
@@@ -11980,7 -11980,7 +12723,11 @@@ msgid "
"requested bitrate with the requested accuracy. See the accuracy parameter. "
msgstr ""
"Liczba 100 klatek metody funkcji 'avbr' RateControl przed osiągnięciem "
++<<<<<<< HEAD
+"pożądanego bitrate z wymaganą dokładnością. Zobacz parametr dokładności."
++=======
+ "pożądanej przepływności z wymaganą dokładnością. Zobacz parametr dokładności."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:139
msgid "Number of slices per frame"
@@@ -12046,7 -12046,7 +12793,11 @@@ msgstr "Tryb stałego progu szumów
#: modules/codec/schroedinger.c:78
msgid "Constant bitrate mode (CBR)"
++<<<<<<< HEAD
+msgstr "Stały bitrate kodowania (CBR)"
++=======
+ msgstr "Stałą przepływność kodowania (CBR)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:79
msgid "Low Delay mode"
@@@ -12110,23 -12110,26 +12861,46 @@@ msgstr "Próg szumu używany w trybie s
#: modules/codec/schroedinger.c:118
msgid "Target bitrate in kbps when encoding in constant bitrate mode"
++<<<<<<< HEAD
+msgstr "Docelowy bitrate w kbps jeśli kodujesz w trybie stałego bitrate"
+
+#: modules/codec/schroedinger.c:121
+msgid "Maximum bitrate (kbps)"
+msgstr "Maksymalny bitrate (kbps)"
+
+#: modules/codec/schroedinger.c:122
+msgid "Maximum bitrate in kbps when encoding in constant bitrate mode"
+msgstr "Maksymalny bitrate w kbps podczas kodowania w trybie stałego bitrate"
+
+#: modules/codec/schroedinger.c:125
+msgid "Minimum bitrate (kbps)"
+msgstr "Minimalny bitrate (kbps)"
+
+#: modules/codec/schroedinger.c:126
+msgid "Minimum bitrate in kbps when encoding in constant bitrate mode"
+msgstr "Minimalny bitrate w kbps podczas kodowania trybie w stałego bitrate"
++=======
+ msgstr ""
+ "Docelowa przepływność w kbps jeśli kodujesz w trybie stałej przepływności"
+
+ #: modules/codec/schroedinger.c:121
+ msgid "Maximum bitrate (kbps)"
+ msgstr "Maksymalna przepływność (kbps)"
+
+ #: modules/codec/schroedinger.c:122
+ msgid "Maximum bitrate in kbps when encoding in constant bitrate mode"
+ msgstr ""
+ "Maksymalna przepływność w kbps gdy kodowanie w stałej przepływności kodowania"
+
+ #: modules/codec/schroedinger.c:125
+ msgid "Minimum bitrate (kbps)"
+ msgstr "Minimalna przepływność (kbps)"
+
+ #: modules/codec/schroedinger.c:126
+ msgid "Minimum bitrate in kbps when encoding in constant bitrate mode"
+ msgstr ""
+ "Minimalna przepływność w kbps gdy kodowanie w stałej przepływności kodowania"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:129
msgid "GOP length"
@@@ -12348,11 -12351,11 +13122,19 @@@ msgstr "Wymuś kompleksowość kodera.
#: modules/codec/speex.c:71
msgid "Maximal bitrate"
++<<<<<<< HEAD
+msgstr "Maksymalny bitrate"
+
+#: modules/codec/speex.c:73
+msgid "Enforce the maximal VBR bitrate"
+msgstr "WymuÅ› maksymalny bitrate VBR"
++=======
+ msgstr "Maksymalna przepływność"
+
+ #: modules/codec/speex.c:73
+ msgid "Enforce the maximal VBR bitrate"
+ msgstr "Wymuś maksymalną przepływność VBR"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/speex.c:75 modules/codec/vorbis.c:181
msgid "CBR encoding"
@@@ -12363,8 -12366,8 +13145,13 @@@ msgid "
"Enforce a constant bitrate encoding (CBR) instead of default variable "
"bitrate encoding (VBR)."
msgstr ""
++<<<<<<< HEAD
+"Wymuś stały bitrate kodowania (CBR) zamiast domyślnego zmiennego bitrate "
+"kodowania (VBR)."
++=======
+ "Wymuś stałą przepływność kodowania (CBR) zamiast domyślnej zmiennej "
+ "przepływności kodowania (VBR)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/speex.c:80
msgid "Voice activity detection"
@@@ -12701,7 -12704,7 +13488,11 @@@ msgid "
"autodetect from TS, 0 = autodetect from teletext, >0 = actual page number, "
"usually 888 or 889)."
msgstr ""
++<<<<<<< HEAD
+"Zastąp wskazaną stronę, spróbuj to, jeśli Twoje napisy nie pojawiają się (-1 "
++=======
+ "Zastąp wskazaną stronę, spróbuj to, jeśli twoje napisy nie pojawiają się (-1 "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"= automatyczne wykrycie z TS, 0 = automatyczne wykrycie z telegazety, >0 = "
"bieżący numer strony, zazwyczaj 888 lub 889)."
@@@ -12712,7 -12715,7 +13503,11 @@@ msgstr "Zignoruj flagę napisów
#: modules/codec/telx.c:61
msgid "Ignore the subtitle flag, try this if your subtitles don't appear."
msgstr ""
++<<<<<<< HEAD
+"Ignoruj flagę napisów, spróbuj tego, jeśli Twoje napisy nie pojawiają się."
++=======
+ "Ignoruj flagę napisów, spróbuj tego, jeśli twoje napisy nie pojawiają się."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/telx.c:64
msgid "Workaround for France"
@@@ -12724,9 -12727,9 +13519,15 @@@ msgid "
"historical interpretation mistake. Try using this wrong interpretation if "
"your subtitles don't appear."
msgstr ""
++<<<<<<< HEAD
+"Niektóre francuskie kanały nie flagują poprawnie stron napisów ze względu na "
+"historyczny błąd interpretacji. Spróbuj użyć tej błędnej interpretacji, "
+"jeśli Twoje napisy nie pojawiają się."
++=======
+ "Niektóre francuskie kanały nie flagują poprawnie ich stron napisów ze "
+ "względu na historyczny błąd interpretacji. Spróbuj użyć tej błędnej "
+ "interpretacji, jeśli twoje napisy nie pojawiają się."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/telx.c:71
msgid "Teletext subtitles decoder"
@@@ -12737,8 -12740,8 +13538,13 @@@ msgid "
"Enforce a quality between 1 (low) and 10 (high), instead of specifying a "
"particular bitrate. This will produce a VBR stream."
msgstr ""
++<<<<<<< HEAD
+"Wymuś jakość pomiędzy 1 (niska) a 10 (wysoka), zamiast określania "
+"konkretnego bitrate. Umożliwi to strumień VBR."
++=======
+ "Wymuś jakość pomiędzy 1 (niska) a 10 (wysoka), zamiast określania konkretnej "
+ "przepływności. Umożliwi to strumień VBR."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/theora.c:112
msgid "Theora video decoder"
@@@ -12774,7 -12777,8 +13580,12 @@@ msgstr "Tryb VBR
#: modules/codec/twolame.c:63
msgid "Use Variable BitRate. Default is to use Constant BitRate (CBR)."
++<<<<<<< HEAD
+msgstr "Używaj zmiennego bitrate. Domyślnie używany jest stały bitrate (CBR)."
++=======
+ msgstr ""
+ "Używaj zmienną przepływność. Domyślnie używana jest stała przepływność (CBR)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/twolame.c:64
msgid "Psycho-acoustic model"
@@@ -12798,28 -12802,29 +13609,50 @@@ msgstr "Dekoder dźwiękowy Ulead DV
#: modules/codec/vorbis.c:175
msgid "Maximum encoding bitrate"
++<<<<<<< HEAD
+msgstr "Maksymalny bitrate kodowania"
++=======
+ msgstr "Maksymalna przepływność kodowania"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/vorbis.c:177
msgid "Maximum bitrate in kbps. This is useful for streaming applications."
msgstr ""
++<<<<<<< HEAD
+"Maksymalny bitrate w kbps. Jest to przydatne do strumieniowania aplikacji."
+
+#: modules/codec/vorbis.c:178
+msgid "Minimum encoding bitrate"
+msgstr "Minimalny bitrate kodowania"
++=======
+ "Maksymalna przepływność w kbps. Jest to przydatne do strumieniowania "
+ "aplikacji."
+
+ #: modules/codec/vorbis.c:178
+ msgid "Minimum encoding bitrate"
+ msgstr "Minimalna przepływność kodowania"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/vorbis.c:180
msgid ""
"Minimum bitrate in kbps. This is useful for encoding for a fixed-size "
"channel."
msgstr ""
++<<<<<<< HEAD
+"Minimalny bitrate w kbps. Jest to przydatne do kodowania kanałów o ustalonej "
+"wielkości."
+
+#: modules/codec/vorbis.c:183
+msgid "Force a constant bitrate encoding (CBR)."
+msgstr "Wymuś stały bitrate kodowania (CBR)."
++=======
+ "Minimalna przepływność w kbps. Jest przydatna do kodowania kanałów o "
+ "ustalonej wielkości."
+
+ #: modules/codec/vorbis.c:183
+ msgid "Force a constant bitrate encoding (CBR)."
+ msgstr "Wymuś stałą przepływność kodowania (CBR)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/vorbis.c:187
msgid "Vorbis audio decoder"
@@@ -12848,8 -12853,8 +13681,13 @@@ msgid "
"-1 for infinite."
msgstr ""
"Ustawia maksymalny interwał pomiędzy klatkami IDR. Większe wartości "
++<<<<<<< HEAD
+"oszczędzają bity, a tym samym poprawiają jakość dla danego bitrate kosztem "
+"precyzji szukania. Użyj -1 dla nieskończoności."
++=======
+ "oszczędzają bity, a tym samym poprawiają jakość dla danej przepływności "
+ "kosztem precyzji szukania. Użyj -1 dla nieskończoności."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:67
msgid "Minimum GOP size"
@@@ -12892,7 -12897,7 +13730,11 @@@ msgstr "
#: modules/codec/x264.c:83
msgid "use open GOP, for bluray compatibility use also bluray-compat option"
msgstr ""
++<<<<<<< HEAD
+"używaj otwartą GOP, dla kompatybilności Blu-Ray, możesz również użyć opcji "
++=======
+ "-używaj otwartą GOP, dla kompatybilności Blu-Ray, możesz również użyć opcji "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"bluray-compat"
#: modules/codec/x264.c:86
@@@ -13007,7 -13012,7 +13849,11 @@@ msgid "
"encoding and decoding, but should save 10 to 15% bitrate."
msgstr ""
"CABAC (Binarne adaptacyjne kodowanie arytmetyczne). Nieco spowalnia "
++<<<<<<< HEAD
+"kodowanie i dekodowanie, ale oszczędza 10 do 15% bitrate."
++=======
+ "kodowanie i dekodowanie, ale oszczędza 10 do 15% przepływności."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:135
msgid ""
@@@ -13146,9 -13151,9 +13992,15 @@@ msgid "
"This selects the quantizer to use. Lower values result in better fidelity, "
"but higher bitrates. 26 is a good default value. Range 0 (lossless) to 51."
msgstr ""
++<<<<<<< HEAD
+"Używana kwantyzacja. Niższe wartości to lepsza dokładność, ale wyższy "
+"bitrate. 26 to dobra wartość domyślna. Wartości w zakresie od 0 (bezstratny) "
+"do 51."
++=======
+ "Używana kwantyzacja. Niższe wartości to lepsza dokładność, ale wyższa "
+ "przepływność. 26 to dobra wartość domyślna. Wartości w zakresie od 0 "
+ "(bezstratny) do 51."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:194
msgid "Quality-based VBR"
@@@ -13186,19 -13191,19 +14038,35 @@@ msgstr "Maksymalny krok QP pomiędzy kl
#: modules/codec/x264.c:207
msgid "Average bitrate tolerance"
++<<<<<<< HEAD
+msgstr "Åšrednia tolerancja bitrate"
+
+#: modules/codec/x264.c:208
+msgid "Allowed variance in average bitrate (in kbits/s)."
+msgstr "Dozwolona wariancja przy średnim bitrate (w kbit/s)."
+
+#: modules/codec/x264.c:211
+msgid "Max local bitrate"
+msgstr "Maksymalny lokalny bitrate"
+
+#: modules/codec/x264.c:212
+msgid "Sets a maximum local bitrate (in kbits/s)."
+msgstr "Określa maksymalny bitrate (w kbit/s)."
++=======
+ msgstr "Średnia tolerancja przepływności"
+
+ #: modules/codec/x264.c:208
+ msgid "Allowed variance in average bitrate (in kbits/s)."
+ msgstr "Dozwolona wariancja w średniej przepływności (w kbit/s)."
+
+ #: modules/codec/x264.c:211
+ msgid "Max local bitrate"
+ msgstr "Maksymalna lokalna przepływność"
+
+ #: modules/codec/x264.c:212
+ msgid "Sets a maximum local bitrate (in kbits/s)."
+ msgstr "Określa maksymalną lokalną przepływność (w kbit/s)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:214
msgid "VBV buffer"
@@@ -13206,7 -13211,7 +14074,11 @@@ msgstr "Bufor VBV
#: modules/codec/x264.c:215
msgid "Averaging period for the maximum local bitrate (in kbits)."
++<<<<<<< HEAD
+msgstr "Okres uśredniania dla maksymalnego lokalnego bitrate (w kbit)."
++=======
+ msgstr "Okres uśredniania dla maksymalnej lokalnej przepływności (w kbit)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:218
msgid "Initial VBV buffer occupancy"
@@@ -13678,7 -13683,7 +14550,11 @@@ msgid "
"issues on unmuxable output, like rtsp-output without ts-mux"
msgstr ""
"Liczba klatek wykorzystanych do typu klatki z wyprzedzeniem. Obecna domyślna "
++<<<<<<< HEAD
+"może spowodować problemy z synchronizacją na nie muksowanym wyjściu, takim "
++=======
+ "może spowodować problemy z synchronizacją na nie muksowanym wyjściu, jakim "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"jak wyjście-rtsp bez ts-mux"
#: modules/codec/x264.c:408
@@@ -13727,10 -13732,10 +14603,17 @@@ msgid "Fast
msgstr "Szybko"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Standardowa"
@@@ -13839,8 -13844,8 +14722,13 @@@ msgid "D-Bus control interface
msgstr "Interfejs sterowania D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14087,7 -14092,7 +14975,11 @@@ msgstr "Interfejs sterowania ruchu
msgid ""
"Use HDAPS, AMS, APPLESMC or UNIMOTION motion sensors to rotate the video"
msgstr ""
++<<<<<<< HEAD
+"Użyj czujniki ruchu HDAPS, AMS, APPLESMC lub UNIMOTION, aby obrócić obraz"
++=======
+ "Użyj czujniki ruchu HDAPS, AMS, APPLESMC lub UNIMOTION aby obrócić obraz"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/netsync.c:57
msgid "Network master clock"
@@@ -14172,7 -14177,7 +15064,11 @@@ msgid "
msgstr ""
"Dodatkowe interfejsy uruchomione przez serwis. Powinny ustawione być w "
"czasie instalacji dlatego serwis jest prawdopodobnie skonfigurowany. Użyj "
++<<<<<<< HEAD
+"listę modułów interfejsu dzieloną przecinkami. (wspólne wartości: logger, "
++=======
+ "listę modułów interfeju dzieloną przecinkami. (wspólne wartości: logger, "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"sap, rc, http)"
#: modules/control/ntservice.c:66
@@@ -14191,9 -14196,9 +15087,15 @@@ msgstr "Inicjowanie
msgid "Opening"
msgstr "Otwieranie"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Wstrzymaj"
@@@ -14236,7 -14241,7 +15138,11 @@@ msgid "
"port the interface will bind to."
msgstr ""
"Akceptuje polecenia przez gniazdo zamiast standardowego wejścia. Możesz "
++<<<<<<< HEAD
+"ustawić adres i port, którego interfejs będzie wiązał."
++=======
+ "ustawić adres i port którego interfejs będzie wiązał."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:179
msgid ""
@@@ -14515,7 -14520,7 +15421,11 @@@ msgstr "| odczytane bajty wejściowe :
#: modules/control/rc.c:1750 modules/gui/ncurses.c:809
#, c-format
msgid "| input bitrate : %6.0f kb/s"
++<<<<<<< HEAD
+msgstr "| bitrate wejściowy : %6.0f kb/s"
++=======
+ msgstr "| przepływność wejściowa : %6.0f kb/s"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:1752 modules/gui/ncurses.c:811
#, c-format
@@@ -14525,7 -14530,7 +15435,11 @@@ msgstr "| odczytane bajty demuksu : %8.
#: modules/control/rc.c:1754 modules/gui/ncurses.c:813
#, c-format
msgid "| demux bitrate : %6.0f kb/s"
++<<<<<<< HEAD
+msgstr "| bitrate demuksu : %6.0f kb/s"
++=======
+ msgstr "| przepływność demuksu : %6.0f kb/s"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:1756
#, c-format
@@@ -14592,7 -14597,7 +15506,11 @@@ msgstr "| wysłanych bitów : %8.
#: modules/control/rc.c:1785 modules/gui/ncurses.c:847
#, c-format
msgid "| sending bitrate : %6.0f kb/s"
++<<<<<<< HEAD
+msgstr "| wysłany bitrate : %6.0f kb/s"
++=======
+ msgstr "| wysłana przepływność : %6.0f kb/s"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/aiff.c:49
msgid "AIFF demuxer"
@@@ -14659,7 -14664,7 +15577,11 @@@ msgid "
"Recreate a index for the AVI file. Use this if your AVI file is damaged or "
"incomplete (not seekable)."
msgstr ""
++<<<<<<< HEAD
+"Odtwórz indeks dla pliku AVI. Użyj tego, jeśli Twój plik AVI jest uszkodzony "
++=======
+ "Odtwórz indeks dla pliku AVI. Użyj tego, jeśli twój plik AVI jest uszkodzony "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"lub niekompletny (nie ma podglÄ…du)."
#: modules/demux/avi/avi.c:65
@@@ -14830,7 -14835,7 +15752,11 @@@ msgid "
"This is the desired frame rate when playing MJPEG from a file. Use 0 (this "
"is the default value) for a live stream (from a camera)."
msgstr ""
++<<<<<<< HEAD
+"To jest pożądana liczba klatek podczas odtwarzania MJPEG z pliku. Używaj 0 "
++=======
+ "To jest pożądana ilczba klatek podczas odtwarzania MJPEG z pliku. Używaj 0 "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"(to jest wartość domyślna) dla strumienia na żywo (z kamery)."
#: modules/demux/mjpeg.c:53
@@@ -14847,7 -14852,7 +15773,11 @@@ msgstr "Pierwszy odtwarzany
#: modules/demux/mkv/chapter_command.cpp:151
msgid "Video Manager"
++<<<<<<< HEAD
+msgstr "Menedżer obrazu"
++=======
+ msgstr "Menażer obrazu"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mkv/chapter_command.cpp:157
msgid "----- Title"
@@@ -15893,8 -15898,8 +16823,13 @@@ msgid "
"calculate from the bitrate instead."
msgstr ""
"Zwykle używamy znaczników czasu plików MPEG do obliczenia pozycji i czasu "
++<<<<<<< HEAD
+"trwania. Czasami jednak jest to niekorzystne. Wyłączyć tę opcję, zamiast "
+"obliczać ją z bitrate."
++=======
+ "trwania. Czasami jednak jest to niekorzystne. Wyłączyć tę opcję, aby zamiast "
+ "obliczyć je z przepływności."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/ps.c:56 modules/demux/ps.c:69
msgid "MPEG-PS demuxer"
@@@ -15953,7 -15958,7 +16888,11 @@@ msgstr "Surowy demuxer dźwięku
msgid ""
"The demuxer will advance timestamps if the input can't keep up with the rate."
msgstr ""
++<<<<<<< HEAD
+"Demukser będzie przyspieszał czas, jeśli wejście nie może nadążyć ze stawką."
++=======
+ "Demuxer będzie przyspieszał czas, jeśli wejście nie może nadążyć ze stawką."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/rawdv.c:51
msgid "DV (Digital Video) demuxer"
@@@ -16066,7 -16071,7 +17005,11 @@@ msgid "
msgstr ""
"Ustawia wewnętrzny identyfikator każdego podstawowego strumienia "
"obsługiwanego przez VLC na ten, który jest określony w strumieniu TS, "
++<<<<<<< HEAD
+"zamiast 1, 2, 3 itp. Przydatne do '#duplikat{..., wybierz=\"es=<pid>\"}'."
++=======
+ "zamiast 1, 2, 3, itp. Przydatne do '#duplikat{..., wybierz=\"es=<pid>\"}'."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/ts.c:104
msgid "Fast udp streaming"
@@@ -16092,7 -16097,8 +17035,12 @@@ msgstr "Klucz CSA
msgid ""
"CSA encryption key. This must be a 16 char string (8 hexadecimal bytes)."
msgstr ""
++<<<<<<< HEAD
+"Klucz szyfrowania CSA. Musi to być 16-znakowy ciąg (8 szesnastkowych bajtów)."
++=======
+ "Klucz szyfrowania CSA. Musi to być 16 znakowy string (8 szesnastkowych "
+ "bajtów)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/ts.c:115 modules/mux/mpeg/ts.c:163
msgid "Second CSA Key"
@@@ -16103,7 -16109,7 +17051,11 @@@ msgid "
"The even CSA encryption key. This must be a 16 char string (8 hexadecimal "
"bytes)."
msgstr ""
++<<<<<<< HEAD
+"Równy klucz szyfrowania CSA. Musi to być 16-znakowy ciąg (8 szesnastkowych "
++=======
+ "Równy klucz szyfrowania CSA. Musi to być 16-znakowy string (8 szesnastkowych "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"bajtów)."
#: modules/demux/ts.c:120
@@@ -16144,7 -16150,7 +17096,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Demuxer transportu strumienia MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Telegazeta"
@@@ -16333,7 -16339,7 +17289,11 @@@ msgid "VLC media player Help
msgstr "Pomoc VLC media player"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Indeks"
@@@ -16421,9 -16427,9 +17381,15 @@@ msgstr "Podaj nazwÄ™ nowego profilu:
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Zapisz"
@@@ -16535,7 -16541,7 +17501,11 @@@ msgstr "Brak wejścia
msgid ""
"No input found. A stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+"Nie znaleziono wejścia. Strumień musi być odtwarzany lub zatrzymany, żeby "
++=======
+ "Nie znaleziono wejścia. Strumień musi być odtwarzany lub zatrzymany żeby "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"zadziałały zakładki."
#: modules/gui/macosx/bookmarks.m:225
@@@ -16567,7 -16573,7 +17537,11 @@@ msgstr "Nie znaleziono wejścia
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Strumień musi być odtwarzany lub wstrzymany, aby działały zakładki."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Przejdź do czasu"
@@@ -16581,39 -16587,39 +17555,66 @@@ msgstr "Przejdź do czasu
#: modules/gui/macosx/ControlsBar.m:53 modules/gui/macosx/fspanel.m:418
msgid "Click to play or pause the current media."
++<<<<<<< HEAD
+msgstr "Kliknij, aby odtworzyć lub wstrzymać aktualny plik."
++=======
+ msgstr "Kliknij by odtworzyć lub wstrzymać aktualny plik."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ControlsBar.m:56 modules/gui/macosx/fspanel.m:417
msgid "Backward"
msgstr "Wstecz"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
msgstr ""
++<<<<<<< HEAD
+"Kliknij, aby przejść do poprzedniej pozycji na liście odtwarzania. "
+"Przytrzymaj, aby przewijać aktualny utwór do tyłu."
++=======
+ "Kliknij by przejść do poprzedniej pozycji na liście odtwarzania. Przytrzymaj "
+ "by przewijać aktualny utwór do tyłu."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ControlsBar.m:60 modules/gui/macosx/fspanel.m:419
msgid "Forward"
msgstr "Przewijanie do przodu"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
msgstr ""
++<<<<<<< HEAD
+"Kliknij, aby przejść do następnej pozycji na liście odtwarzania. "
+"Przytrzymaj, aby przewijać aktualny utwór do przodu."
++=======
+ "Kliknij by przejść do następnej pozycji na liście odtwarzania. Przytrzymaj "
+ "by przewijać aktualny utwór do przodu."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ControlsBar.m:65 modules/gui/macosx/fspanel.m:445
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change current playback position."
msgstr ""
++<<<<<<< HEAD
+"Kliknij i przesuń myszkę z wciśniętym guzikiem, aby użyć tego suwaka do "
+"zmiany pozycji odtwarzania."
++=======
+ "Kliknij i przesuń myszkę z wciśniętym guzikiem by użyć tego suwaka do zmiany "
+ "pozycji odtwarzania."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ControlsBar.m:68 modules/gui/macosx/fspanel.m:421
msgid "Toggle Fullscreen mode"
@@@ -16621,94 -16627,94 +17622,179 @@@ msgstr "Przełącz tryb pełnoekranowy
#: modules/gui/macosx/ControlsBar.m:69
msgid "Click to enable fullscreen video playback."
++<<<<<<< HEAD
+msgstr "Kliknij, aby włączyć odtwarzanie na pełnym ekranie."
+
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "Kliknij, aby przewijać bieżący utwór do tyłu."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "Kliknij, aby przewijać bieżący utwór do przodu."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Kliknij, aby zatrzymać odtwarzanie."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Pokaż/Ukryj listę odtwarzania"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ msgstr "Kliknij by włączyć odtwarzanie na pełnym ekranie."
+
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Kliknij by zatrzymać odtwarzanie."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Pokaż/Ukryj listę odtwarzania"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+"Kliknij, aby przełączyć się między wideo a listą odtwarzania. Jeśli żaden "
+"obraz nie jest pokazywany w głównym oknie, pozwala to ukryć "
+"listę odtwarzania."
+
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ "Kliknij by przełączyć się między wideo a listą odtwarzania. Jeśli żaden "
+ "obraz nie jest pokazywany w głównym oknie, pozwala to ukryć "
+ "listę odtwarzania."
+
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Powtórz"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+"Kliknij, aby zmienić tryb odtwarzania. Są trzy tryby: powtórz jeden, powtórz "
+"wszystkie i wyłączony."
+
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Losowo"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "Kliknij, aby włączyć bądź wyłączyć losowe odtwarzanie."
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ "Kliknij by zmienić tryb odtwarzania. Są trzy tryby: powtórz jeden, powtórz "
+ "wszystkie i wyłączony."
+
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Losowo"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "Kliknij by włączyć bądź wyłączyć losowe odtwarzanie."
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+"Kliknij i przesuń myszkę z wciśniętym guzikiem, aby użyć tego suwaka do "
+"zmiany głośności."
+
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Kliknij, aby wyłączyć bądź włączyć dźwięk."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Pełna głośność"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Kliknij, aby odtwarzać dźwięk z maksymalną głośnością."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ "Kliknij i przesuń myszkę z wciśniętym guzikiem by użyć tego suwaka do zmiany "
+ "głośności."
+
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Kliknij by wyłączyć bądź włączyć dźwięk."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Pełna głośność"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Kliknij by odtwarzać dźwięk z maksymalną głośnością."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efekty"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+"Kliknij, aby pokazać panel Efekty Audio zawierający korektor graficzny i "
+"inne filtry."
+
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Kliknij, aby przeskoczyć do poprzedniej pozycji na liście odtwarzania."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Kliknij, aby przeskoczyć do następnej pozycji na liście odtwarzania."
++=======
+ "Kliknij by pokazać panel Efekty Audio zawierający korektor graficzny i inne "
+ "filtry."
+
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Kliknij by przeskoczyć do poprzedniej pozycji na liście odtwarzania."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Kliknij by przeskoczyć do następnej pozycji na liście odtwarzania."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "Kliknij by przewijać bieżący utwór do tyłu."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "Kliknij by przewijać bieżący utwór do przodu."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
@@@ -16745,7 -16751,7 +17831,11 @@@ msgstr "Wybierz lokalizację wyjściow
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16900,7 -16906,7 +17990,11 @@@ msgstr "Usuń profil
#: modules/gui/macosx/ConvertAndSave.m:380
msgid "Select the profile you would like to remove:"
++<<<<<<< HEAD
+msgstr "Wybierz profil, który chciałbyś usunąć:"
++=======
+ msgstr "Wybierz profil który chciałbyś usunąć"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:468
msgid "%@ stream to %@:%@"
@@@ -16933,8 -16939,8 +18027,13 @@@ msgid "A SDP export is requested, but n
msgstr "Zażądano eksportu SDP, ale nie podano adresu URL"
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "WÅ‚asny"
@@@ -16978,7 -16984,7 +18077,11 @@@ msgstr "(obecnie nie ma żadnego odtwar
#: modules/gui/macosx/fspanel.m:421
msgid "Click to exit fullscreen playback."
++<<<<<<< HEAD
+msgstr "Kliknij, aby wyłączyć odtwarzanie na pełnym ekranie."
++=======
+ msgstr "Kliknij by wyłączyć odtwarzanie na pełnym ekranie."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/intf.m:842 modules/gui/qt4/dialogs/messages.cpp:77
#: modules/gui/qt4/ui/messages_panel.h:138
@@@ -17029,43 -17035,43 +18132,79 @@@ msgid "
"Only your default E-Mail address will be submitted, including no further "
"information."
msgstr ""
++<<<<<<< HEAD
+"Tylko Twój domyślny adres e-maila zostanie przesłany bez żadnych dalszych "
++=======
+ "Tylko twój domyślny adres e-maila zostanie przesłany bez żadnych dalszych "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"informacji."
#: modules/gui/macosx/intf.m:854
msgid "Don't ask again"
msgstr "Nie pytaj ponownie"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "Odtwarzanie multimediów VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Nie można znaleźć dziennika błędów"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "Odtwarzanie multimediów VLC"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Nie można znaleźć dziennika błędów"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Kontynuuj"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Nie można znaleźć żadnych śladów poprzedniego błędu."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Usunąć stare ustawienia?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Właśnie znaleziono starą wersję plików ustawień VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "PrzenieÅ› do kosza i uruchom ponownie VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Nie można znaleźć żadnych śladów poprzedniego błędu."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Usunąć stare ustawienia?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Właśnie znaleziono starą wersję plików ustawień VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "PrzenieÅ› do kosza i uruchom ponownie VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "Dziennik debuggingu VLC (%s).rtf"
@@@ -17103,7 -17109,7 +18242,11 @@@ msgstr "Czarny obraz w pełnym ekranie
#: modules/gui/macosx/macosx.m:63
msgid "In fullscreen mode, keep screen where there is no video displayed black"
msgstr ""
++<<<<<<< HEAD
+"W trybie pełnoekranowym wyświetlaj czarny obraz na ekranach, na których nie "
++=======
+ "W trybie pełnoekranowym wyświetlaj czarny obraz, na ekranach na których nie "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"widać żadnego filmu."
#: modules/gui/macosx/macosx.m:66
@@@ -17141,7 -17147,7 +18284,11 @@@ msgstr "Sterowanie odtwarzania pilotem
#: modules/gui/macosx/macosx.m:79
msgid "By default, VLC can be remotely controlled with the Apple Remote."
++<<<<<<< HEAD
+msgstr "Domyślnie VLC może być zdalnie sterowany pilotem Apple Remote."
++=======
+ msgstr "Domyślnie, VLC może być zdalnie sterowany pilotem Apple Remote."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:81 modules/gui/macosx/simple_prefs.m:365
msgid "Control system volume with the Apple Remote"
@@@ -17153,7 -17159,7 +18300,11 @@@ msgid "
"you can choose to control the global system volume instead."
msgstr ""
"Domyślnie VLC będzie kontrolowało własną głośność za pomocą Apple Remote. "
++<<<<<<< HEAD
+"Jednakże możesz wybrać, aby kontrolowało globalną głośność systemową."
++=======
+ "Jednakże, możesz wybrać, by kontrolowało globalną głośność systemową."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:84
msgid "Control playlist items with the Apple Remote"
@@@ -17225,7 -17231,7 +18376,11 @@@ msgstr "
#: modules/gui/macosx/macosx.m:103 modules/gui/macosx/simple_prefs.m:371
#: modules/gui/qt4/qt4.cpp:170
msgid "Pause the video playback when minimized"
++<<<<<<< HEAD
+msgstr "Wstrzymaj odtwarzanie, gdy zostanie zminimalizowany"
++=======
+ msgstr "Wstrzymaj odtwarzanie gdy zostanie zminimalizowany"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:104 modules/gui/qt4/qt4.cpp:172
msgid ""
@@@ -17244,7 -17250,7 +18399,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr "Ta opcja umożliwia interfejsu na zmianę swojej ikony na różne okazje."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Zablokuj stosunek rozmiaru"
@@@ -17290,7 -17296,7 +18449,11 @@@ msgid "
"Pauses iTunes playback when VLC playback starts. If selected, iTunes "
"playback will be resumed again if VLC playback is finished."
msgstr ""
++<<<<<<< HEAD
+"Wstrzymuje odtwarzanie w iTunes, gdy rozpocznie się odtwarzanie w VLC. Jeśli "
++=======
+ "Wstrzymuje odtwarzanie w iTunes gdy rozpocznie się odtwarzanie w VLC. Jeśli "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"włączone, odtwarzanie w iTunes zostanie wznowione, gdy odtwarzanie w VLC się "
"skończy."
@@@ -17377,7 -17383,7 +18540,11 @@@ msgstr "Ukryj VLC
msgid "Hide Others"
msgstr "Ukryj pozostałe"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Pokaż wszystkie"
@@@ -17462,15 -17468,15 +18629,27 @@@ msgstr "Synchronizacja ścieżki
msgid "A→B Loop"
msgstr "Powtórka A->B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Zakończ po odtwarzaniu"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Krok naprzód"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Zakończ po odtwarzaniu"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Krok naprzód"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Krok wstecz"
@@@ -17486,30 -17492,30 +18665,56 @@@ msgstr "Zmniejsz głośność
msgid "Audio Device"
msgstr "Urządzenie dźwiękowe"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Połowa rozmiaru"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Zwykły rozmiar"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Podwójny rozmiar"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Dopasuj do ekranu"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Połowa rozmiaru"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Zwykły rozmiar"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Podwójny rozmiar"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Dopasuj do ekranu"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Zawsze na wierzchu"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Urządzenie wideo pełnego ekranu"
@@@ -17518,7 -17524,7 +18723,11 @@@
msgid "Post processing"
msgstr "Przetwarzanie końcowe"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Dodaj plik z napisami..."
@@@ -17643,7 -17649,7 +18852,11 @@@ msgid "
"Click to open an advanced dialog to select the media to play. You can also "
"drop files here to play."
msgstr ""
++<<<<<<< HEAD
+"Kliknij, aby odtworzyć zaawansowane okno dialogowe w celu wybrania pliku do "
++=======
+ "Kliknij by odtworzyć zaawansowane okno dialogowe w celu wybrania pliku do "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"odtworzenia. Możesz także upuszczać tu pliki."
#: modules/gui/macosx/MainWindow.m:175 modules/gui/macosx/MainWindow.m:180
@@@ -17732,7 -17738,7 +18945,11 @@@ msgid "
msgstr ""
"4 zakładki do wyboru multimediów. Wybierz 'Plik' dla plików, 'Dysk' dla "
"mediów optycznych typu DVD, CD Audio i BluRay, 'Sieć' dla strumieni "
++<<<<<<< HEAD
+"sieciowych lub 'Przechwytywanie' dla urządzeń wejściowych, takich jak "
++=======
+ "sieciowych lub 'Przechwytywanie' dla urządzeń wejściowych takich jak "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"mikrofon i kamera, aktualny ekran lub strumienie TV, jeśli aplikacja EyeTV "
"jest zainstalowana."
@@@ -17747,7 -17753,7 +18964,11 @@@ msgstr "Wybierz plik
#: modules/gui/macosx/open.m:139
msgid "Click to select a file for playback"
++<<<<<<< HEAD
+msgstr "Kliknij, aby wybrać plik do odtworzenia"
++=======
+ msgstr "Kliknij by wybrać plik do odtworzenia"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:140
msgid "Treat as a pipe rather than as a file"
@@@ -17758,7 -17764,7 +18979,11 @@@ msgid "Play another media synchronously
msgstr "Synchroniczne odtwarzanie kolejnych plików"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Wybierz..."
@@@ -17767,7 -17773,7 +18992,11 @@@
msgid ""
"Click to select a another file to play it in sync with the previously "
"selected file."
++<<<<<<< HEAD
+msgstr "Kliknij, aby wybrać inny plik do odtwarzania równolegle z poprzednim."
++=======
+ msgstr "Kliknij by wybrać inny plik do odtwarzania równolegle z poprzednim."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:149
msgid "Custom playback"
@@@ -17803,7 -17809,7 +19032,11 @@@ msgid "
"enter the URL in the field above. If you want to open a RTP or UDP stream, "
"press the button below."
msgstr ""
++<<<<<<< HEAD
+"Aby otworzyć zwykły strumień sieciowy (HTTP, RTSP, RTMP, MMS, FTP itp.), "
++=======
+ "Aby otworzyć zwykły strumień sieciowy (HTTP, RTSP, RTMP, MMS, FTP, itp.), "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"wystarczy wpisać adres URL w polu powyżej. Jeśli chcesz otworzyć strumień "
"RTP lub UDP, naciśnij przycisk znajdujący się poniżej."
@@@ -17818,7 -17824,7 +19051,11 @@@ msgid "
msgstr ""
"Jeśli chcesz otworzyć strumień multcastu, wprowadź odpowiedni adres IP "
"przydzielony przez dostawcę strumienia. W trybie unicast, VLC będzie "
++<<<<<<< HEAD
+"automatycznie używał adres IP Twojego komputera.\n"
++=======
+ "automatycznie używał adres IP twojego komputera.\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"\n"
"Aby otworzyć strumień za pomocą innego protokołu, naciśnij przycisk Anuluj, "
"aby zamknąć ten arkusz."
@@@ -17828,7 -17834,7 +19065,11 @@@ msgid "
"Enter a URL here to open the network stream. To open RTP or UDP streams, "
"click on the respective button below."
msgstr ""
++<<<<<<< HEAD
+"Wpisz tu adres URL w celu otwarcia strumienia sieciowego. Aby otworzyć "
++=======
+ "Wpisz tu adres URL w celu otwarcia strumienia sieciowego. By otworzyć "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"strumień RTP bądź UDP kliknij na odpowiedni przycisk poniżej."
#: modules/gui/macosx/open.m:192
@@@ -17926,11 -17932,11 +19167,19 @@@ msgstr "Dodaj plik z napisami:
#: modules/gui/macosx/open.m:366
msgid "Click to setup subtitle playback in full detail."
++<<<<<<< HEAD
+msgstr "Kliknij, aby ustawić odtwarzanie napisów na najwyższych detalach."
+
+#: modules/gui/macosx/open.m:368
+msgid "Click to select a subtitle file."
+msgstr "Kliknij, aby wybrać plik z napisami."
++=======
+ msgstr "Kliknij by ustawić odtwarzanie napisów na najwyższych detalach"
+
+ #: modules/gui/macosx/open.m:368
+ msgid "Click to select a subtitle file."
+ msgstr "Kliknij by wybrać plik z napisami."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:369
msgid "Override parameters"
@@@ -17944,7 -17950,7 +19193,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Kodowanie napisów"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Wielkość czcionki"
@@@ -17955,7 -17961,7 +19208,11 @@@ msgstr "Wyrównanie napisów
#: modules/gui/macosx/open.m:381
msgid "Click to dismiss the subtitle setup dialog."
++<<<<<<< HEAD
+msgstr "Kliknij, aby pominąć okno ustawiania napisów."
++=======
+ msgstr "Kliknij by pominąć okno ustawiania napisów."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:382
msgid "Font Properties"
@@@ -18014,7 -18020,7 +19271,11 @@@ msgstr "Opcje transkodowania
#: modules/gui/macosx/output.m:154 modules/gui/macosx/output.m:164
#: modules/gui/macosx/wizard.m:381
msgid "Bitrate (kb/s)"
++<<<<<<< HEAD
+msgstr "Bitrate (kb/s)"
++=======
+ msgstr "Przepływność (kb/s)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/output.m:171
msgid "Stream Announcing"
@@@ -18118,7 -18124,7 +19379,11 @@@ msgstr "Wczytano z nośnika
#: modules/gui/macosx/playlistinfo.m:98
#: modules/gui/qt4/components/info_panels.cpp:558
msgid "Input bitrate"
++<<<<<<< HEAD
+msgstr "Wejściowy bitrate"
++=======
+ msgstr "Przepływność wejściowa"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/playlistinfo.m:99
msgid "Demuxed"
@@@ -18126,7 -18132,7 +19391,11 @@@ msgstr "Przerobiono
#: modules/gui/macosx/playlistinfo.m:100
msgid "Stream bitrate"
++<<<<<<< HEAD
+msgstr "Bitrate strumienia"
++=======
+ msgstr "Przepływność strumienia"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/playlistinfo.m:103 modules/gui/macosx/playlistinfo.m:113
msgid "Decoded blocks"
@@@ -18173,12 -18179,12 +19442,20 @@@ msgstr "BÅ‚Ä…d podczas zapisywania meta
msgid "VLC was unable to save the meta data."
msgstr "VLC nie mógł zapisać metadanych."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Preferencje"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Resetuj wszystko"
@@@ -18357,129 -18363,125 +19634,238 @@@ msgstr "WÅ‚Ä…cz powiadomienia Growl (pr
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr "Steruj odtwarzanie w iTunes podczas odtwarzania w VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Domyślne kodowanie"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Wyświetl ustawienia"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Domyślne kodowanie"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Wyświetl ustawienia"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Kolor czcionek"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Czcionka"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Języki napisów"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Języki napisów"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Preferowany język napisów"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "WÅ‚Ä…cz OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "WÅ‚Ä…cz OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Siła pokrycia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "WymuÅ› pogrubienie"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
+#: modules/gui/qt4/ui/sprefs_subtitles.h:299
+msgid "Outline color"
+msgstr "Kolor konturu"
+
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "WymuÅ› pogrubienie"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:299
+ msgid "Outline color"
+ msgstr "Kolor kontur"
+
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Grubość kontur"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Czarny obraz w trybie pełnego ekranu"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Czarny obraz w trybie pełnego ekranu"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Wyświetlacz"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Moduł wyjścia"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Zrzuty ekranu"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Folder"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Format"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefiks"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Kolejność numeracji"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Ostatnie sprawdzenie: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Nie przeprowadzono jeszcze sprawdzeń."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Moduł wyjścia"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Zrzuty ekranu"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Folder"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Format"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefiks"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Kolejność numeracji"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Ostatnie sprawdzenie: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Nie przeprowadzono jeszcze sprawdzeń."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Najniższa częstotliwość"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Niska częstotliwość"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Wysoka częstotliwość"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Najwyższa częstotliwość"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Resetuj preferencje"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18491,9 -18493,9 +19877,15 @@@
"\n"
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+"Spowoduje to zresetowanie preferencji VLC media playera.\n"
+"\n"
+"Pamiętaj o tym, że VLC uruchomi się ponownie podczas tego procesu i Twoja "
++=======
+ "Spowoduje to zresetowanie preferencji VLC Media Playera.\n"
+ "\n"
+ "Pamiętaj o tym, że VLC uruchomi się ponownie podczas tego procesu i twoja "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"bieżąca lista odtwarzania zostanie opróżniona i ewentualne odtwarzanie, "
"strumieniowe lub transkodowanie zostanie natychmiast zatrzymane.\n"
"\n"
@@@ -18501,20 -18503,20 +19893,37 @@@
"\n"
"Czy na pewno chcesz kontynuować?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Wybierz folder, gdzie zapisać zrzuty ekranu."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Wybierz"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Wybierz katalog lub nazwę pliku, gdzie będą zapisywane nagrania."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Wybierz folder, gdzie zapisać zrzuty ekranu."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Wybierz"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Wybierz katalog lub nazwę pliku, gdzie będą zapisywane nagrania."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18522,16 -18524,16 +19931,29 @@@ msgstr "
"Naciśnij nowy klawisz dla\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Nieprawidłowa kombinacja"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Niestety, te klawisze nie mogą być używane jako skróty klawiszowe."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Nieprawidłowa kombinacja"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Niestety, te klawisze nie mogą być używane jako skróty klawiszowe."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "To połączenie jest już zajęte przez \"%@\"."
@@@ -18873,7 -18875,6 +20295,10 @@@ msgid "
"RAW)"
msgstr ""
"Kodek obrazu MPEG-4 (może być używany z MPEG PS, MPEG TS, MPEG1, ASF, MP4, "
++<<<<<<< HEAD
+"OGG i RAW)"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:128
msgid "DivX first version (useable with MPEG TS, MPEG1, ASF and OGG)"
@@@ -18992,10 -18993,10 +20417,17 @@@ msgid "
"generally the best thing to do. Other computers can then access the stream "
"at http://yourip:8080 by default."
msgstr ""
++<<<<<<< HEAD
+"Wpisz lokalne adresy, na których chcesz nadsłuchiwać żądania. Nie wpisuj "
+"nic, jeśli chcesz nadsłuchiwać na wszystkich interfejsach sieciowych. "
+"Zazwyczaj jest to najlepszy wybór. Inne komputery mają domyślnie dostęp do "
+"strumienia poprzez adres http://twójip:8080."
++=======
+ "Wpisz lokalne adresy na których chcesz nadsłuchiwać żądania. Nie wpisuj nic, "
+ "jeśli chcesz nadsłuchiwać na wszystkich interfejsach sieciowych. Zazwyczaj "
+ "jest to najlepszy wybór. Inne komputery mają domyślnie dostęp do strumienia "
+ "poprzez adres http://twójip:8080."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:258
msgid ""
@@@ -19014,10 -19015,10 +20446,17 @@@ msgid "
"generally the best thing to do. Other computers can then access the stream "
"at mms://yourip:8080 by default."
msgstr ""
++<<<<<<< HEAD
+"Wpisz lokalne adresy, na których chcesz nadsłuchiwać żądania. Nie wpisuj "
+"nic, jeśli chcesz nadsłuchiwać na wszystkich interfejsach sieciowych. "
+"Zazwyczaj jest to najlepszy wybór. Inne komputery mają domyślnie dostęp do "
+"strumienia poprzez adres mms://twójip:8080."
++=======
+ "Wpisz lokalne adresy na których chcesz nadsłuchiwać żądania. Nie wpisuj nic, "
+ "jeśli chcesz nadsłuchiwać na wszystkich interfejsach sieciowych. Zazwyczaj "
+ "jest to najlepszy wybór. Inne komputery mają domyślnie dostęp do strumienia "
+ "poprzez adres mms://twójip:8080."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:265
msgid ""
@@@ -19456,9 -19457,9 +20895,15 @@@ msgid "
"If you want to give a name to your stream, enter it here, else, a default "
"name will be used."
msgstr ""
++<<<<<<< HEAD
+"Jeśli transmitujesz strumień za pomocą protokołu UDP, może on zostać "
+"ogłoszony za pomocą specjalnego protokołu SAP/SDP. W ten sposób odbiorcy nie "
+"będą musieli wpisać adresu multicastu, pojawi on się w ich liście "
++=======
+ "Jeśli transmitujesz strumień za pomocą protokołu UDP, moze on zostać "
+ "ogłoszony za pomocą specjalnego protokołu SAP/SDP. W ten sposób odbiorcy nie "
+ "będą musieli wpisać adresu multicastu, pojawi on się w ich liscie "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"odtwarzania, jeżeli włączyli dodatkowy interfejs SAP.\n"
"Jeśli chcesz podać nazwę strumienia, wpisz ją tutaj, w przeciwnym razie "
"będzie używana nazwa domyślna."
@@@ -20115,8 -20116,8 +21560,13 @@@ msgid "
"Information about what your media or stream is made of.\n"
"Muxer, Audio and Video Codecs, Subtitles are shown."
msgstr ""
++<<<<<<< HEAD
+"Informacje z czego składa się Twój plik multimedialny lub strumień.\n"
+"Pokazywane sÄ… mukser, kodeki audio i wideo oraz napisy."
++=======
+ "Informacje z czego składa się twój plik multimedialny lub strumień.\n"
+ "Pokazywane sÄ… muxer, kodeki audio i wideo, napisy."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/info_panels.cpp:527
msgid "Current media / stream statistics"
@@@ -20140,7 -20141,7 +21590,11 @@@ msgstr "Rozmiar demuksowanych danych
#: modules/gui/qt4/components/info_panels.cpp:563
msgid "Content bitrate"
++<<<<<<< HEAD
+msgstr "Bitrate treści"
++=======
+ msgstr "Przepływność treści"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/info_panels.cpp:565
msgid "Discarded (corrupted)"
@@@ -20214,7 -20215,7 +21668,11 @@@ msgid "
"Click to adjust"
msgstr ""
"Bieżąca prędkość odtwarzania: %1\n"
++<<<<<<< HEAD
+"Kliknij tutaj, aby ją dostosować"
++=======
+ "Kliknij tutaj aby ją dostosować"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/interface_widgets.cpp:541
msgid "Revert to normal play speed"
@@@ -20464,8 -20465,8 +21922,13 @@@ msgid "
"Select or double click an action to change the associated hotkey. Use delete "
"key to remove hotkeys"
msgstr ""
++<<<<<<< HEAD
+"Wybierz lub dwukrotnie kliknij akcję, aby zmienić powiązany skrót "
+"klawiszowy. Użyj klawisza delete, aby usunąć skrót"
++=======
+ "Wybierz lub dwukrotnie kliknij akcję by zmienić powiązany skrót klawiszowy. "
+ "Użyj klawisza delete, by usunąć skrót"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1137
msgid "in"
@@@ -20502,8 -20503,8 +21965,13 @@@ msgid "
"Double click to change.\n"
"Delete key to remove."
msgstr ""
++<<<<<<< HEAD
+"Kliknij podwójnie, aby zmienić.\n"
+"Przyciśnij delete, aby usunąć."
++=======
+ "Kliknij podwójnie by zmienić.\n"
+ "Przyciśnij delete by usunąć."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1410
msgid "Hotkey change"
@@@ -20623,20 -20624,20 +22091,36 @@@ msgstr "Usuń zaznaczony profil
msgid "Create a new profile"
msgstr "Utwórz nowy profil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Utwórz"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "Ten mukser nie jest dostarczany przez VLC: może brakować."
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Brak nazwy profilu"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr "Ten muxer nie jest dostarczany przez VLC: może brakować."
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Brak nazwy profilu"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Musisz wybrać nazwę profilu."
@@@ -20843,13 -20844,13 +22327,23 @@@ msgid "
"entities. Therefore the <i>VLC</i> developers require your express consent "
"for the media player to access the Internet automatically.</p>\n"
msgstr ""
++<<<<<<< HEAD
+"<p>W celu ochrony Twojej prywatności, <i>VLC media player</i> <b>nie</b> "
+"pobiera danych osobistych lub przekazuje je, nawet w anonimowej formie, "
+"każdemu innemu.</p>\n"
+"<p>Jednakże <i>VLC</i> jest w stanie automatycznie pobrać informacje o "
+"mediach ze swojej listy odtwarzania z innych usług internetowych. To zawiera "
+"okładki, nazwy utworów, informacje autorskie i inne metadane.</p>\n"
+"To może oznaczać identyfikację niektórych z Twoich plików multimedialnych w "
++=======
+ "<p>W celu ochrony twojej prywatności, <i>VLC media player</i> <b>nie</b> "
+ "pobiera danych osobistych lub przekazuje je, nawet w anonimowej formie, "
+ "każdemu innemu.</p>\n"
+ "<p>Jednakże, <i>VLC</i> jest w stanie automatycznie pobrać informacje o "
+ "mediach z swojej listy odtwarzania z innych usług internetowych. To zawiera "
+ "okładki, nazwy utworów, informacje autorskie i inne meta-dane.</p>\n"
+ "To może oznaczać identyfikację niektórych twoich plików multimedialnych w "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"usługach innych firm. Dlatego deweloperzy <i>VLC</i> wymagają wyraźnej zgody "
"użytkownika, aby odtwarzacz mógł automatycznie połączyć się z Internetem.</"
"p>\n"
@@@ -21032,7 -21033,7 +22526,11 @@@ msgid "
"it will be automatically selected."
msgstr ""
"Jeśli w schowku znajduje się prawidłowy adres URL\n"
++<<<<<<< HEAD
+"lub ścieżka do pliku na Twoim komputerze,\n"
++=======
+ "lub ścieżka do pliku na twoim komputerze,\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"zostanie on automatycznie wybrany."
#: modules/gui/qt4/dialogs/plugins.cpp:62
@@@ -21186,7 -21187,7 +22684,11 @@@ msgid "
"You should start by checking that source matches what you want your input to "
"be and then press the \"Next\" button to continue.\n"
msgstr ""
++<<<<<<< HEAD
+"Ten kreator umożliwia strumieniowanie lub konwertowanie Twoich plików "
++=======
+ "Ten kreator umożliwia strumieniowanie lub konwertowanie twoich plików "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"multimedialnych w celu wykorzystania lokalnego, w sieci prywatnej lub w "
"internecie.\n"
"Sprawdź, czy źródło odpowiada pozycji, którą chcesz używać, a następnie "
@@@ -21198,7 -21199,7 +22700,11 @@@ msgid "
"This is automatically generated when you change the above settings,\n"
"but you can change it manually."
msgstr ""
++<<<<<<< HEAD
+"Ciąg strumienia wyjściowego.\n"
++=======
+ "String strumienia wyjściowego.\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Jest generowany automatycznie po zmianie powyższych ustawień,\n"
"ale możesz go zmienić ręcznie."
@@@ -21336,7 -21337,7 +22842,11 @@@ msgstr "Rozkład
#: modules/gui/qt4/dialogs/vlm.cpp:75
msgid "Video On Demand ( VOD )"
++<<<<<<< HEAD
+msgstr "Wideo na życzenie (VOD)"
++=======
+ msgstr "Wideo na żądanie ( VOD )"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/vlm.cpp:80
msgid "Hours / Minutes / Seconds:"
@@@ -21389,7 -21390,7 +22899,11 @@@ msgstr "Rozkład:
#: modules/gui/qt4/dialogs/vlm.cpp:641
msgid "VOD: "
++<<<<<<< HEAD
+msgstr "Wideo na życzenie (VOD):"
++=======
+ msgstr "Wideo na żądanie (VOD):"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/main_interface.cpp:1159
msgid "Control menu for the player"
@@@ -21848,7 -21849,7 +23362,11 @@@ msgid "
"Default is '255;255;255;20;226;20;255;176;15;235;30;20'\n"
"An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255' "
msgstr ""
++<<<<<<< HEAD
+"Zmień kolory suwaka głośności,\n"
++=======
+ "Zmień kolory suwaka głośności\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"określając 12 numerów oddzielonych przez ';'\n"
"Domyślnie jest to '255;255;255;20;226;20;255;176;15;235;30;20'\n"
"Alternatywą może być '30;30;50;40;40;100;50;50;160;150;150;255'"
@@@ -21866,7 -21867,7 +23384,11 @@@ msgid "
msgstr ""
"Startuj VLC:\n"
" - w normalnym trybie\n"
++<<<<<<< HEAD
+" - ze strefÄ… zawsze obecnÄ…, pokazujÄ…cÄ… informacje, takie jak tekst piosenki, "
++=======
+ " - ze strefÄ… zawsze obecnÄ…, pokazujÄ…cÄ… informacje takie jak tekst piosenki, "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"okładka albumu...\n"
" - w minimalnym trybie z ograniczonymi kontrolami"
@@@ -22091,8 -22092,8 +23613,13 @@@ msgid "
"Lua interface configuration string. Format is: '[\"<interface module name>"
"\"] = { <option> = <value>, ...}, ...'."
msgstr ""
++<<<<<<< HEAD
+"Ciąg konfiguracyjny interfejsu Lua. W formacie: '[\"<nazwa modułu interfejsu>"
+"\"] = { <opcja> = <wartość>, ...}, ...'."
++=======
+ "String konfiguracyjny interfejsu Lua. W formacie: '[\"<nazwa modułu "
+ "interfejsu>\"] = { <opcja> = <wartość>, ...}, ...'."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:54 modules/lua/vlc.c:70
msgid "A single password restricts access to this interface."
@@@ -22122,8 -22123,8 +23649,13 @@@ msgid "
"network interfaces (0.0.0.0). If you want this interface to be available "
"only on the local machine, enter \"127.0.0.1\"."
msgstr ""
++<<<<<<< HEAD
+"To jest host, na którym interfejs będzie nasłuchiwać. Domyślnie dotyczy to "
+"wszystkich interfejsów sieciowych (0.0.0.0). Jeśli chcesz, aby interfejs był "
++=======
+ "To jest host na którym interfejs będzie nasłuchiwać. Domyślnie dotyczy to "
+ "wszystkich interfejsów sieciowych (0.0.0.0). Jeśli chcesz aby interfejs był "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"dostępny tylko na komputerze lokalnym, wpisz \"127.0.0.1\"."
#: modules/lua/vlc.c:67
@@@ -22222,11 -22223,11 +23754,19 @@@ msgstr "Nazwa pliku szukanej okładki a
#: modules/misc/audioscrobbler.c:115
msgid "The username of your last.fm account"
++<<<<<<< HEAD
+msgstr "Nazwa użytkownika Twojego konta last.fm"
+
+#: modules/misc/audioscrobbler.c:117
+msgid "The password of your last.fm account"
+msgstr "Hasło Twojego konta last.fm"
++=======
+ msgstr "Nazwa użytkownika twojego konta last.fm"
+
+ #: modules/misc/audioscrobbler.c:117
+ msgid "The password of your last.fm account"
+ msgstr "Hasło twojego konta last.fm"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/audioscrobbler.c:118
msgid "Scrobbler URL"
@@@ -22485,7 -22486,7 +24025,11 @@@ msgstr "MUX dla transportu RAW RTSP
#: modules/misc/rtsp.c:67
msgid "Sets the timeout option in the RTSP session string"
++<<<<<<< HEAD
+msgstr "Ustawia opcjÄ™ limitu czasu w sesji ciÄ…gu RTSP"
++=======
+ msgstr "Ustawia opcjÄ™ limitu czasu w sesji RTSP"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/rtsp.c:69
msgid ""
@@@ -22494,11 -22495,11 +24038,19 @@@
"some IPTV STBs (such as those made by HansunTech) which get confused by it. "
"The default is 5."
msgstr ""
++<<<<<<< HEAD
+"Ta wartość określa, którą opcję ograniczenia czasu dodać do ciągu "
+"identyfikatora sesji RTSP. W przypadku ustawienia wartości ujemnej, usuwa to "
+"całkowicie opcję ograniczenia czasu. Korzystają z tego niektóre IPTV STB "
+"(takie jak te wyprodukowane przez HansunTech), które się przez to gubią. "
+"Wartość domyślna to 5."
++=======
+ "Ta wartość określa, którą opcję ograniczenia czasu dodać do identyfikatora "
+ "sesji RTSP. W przypadku ustawienia wartości ujemnej, usuwa to całkowicie "
+ "opcję ograniczenia czasu. Korzystają z tego niektóre IPTV STB (takie jak te "
+ "wyprodukowane przez HansunTech), które się przez to gubią. Wartość domyślna "
+ "to 5."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/rtsp.c:75 modules/stream_out/rtp.c:249
msgid "RTSP VoD"
@@@ -22542,7 -22543,7 +24094,11 @@@ msgstr "Autor umieszczony w komentarzac
#: modules/mux/asf.c:61
msgid "Copyright string to put in ASF comments."
++<<<<<<< HEAD
+msgstr "CiÄ…g praw autorskich umieszczony w komentarzach ASF."
++=======
+ msgstr "String praw autorskich umieszczony w komentarzach ASF."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/mux/asf.c:62
msgid "Comment"
@@@ -22566,7 -22567,7 +24122,11 @@@ msgstr "Rozmiar pakietu ASF - domyślni
#: modules/mux/asf.c:68
msgid "Bitrate override"
++<<<<<<< HEAD
+msgstr "ZastÄ…p bitrate"
++=======
+ msgstr "Zastąp przepływność"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/mux/asf.c:69
msgid ""
@@@ -22574,9 -22575,9 +24134,15 @@@
"Windows Media Player will cache streamed content. Set to audio+video bitrate "
"in bytes"
msgstr ""
++<<<<<<< HEAD
+"Nie próbuj zgadywać bitrate ASF. Ustawienie pozwala kontrolować, jak Windows "
+"Media Player zachowuje zawartość strumienia. Ustaw bitrate dźwięku i obrazu "
+"w bajtach"
++=======
+ "Nie próbuj zgadywać przepływności ASF. Ustawienie pozwala kontrolować jak "
+ "Windows Media Player zachowuje zawartość strumienia. Ustaw przepływność "
+ "dźwięku i obrazu w bajtach"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/mux/asf.c:73
msgid "ASF muxer"
@@@ -22750,7 -22751,7 +24316,11 @@@ msgid "
"Enforces alignment of all access units on PES boundaries. Disabling this "
"might save some bandwidth but introduce incompatibilities."
msgstr ""
++<<<<<<< HEAD
+"Wymusza wyrównanie wszystkich jednostek dostępu do granic PES. Wyłączenie "
++=======
+ "Wymusza wyrównanie wszystkich jednostek dostępu do do granic PES. Wyłączenie "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"tej funkcji może zaoszczędzić trochę pasma, ale wprowadzi również "
"niezgodności."
@@@ -22764,9 -22765,9 +24334,15 @@@ msgid "
"bitrate between the two boundaries. This avoids having huge bitrate peaks, "
"especially for reference frames."
msgstr ""
++<<<<<<< HEAD
+"Podziel strumień na kawałki podanego czasu i zapewnij stały bitrate pomiędzy "
+"dwoma granicami. Zapobiega to ogromnych szczytów bitrate, zwłaszcza dla "
+"klatek odniesienia."
++=======
+ "Podziel strumień na kawałki podanego czasu i zapewnij stałą przepływność "
+ "pomiędzy dwoma granicami. Zapobiega to ogromnych szczytów przepływności, "
+ "zwłaszcza dla klatek odniesienia."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/mux/mpeg/ts.c:129
msgid "Use keyframes"
@@@ -22795,7 -22796,7 +24371,11 @@@ msgid "
"Set at which interval PCRs (Program Clock Reference) will be sent (in "
"milliseconds). This value should be below 100ms. (default is 70ms)."
msgstr ""
++<<<<<<< HEAD
+"Ustaw okres (w milisekundach), w którym zostanie wysłany PCR (Program Clock "
++=======
+ "Ustaw okres (w milisekundach) w którym zostanie wysłany PCR (Program Clock "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Reference). Wartość powinna być mniejsza niż 100 ms. (domyślnie to 70ms)."
#: modules/mux/mpeg/ts.c:142
@@@ -23059,7 -23060,7 +24639,11 @@@ msgid "
"This enables actual parsing of the announces by the SAP module. Otherwise, "
"all announcements are parsed by the \"live555\" (RTP/RTSP) module."
msgstr ""
++<<<<<<< HEAD
+"Ta opcja włącza aktualne parsowanie ogłoszeń przez moduł SAP. Inaczej "
++=======
+ "Ta opcja włącza aktualne parsowanie ogłoszeń przez moduł SAP. Inaczej, "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"wszystkie ogłoszenia parsowanie będą przez moduł \"live555\" (RTP/RTSP)."
#: modules/services_discovery/sap.c:95
@@@ -23139,7 -23140,7 +24723,11 @@@ msgstr "Przechwyt obrazu
#: modules/services_discovery/xcb_apps.c:152
msgid "Your window manager does not provide a list of applications."
++<<<<<<< HEAD
+msgstr "Twój menedżer okien nie zawiera listy aplikacji."
++=======
+ msgstr "Twoj menedżer okien nie zawiera listy aplikacji."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/xcb_apps.c:275
msgid "Applications"
@@@ -23249,7 -23250,7 +24837,11 @@@ msgid "
"IDs bridge_in will register."
msgstr ""
"Przesunięcie, które zostanie dodane do identyfikatora strumienia wyjścia "
++<<<<<<< HEAD
+"mostka, aby uzyskać identyfikator, który zarejestruje wejście mostka."
++=======
+ "mostka aby uzyskać identyfikator ktory zarejstruje wejście mostka."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/bridge.c:60
msgid "Name of current instance"
@@@ -23503,7 -23504,7 +25095,11 @@@ msgstr "Dynamiczne ustawienie języka
#: modules/stream_out/mosaic_bridge.c:107
msgid "Specify an identifier string for this subpicture"
++<<<<<<< HEAD
+msgstr "Określ ciąg identyfikacyjny dla tego podobrazu"
++=======
+ msgstr "Określ string identyfikacyjny dla tego pod-obrazu"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/mosaic_bridge.c:111
#: modules/stream_out/transcode/transcode.c:68
@@@ -23633,9 -23634,9 +25229,15 @@@ msgid "
"access the SDP via HTTP, rtsp://location for RTSP access, and sap:// for the "
"SDP to be announced via SAP."
msgstr ""
++<<<<<<< HEAD
+"Ta opcja określa, w jaki sposób dostępny będzie SDP (deskryptor sesji) dla "
+"tej sesji RTP. Musisz użyć adresu url: http://położenie, aby uzyskać dostęp "
+"do SDP przez protokół HTTP, rtsp://położenie, aby uzyskać dostęp do RTSP, i "
++=======
+ "Ta opcja określa w jaki sposób dostępny będzie SDP (deskryptor sesji) dla "
+ "tej sesji RTP. Musisz użyć adresu url: http://położenie aby uzyskać dostęp "
+ "do SDP przez protokoł HTTP, rtsp://położenie aby uzyskać dostęp do RTSP, i "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"sap:// dla SDP ogłoszonego przez SAP."
#: modules/stream_out/rtp.c:85 modules/stream_out/standard.c:81
@@@ -23899,7 -23900,7 +25501,11 @@@ msgid "
"called when the render is into the buffer."
msgstr ""
"Adres funkcji końcowego renderowania dźwięku wywołań zwrotnych. Funkcja ta "
++<<<<<<< HEAD
+"zostanie wywołana, gdy render załadowany jest do bufora."
++=======
+ "zostanie wywołana gdy render załadowany jest do bufora."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/smem.c:77
msgid "Video Callback data"
@@@ -23944,7 -23945,7 +25550,11 @@@ msgstr "Metoda wyjścia używana dla st
#: modules/stream_out/standard.c:46
msgid "Muxer to use for the stream."
++<<<<<<< HEAD
+msgstr "Mukser używany dla strumienia."
++=======
+ msgstr "Muxer używany dla strumienia."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/standard.c:47
#: share/lua/http/dialogs/create_stream.html:334
@@@ -24009,11 -24010,11 +25619,19 @@@ msgstr "To jest kodek obrazu, który bÄ
#: modules/stream_out/transcode/transcode.c:51
#: share/lua/http/dialogs/create_stream.html:212
msgid "Video bitrate"
++<<<<<<< HEAD
+msgstr "Bitrate obrazu"
+
+#: modules/stream_out/transcode/transcode.c:53
+msgid "Target bitrate of the transcoded video stream."
+msgstr "Docelowy bitrate transkodowanego strumienia obrazu."
++=======
+ msgstr "Przepływność obrazu"
+
+ #: modules/stream_out/transcode/transcode.c:53
+ msgid "Target bitrate of the transcoded video stream."
+ msgstr "Docelowa przepływność transkodowanego strumienia obrazu."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:54
msgid "Video scaling"
@@@ -24093,11 -24094,11 +25711,19 @@@ msgstr "To jest kodek dźwięku, któr
#: modules/stream_out/transcode/transcode.c:90
#: share/lua/http/dialogs/create_stream.html:231
msgid "Audio bitrate"
++<<<<<<< HEAD
+msgstr "Bitrate dźwięku"
+
+#: modules/stream_out/transcode/transcode.c:92
+msgid "Target bitrate of the transcoded audio stream."
+msgstr "Docelowy bitrate transkodowanego strumienia dźwięku."
++=======
+ msgstr "Przepływność dźwięku"
+
+ #: modules/stream_out/transcode/transcode.c:92
+ msgid "Target bitrate of the transcoded audio stream."
+ msgstr "Docelowa przepływność transkodowanego strumienia dźwiękowego."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:95
msgid ""
@@@ -24164,7 -24165,7 +25790,11 @@@ msgstr "Menu informacji na ekranie (OSD
#: modules/stream_out/transcode/transcode.c:124
msgid ""
"Stream the On Screen Display menu (using the osdmenu subpicture module)."
++<<<<<<< HEAD
+msgstr "Strumieniuj menu OSD (za pomocą modułu podobrazu menu OSD)."
++=======
+ msgstr "Strumieniuj menu OSD (za pomocą modułu podobrazu osdmenu)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:126
msgid "Number of threads"
@@@ -24200,7 -24201,7 +25830,11 @@@ msgid "
"The transcoder will drop frames if your CPU can't keep up with the encoding "
"rate."
msgstr ""
++<<<<<<< HEAD
+"Transkoder pominie klatki, jeśli Twój procesor nie nadąży z prędkością "
++=======
+ "Transkoder pominie klatki, jeśli twój procesor nie nadąży z prędkością "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"kodowania."
#: modules/stream_out/transcode/transcode.c:155
@@@ -24211,23 -24212,23 +25845,43 @@@ msgstr "Transkoduj wyjście strumienia
msgid "Overlays/Subtitles"
msgstr "Nakładki/Napisy"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Czcionka Monospace"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Rodzina czcionek dla czcionki, której chcesz używać"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Plik czcionki, której chcesz używać"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Rozmiar czcionki w pikselach"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Czcionka Monospace"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Rodzina czcionek dla czcionki której chcesz używać"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Plik czcionki której chcesz używać"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Rozmiar czcionki w pikselach"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24237,24 -24238,24 +25891,43 @@@ msgstr "
"Jeśli ustawiłeś inną wartość niż 0, ta opcja pominie stosunkowy rozmiar "
"czcionki."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Przezroczystość tekstu"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Przezroczystość tekstu"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+"Siła pokrycia (przeciwieństwo od przezroczystości) napisów, które będą "
+"renderowane na obrazie. 0 = przeźroczyste, 255 = całkowite nieprzezroczyste."
+
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ "Siła pokrycia (przeciwieństwo od przezroczystości) napisów które będą "
+ "renderowane na obrazie. 0 = przeźroczyste, 255 = całkowite nieprzezroczyste."
+
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Domyślny kolor tekstu"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24262,18 -24263,18 +25935,30 @@@
"then blue. #000000 = black, #FF0000 = red, #00FF00 = green, #FFFF00 = yellow "
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+"Kolor napisów, które będą renderowane na obrazie. Podana musi być wartość "
++=======
+ "Kolor napisów które będą renderowane na obrazie. Podana musi być wartość "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"szesnastkowa (tak jak kolory HTML). Pierwsze dwie litery określają element "
"czerwony, następnie zielony, i na koniec niebieski. #000000 = czarny, "
"#FF0000 = czerwony, #00FF00 = zielony, #FFFF00 = żółty (czerwony i zielony), "
"#FFFFFF = biały"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Względny rozmiar znaków"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24283,59 -24284,59 +25968,111 @@@ msgstr "
"obrazie. Jeśli podałeś całkowity rozmiar czcionki, względny rozmiar zostanie "
"pominięty."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Przezroczystość tła"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Kolor tła"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Przezroczystość kontur"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Przezroczystość cienia"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Kolor cienia"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "KÄ…t cienia"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Odległość cienia"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Przezroczystość tła"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Kolor tła"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Przezroczystość kontur"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Przezroczystość cienia"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Kolor cienia"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "KÄ…t cienia"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Odległość cienia"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Mniejsze"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Małe"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Duże"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Większe"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Używaj renderera YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Używaj renderera YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24343,23 -24344,23 +26080,43 @@@ msgstr "
"Ta opcja renderuje czcionkÄ™ przy pomocy \"palety YUV\". Jest to tylko wtedy "
"potrzebne, jeśli chcesz kodować napisy DVB"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Cienki"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Gruby"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Renderowanie tektu"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Renderowanie czcionki Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Cienki"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Gruby"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Renderowanie tektu"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Renderowanie czcionki Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -24369,7 -24370,7 +26126,11 @@@ msgstr "
#: modules/text_renderer/quartztext.c:93
msgid "Name for the font you want to use"
++<<<<<<< HEAD
+msgstr "Nazwa czcionki, której chcesz używać"
++=======
+ msgstr "Nazwa czcionki której chcesz używać"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:124
msgid "Text renderer for Mac"
@@@ -24388,7 -24389,7 +26149,11 @@@ msgid "
"Location of a file holding a SVG template for automatic string conversion"
msgstr ""
"Położenie pliku SVG zawierającego szablon dla automatycznego konwertowania "
++<<<<<<< HEAD
+"ciÄ…gu"
++=======
+ "polecenia"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/tdummy.c:36
msgid "Dummy font renderer"
@@@ -24396,7 -24397,7 +26161,11 @@@ msgstr "Fikcyjne renderowanie czcionek
#: modules/text_renderer/win32text.c:60
msgid "Filename for the font you want to use"
++<<<<<<< HEAD
+msgstr "Nazwa pliku czcionki, której chcesz używać"
++=======
+ msgstr "Nazwa pliku czcionki której chcesz używać"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:95
msgid "Win32 font renderer"
@@@ -24647,7 -24648,7 +26416,11 @@@ msgstr "Ilość kanałów
#: modules/video_filter/atmo/atmo.cpp:169
msgid "Depending on your MoMoLight hardware choose 3 or 4 channels"
++<<<<<<< HEAD
+msgstr "W zależności od Twojego sprzętu MoMoLight wybierz 3 lub 4 kanały"
++=======
+ msgstr "W zależności od twojego sprzętu MoMoLight wybierz 3 lub 4 kanały"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:172
msgid "Count of fnordlicht's"
@@@ -24657,7 -24658,7 +26430,11 @@@ msgstr "Liczba elementów Fnordlicht
msgid ""
"Depending on the amount your fnordlicht hardware choose 1 to 254 channels"
msgstr ""
++<<<<<<< HEAD
+"W zależności od ilości Twojego sprzętu fnordlicht wybierz 1 lub 254 kanały"
++=======
+ "W zależności od ilości twojego sprzętu fnordlicht wybierz 1 lub 254 kanały"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:184
msgid "Save Debug Frames"
@@@ -24709,7 -24710,7 +26486,11 @@@ msgid "
"Set the color to show if the user pauses the video. (Have light to get "
"another beer?)"
msgstr ""
++<<<<<<< HEAD
+"Ustaw pokazywany kolor, gdy użytkownik wstrzymał wideo. (Zapalić światło dla "
++=======
+ "Ustaw pokazywany kolor gdy użytkownik wstrzymał wideo. (Zapalić światło dla "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"kolejnego piwa?)"
#: modules/video_filter/atmo/atmo.cpp:207
@@@ -24825,7 -24826,7 +26606,11 @@@ msgstr "Używaj oprogramowania dostosow
#: modules/video_filter/atmo/atmo.cpp:242
msgid ""
"Should the buildin driver do a white adjust or your LED stripes? recommend."
++<<<<<<< HEAD
+msgstr "Czy sterownik ma dostosować biel na Twoich paskach LED? (zalecane)"
++=======
+ msgstr "Czy sterownik ma dostosować bieli na twoich paskach LED? (zalecane)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:244
msgid "White Red"
@@@ -24833,7 -24834,7 +26618,11 @@@ msgstr "Czerwony białego
#: modules/video_filter/atmo/atmo.cpp:245
msgid "Red value of a pure white on your LED stripes."
++<<<<<<< HEAD
+msgstr "Czerwona wartość czystej bieli na Twoich paskach LED."
++=======
+ msgstr "Czerwona wartość czystego białego na twoich paskach LED."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:247
msgid "White Green"
@@@ -24841,7 -24842,7 +26630,11 @@@ msgstr "Zielony białego
#: modules/video_filter/atmo/atmo.cpp:248
msgid "Green value of a pure white on your LED stripes."
++<<<<<<< HEAD
+msgstr "Zielona wartość czystej bieli na Twoich paskach LED."
++=======
+ msgstr "Zielona wartość czystego białego na twoich paskach LED."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:250
msgid "White Blue"
@@@ -24849,7 -24850,7 +26642,11 @@@ msgstr "Niebieski białego
#: modules/video_filter/atmo/atmo.cpp:251
msgid "Blue value of a pure white on your LED stripes."
++<<<<<<< HEAD
+msgstr "Niebieska wartość czystej bieli na Twoich paskach LED."
++=======
+ msgstr "Niebieska wartość czystego białego na twoich paskach LED."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:254
msgid "Serial Port/Device"
@@@ -25031,9 -25032,9 +26828,15 @@@ msgid "
"on top, and one zone on left and right and no summary zone the mapping for "
"classic AtmoLight would be -1,3,2,1,0"
msgstr ""
++<<<<<<< HEAD
+"Dla urządzeń z więcej niż pięciu kanałów/stref spisz tutaj dla każdego "
+"kanału numer strefy, aby pokazać i oddzielić wartości użyj znaku , lub ; i "
+"-1, aby nie używać niektórych kanałów. Dla klasycznego AtmoLight kolejność "
++=======
+ "Dla urządzeń z więcej niż pięciu kanałów / stref spisz tutaj dla każdego "
+ "kanału numer strefy, aby pokazać i oddzielić wartości użyj znaku , lub ; i "
+ "-1 aby nie używać niektórych kanałów. Dla klasycznego AtmoLight kolejność "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"4,3,1,0,2 ustawia domyślne mapowanie kanału/strefy. Mając tylko dwie strefy "
"na górze, jedną strefę po lewej i prawej, i nie mając strefy sumy mapowanie "
"dla klasycznego AtmoLight będzie -1,3,2,1,0"
@@@ -25136,7 -25137,7 +26939,11 @@@ msgstr "Zmień przypisanie kanału (pop
#: modules/video_filter/atmo/atmo.cpp:567
msgid "Adjust the white light to your LED stripes"
++<<<<<<< HEAD
+msgstr "Dostosuj białe światło do swoich pasków LED"
++=======
+ msgstr "Dostosuj białe światło do twoich pasków LED"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:589
msgid "Change gradients"
@@@ -25304,7 -25305,7 +27111,11 @@@ msgstr "Mieszanie na ten obraz
#: modules/video_filter/blendbench.c:59
msgid "The image which will be used to blend onto"
++<<<<<<< HEAD
+msgstr "Obraz, na który zostanie przeprowadzone mieszanie"
++=======
+ msgstr "Obraz na który zostanie przeprowadzone mieszanie"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/blendbench.c:61
msgid "Chroma for the base image"
@@@ -25320,7 -25321,7 +27131,11 @@@ msgstr "Obraz do mieszania
#: modules/video_filter/blendbench.c:65
msgid "The image blended onto the base image"
++<<<<<<< HEAD
+msgstr "Obraz, który zostanie wykorzystany do mieszania z podstawowym"
++=======
+ msgstr "Obraz który zostanie wykorzystany do mieszania z podstawowym"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/blendbench.c:67
msgid "Chroma for the blend image"
@@@ -25479,7 -25480,7 +27294,11 @@@ msgstr "Filtrowanie obrazu za pomocÄ… Å
#: modules/video_filter/clone.c:40
msgid "Number of video windows in which to clone the video."
++<<<<<<< HEAD
+msgstr "Ilość okien, w których klonowany będzie obraz."
++=======
+ msgstr "Ilość okien w których klonowany będzie obraz."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/clone.c:43
msgid "Video output modules"
@@@ -25666,8 -25667,8 +27485,13 @@@ msgstr "
"Ostatnie: weź tylko barwy z nowego (jasnego) pola. Dobre dla wejścia z "
"przeplotem, np. filmów z kamery.\n"
"\n"
++<<<<<<< HEAD
+"AltLine: weź barwy linii 1 z górnego pola, linii 2 z dolnego pola itd. \n"
+"Domyślnie, dobre dla ztelecinowanego wejścia NTSC (anime DVD itp.). \n"
++=======
+ "AltLine: weź barwy linii 1 z górnego pola, linii 2 z dolnego pola, itd. \n"
+ "Domyślnie, dobre dla ztelecinowanego wejścia NTSC (anime DVD, itp.). \n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"\n"
"Mieszane: średnie barwy pola wejściowego. Mogą zniekształcać też barwy "
"nowego (jasnego) pola.\n"
@@@ -25932,7 -25933,7 +27756,11 @@@ msgid "
"<alpha>]][;<image>[,<delay>[,<alpha>]]][;...]. If you only have one file, "
"simply enter its filename."
msgstr ""
++<<<<<<< HEAD
+"Pełna ścieżka do obrazów, których chcesz używać. W formacie <obraz>[,"
++=======
+ "Pełna ścieżka do obrazów których chcesz używać. W formacie <obraz>[,"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"<opóźnienie w ms>[,<alpha>]][;<obraz>[,<opóźnienie>[,<alpha>]]][;...]. Jeśli "
"masz tylko jeden plik, to po prostu podaj jego nazwÄ™."
@@@ -26021,12 -26022,12 +27849,21 @@@ msgid "
"position (in %), $R = rate, $S = audio sample rate (in kHz), $T = time, $U = "
"publisher, $V = volume, $_ = new line) "
msgstr ""
++<<<<<<< HEAD
+"Wyświetla przewijający się tekst. (Dostępny format ciągów: Dotyczące czasu: "
+"%Y = rok, %m = miesiąc, %d = dzień, %H = godzina, %M = minuta, %S = "
+"sekunda, ... DotyczÄ…ce metadanych: $a = wykonawca, $b = album, $c = prawa "
+"autorskie, $d = opis, $e = kodowane przez, $g = gatunek, $l = język, $n = "
+"numer utworu, $p = teraz odtwarzane, $r = ocena, $s = język napisów, $t = "
+"tytuł, $u = adres URL, $A = data, $B = bitrate dźwięku (w kb/s), $C = "
++=======
+ "Wyświetla przewijający się tekst. (Dostępny format stringów: Dotyczące "
+ "czasu: %Y = rok, %m = miesiąc, %d = dzień, %H = godzina, %M = minuta, %S = "
+ "sekunda, ... DotyczÄ…ce metadane: $a = wykonawca, $b = album, $c = prawa "
+ "autorskie, $d = opis, $e = kodowane przez, $g = gatunek, $l = język, $n = "
+ "numer utworu, $p = teraz odtwarzane, $r = ocena, $s = język napisów, $t = "
+ "tytuł, $u = adres URL, $A = data, $B = przepływność dźwięku (w kb/s), $C = "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"rozdział, $D = czas trwania, $F = pełna ścieżka z nazwą, $I = tytuł, $L = "
"pozostało, $N = nazwa, $O = język dźwięku, $P = pozycja (w %), $R = "
"częstotliwość, $S = częstotliwość próbkowania dźwięku (w kHz), $T = czas, $U "
@@@ -26069,7 -26070,7 +27906,11 @@@ msgid "
"Number of milliseconds between string updates. This is mainly useful when "
"using meta data or time format string sequences."
msgstr ""
++<<<<<<< HEAD
+"Liczba milisekund pomiędzy aktualizacjami ciągu. Funkcja ta jest używana "
++=======
+ "Liczba milisekund pomiędzy aktualizacjami stringa. Funkcja ta jest używana "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"przede wszystkim do korzystania z metadanych lub sekwencji stringa formatu "
"czasu."
@@@ -26097,7 -26098,7 +27938,11 @@@ msgid "
"then blue. #000000 = black, #FF0000 = red, #00FF00 = green, #FFFF00 = yellow "
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+"Kolor napisów, które będą renderowane na obrazie. Musi podany być "
++=======
+ "Kolor napisów które będą renderowane na obrazie. Musi podany być "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"heksadecymalnie (podobnie jak kolory HTML). Pierwsze dwa znaki oznaczajÄ… "
"kolor czerwony, dalej zielony, i na koniec niebieski. #000000 = czarny, "
"#FF0000 = czerwony, #00FF00 = zielony, #FFFF00 = żółty (czerwony + zielony), "
@@@ -26141,7 -26142,8 +27986,12 @@@ msgstr "Orientacja podziału lustrzaneg
msgid ""
"Defines orientation of the mirror splitting. Can be vertical or "
"horizontal"
++<<<<<<< HEAD
+msgstr "Ustala orientację podziału lustrzanego. Może być pionowa lub pozioma"
++=======
+ msgstr ""
+ "Ustala orientację podziału lustrzanego. Może być pionowa lub pozioma"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/mirror.c:68
msgid "Vertical"
@@@ -26325,7 -26327,7 +28175,11 @@@ msgid "
"separated list of coordinates (eg: 10,10,150,10)."
msgstr ""
"Możesz wymusić (współrzędne x, y) przesunięcia elementów na mozaice "
++<<<<<<< HEAD
+"(stosowane tylko w przypadku, gdy metoda pozycjonowania ustawiona jest na "
++=======
+ "(stosowane tylko w przypadku gdy metoda pozycjonowania ustawiona jest na "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"\"offsetową\"). Musisz podać listę współrzędnych, dzielonych przecinkami "
"(np.: 10,10,150,10)."
@@@ -26421,11 -26423,11 +28275,19 @@@ msgstr "Pokuzuj tylko błędy
#: modules/video_filter/opencv_wrapper.c:70
msgid "Show errors and warnings"
++<<<<<<< HEAD
+msgstr "Pokazuj błędy i ostrzeżenia"
+
+#: modules/video_filter/opencv_wrapper.c:70
+msgid "Show everything including debug messages"
+msgstr "Pokazuj wszystko, w tym także wiadomości debuggera"
++=======
+ msgstr "Pokuzuj błędy i ostrzeżenia"
+
+ #: modules/video_filter/opencv_wrapper.c:70
+ msgid "Show everything including debug messages"
+ msgstr "Pokuzuj wszystko w tym także wiadomości debuggera"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/opencv_wrapper.c:73
msgid "OpenCV video filter wrapper"
@@@ -27005,7 -27007,7 +28867,11 @@@ msgid "
"Number of seconds between each forced refresh of the feeds. 0 means that the "
"feeds are never updated."
msgstr ""
++<<<<<<< HEAD
+"Ilość sekund pomiędzy każdym przymusowym odświeżeniem kanałów. 0 oznacza, że "
++=======
+ "Ilość sekund pomiędzy każdym przymusowym odświeżeniem kanałów. 0 oznacza że "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"kanały nigdy nie będą aktualizowane."
#: modules/video_filter/rss.c:139
@@@ -27046,7 -27048,7 +28912,11 @@@ msgid "
"Title display mode. Default is 0 (hidden) if the feed has an image and feed "
"images are enabled, 1 otherwise."
msgstr ""
++<<<<<<< HEAD
+"Tryb wyświetlania tytułu. Wartość domyślna to 0 (ukryty), jeżeli kanał "
++=======
+ "Tryb wyświetlania tytułu. Wartość domyślna to 0 (ukryty) jeżeli kanał "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"zawiera obraz i obrazy kanału są włączone, inaczej 1."
#: modules/video_filter/rss.c:169
@@@ -27105,7 -27107,7 +28975,11 @@@ msgstr "Stosunek nagrywania
msgid ""
"Ratio of images to record. 3 means that one image out of three is recorded."
msgstr ""
++<<<<<<< HEAD
+"Stosunek nagrywanych obrazów. 3 oznacza, że jeden z trzech obrazów będzie "
++=======
+ "Stosunek nagrywanych obrazów. 3 oznacza że jeden z trzech obrazów będzie "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"nagrywany."
#: modules/video_filter/scene.c:76
@@@ -27129,7 -27131,7 +29003,11 @@@ msgid "
"Directory path where images files should be saved. If not set, then images "
"will be automatically saved in users homedir."
msgstr ""
++<<<<<<< HEAD
+"Ścieżka katalogu, w którym zapisywane będą pliki obrazów. Brak ścieżki "
++=======
+ "Ścieżka katalogu w którym zapisywane będą pliki obrazów. Brak ścieżki "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"oznacza automatycznie zapisywane plików w domowym katalogu użytkownika."
#: modules/video_filter/scene.c:86
@@@ -27381,11 -27383,11 +29259,19 @@@ msgstr "Obróć lub przekręć obraz
#: modules/video_filter/wall.c:47
msgid "Number of horizontal windows in which to split the video."
++<<<<<<< HEAD
+msgstr "Liczba poziomych okien, na które zostanie podzielony obraz."
+
+#: modules/video_filter/wall.c:51
+msgid "Number of vertical windows in which to split the video."
+msgstr "Liczba pionowych okien, na które zostanie podzielony obraz."
++=======
+ msgstr "Liczba poziomych okien na które zostanie podzielony obraz."
+
+ #: modules/video_filter/wall.c:51
+ msgid "Number of vertical windows in which to split the video."
+ msgstr "Liczba pionowych okien na które zostanie podzielony obraz."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/wall.c:58
msgid "Element aspect ratio"
@@@ -27393,8 -27395,7 +29279,12 @@@ msgstr "Stosunek rozmiarów elementu
#: modules/video_filter/wall.c:59
msgid "Aspect ratio of the individual displays building the wall."
++<<<<<<< HEAD
+msgstr ""
+"Stosunek rozmiarów indywidualnych ekranów, z których składa się ściana."
++=======
+ msgstr "Stosunek rozmiarów indywidualnych ekranów z których składa się ściana."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/wall.c:68
msgid "Wall video filter"
@@@ -27591,7 -27592,7 +29481,11 @@@ msgid "
"in hardware then you must disable this option. It then does double buffering "
"in software."
msgstr ""
++<<<<<<< HEAD
+"Jeśli Twój bufor klatek obsługuje sprzętowe przyspieszenie lub wykonuje "
++=======
+ "Jeśli twój bufor klatek obsługuje sprzętowe przyspieszenie lub wykonuje "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"podwójne buforowanie w sprzęcie, to musisz wyłączyć tę opcję. Używane będzie "
"wtedy podwójne buforowanie przez oprogramowanie."
@@@ -27604,7 -27605,7 +29498,11 @@@ msgid "
"Chroma fourcc used by the framebuffer. Default is RGB since the fb device "
"has no way to report its chroma."
msgstr ""
++<<<<<<< HEAD
+"Funkcja Chroma fourcc używana przez bufora klatek. Domyślnie jest to RGB, "
++=======
+ "Funkcja Chroma fourcc uzywana przez bufora klatek. Domyślnie jest to RGB, "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"jeżeli urządzenie nie obsługuje metody przekazywania parametrów koloru."
#: modules/video_output/fb.c:95
@@@ -27625,7 -27626,7 +29523,11 @@@ msgstr "Rozszerzenie OpenGL ES
#: modules/video_output/gl.c:44
msgid "Extension through which to use the Open Graphics Library (OpenGL)."
++<<<<<<< HEAD
+msgstr "Rozszerzenie, przez które używać Open Graphics Library (OpenGL)."
++=======
+ msgstr "Rozszerzenie przez które używać Open Graphics Library (OpenGL)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/gl.c:50
msgid "OpenGL ES2"
@@@ -27713,7 -27714,7 +29615,11 @@@ msgstr "Obraz wyjściowy Mac OS X OpenG
#: modules/video_output/macosx.m:148
msgid "OpenGL acceleration is not supported on your Mac"
++<<<<<<< HEAD
+msgstr "Przyspieszenie OpenGL nie jest obsługiwane na Twoim Mac'u"
++=======
+ msgstr "Przyspieszenie OpenGL nie jest obsługiwane na twoim Mac'u"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/macosx.m:148
msgid ""
@@@ -27781,7 -27782,7 +29687,11 @@@ msgid "
"doesn't have any effect when using overlays."
msgstr ""
"Utwórz bufory obrazu w pamięci systemowej zamiast w pamięci karty. Nie jest "
++<<<<<<< HEAD
+"to zalecane, ponieważ korzystanie z pamięci karty daje korzyści z "
++=======
+ "to zalecane ponieważ korzystanie z pamięci karty daje korzyści z "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"przyspieszenia sprzętowego (takie jak ponowne skalowanie, czy konwersje YUV-"
">RGB). Opcja ta nie ma żadnego wpływu przy używaniu nakładek."
@@@ -27895,7 -27896,8 +29805,12 @@@ msgstr "Chroma
#: modules/video_output/vmem.c:52
msgid ""
"Output chroma for the memory image as a 4-character string, eg. \"RV32\"."
++<<<<<<< HEAD
+msgstr "Chroma wyjścia dla obrazu pamięci jako 4-literowy ciąg, np. \"RV32\"."
++=======
+ msgstr ""
+ "Chroma wyjścia dla obrazu pamięci jako 4-literowy string, np. \"RV32\"."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/vmem.c:59
msgid "Video memory output"
@@@ -28009,7 -28011,7 +29924,11 @@@ msgstr "
"Sterownik XVideo przyspieszenia renderowania nie obsługuje wymaganej "
"rozdzielczości: %ux%u pikseli. Maksymalna obsługiwana rozdzielczość to "
"%<PRIu32>x%<PRIu32>.\n"
++<<<<<<< HEAD
+"Przyspieszenie zostanie wyłączone. Jednak renderowanie filmów o zbyt dużej "
++=======
+ "Przyspieszenie zostanie wyłączone. Jednak, renderowanie filmów o zbyt dużej "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"rozdzielczości, może spowodować poważny spadek wydajności."
#: modules/video_output/yuv.c:41
@@@ -28189,7 -28191,7 +30108,11 @@@ msgstr "Wzmocnienie
#: modules/visualization/visual/visual.c:67
msgid "This is a coefficient that modifies the height of the bands."
++<<<<<<< HEAD
+msgstr "To jest współczynnik, który zmienia wysokość pasma."
++=======
+ msgstr "To jest współczynnik który zmienia wysokość pasma."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/visualization/visual/visual.c:69
msgid "Draw peaks in the analyzer"
@@@ -28374,7 -28376,7 +30297,11 @@@ msgstr "Czas:
#: share/lua/http/index.html:26 share/lua/http/mobile_browse.html:25
#: share/lua/http/mobile_equalizer.html:25 share/lua/http/mobile_view.html:25
msgid "VLC media player - Web Interface"
++<<<<<<< HEAD
+msgstr "VLC media player - Interfejs internetowy"
++=======
+ msgstr "VLC media player - Internetowy interfejs"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:215
msgid "Hide / Show Library"
@@@ -28422,7 -28424,7 +30349,11 @@@ msgstr "Åadowanie odtwarzacza flowplay
#: share/lua/http/index.html:252
msgid "If nothing appears, check your internet connection."
++<<<<<<< HEAD
+msgstr "Jeśli nic się nie pojawia, sprawdź swoje połączenie internetowe."
++=======
+ msgstr "Jeśli nic się nie pojawia, sprawdź twoje połączenie internetowe."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:263
msgid ""
@@@ -28645,7 -28647,7 +30576,11 @@@ msgstr "Wybór pliku
#: modules/gui/qt4/ui/open_file.h:152
msgid "You can select local files with the following list and buttons."
++<<<<<<< HEAD
+msgstr "Korzystaj z poniższej listy i przycisków, aby wybrać lokalne pliki."
++=======
+ msgstr "Korzystaj z poniższej listy i przycisków aby wybrać lokalne pliki."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/open_file.h:153
msgid "Add..."
@@@ -28829,7 -28831,7 +30764,11 @@@ msgstr "Strumieniuj wszystkie podstawow
#: modules/gui/qt4/ui/sout.h:219
msgid "Generated stream output string"
++<<<<<<< HEAD
+msgstr "Generowany ciąg strumienia wyjściowego"
++=======
+ msgstr "Generowany string strumienia wyjściowego"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:414
msgid " %"
@@@ -29317,6 -29319,9 +31256,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Lista menedżera mediów"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Pokaż szczegóły"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -31994,10 -31999,6 +33939,13 @@@
#~ "Czy na pewno chcesz kontynuować?"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Szczegóły kodeka"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Display OSD menu on top of video output"
#~ msgstr "Wyjście obrazu iOS OpenGL"
@@@ -32068,7 -32069,7 +34016,11 @@@
#~ "You should configure your speaker layout with the \"Audio Midi Setup\" "
#~ "utility in /Applications/Utilities. Stereo mode is being used now."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Skonfiguruj swój układ głośników narzędziem \"Audio Midi Setup\" w /"
++=======
+ #~ "Skonfiguruj twój układ głośników narzędziem \"Audio Midi Setup\" w /"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "Aplikacje/Narzędzia. VLC używa tylko stereo."
#, fuzzy
@@@ -32083,9 -32084,9 +34035,15 @@@
#~ "Valid values range from 0 to 4 (0 disables all errors resilience)."
#~ msgstr ""
#~ "libavcodec może rozpoznawać błędy.\n"
++<<<<<<< HEAD
+#~ "Jednakże z błędnym koderem (np. ISO MPEG-4 od M$) może to wywołać dużo "
+#~ "błędów\n"
+#~ "Poprawne wartości od 0 do 4 (0 wyłącza jakiekolwiek rozpoznawanie błędów)."
++=======
+ #~ "Jednakże, z błędnym koderem (np. ISO MPEG-4 od M$) może to wywołać dużo "
+ #~ "błędów\n"
+ #~ "Porpawne wartości od 0 do 4 (0 wyłącza jakiekolwiek rozpoznawanie błędów)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
@@@ -32113,7 -32114,7 +34071,11 @@@
#~ "następującego kodera:\n"
#~ "%s.\n"
#~ "Jeśli nie wiesz jak rozwiązać ten problem, zwrócić się o wsparcie do "
++<<<<<<< HEAD
+#~ "Twojego dystrybutora.\n"
++=======
+ #~ "twojego dystrybutora.\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "\n"
#~ "To nie jest błąd wewnątrz VLC media playera.\n"
#~ "Nie kontaktuj projektu VideoLAN na ten temat.\n"
@@@ -32130,7 -32131,7 +34092,11 @@@
#~ "improving quality for a given bitrate at the cost of seeking precision."
#~ msgstr ""
#~ "Ustawia maksymalny interwał pomiędzy klatkami IDR. Większe wartości "
++<<<<<<< HEAD
+#~ "oszczędzają bity, a tym samym poprawiają jakość dla danego bitrate "
++=======
+ #~ "oszczędzają bity, a tym samym poprawiają jakość dla danej przepływności "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "kosztem precyzji szukania. Użyj -1 dla nieskończoności."
#, fuzzy
@@@ -32244,7 -32245,7 +34210,11 @@@
#~ "You should start by checking that source matches what you want your input "
#~ "to be and then press the \"Next\" button to continue.\n"
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Ten kreator umożliwia strumieniowanie lub konwertowanie Twoich plików "
++=======
+ #~ "Ten kreator umożliwia strumieniowanie lub konwertowanie twoich plików "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "multimedialnych w celu wykorzystania lokalnego, w sieci prywatnej lub w "
#~ "internecie.\n"
#~ "Sprawdź, czy źródło odpowiada pozycji, którą chcesz używać, a następnie "
@@@ -32252,14 -32253,14 +34222,22 @@@
#, fuzzy
#~ msgid "Select individual es to enable or disable from stream"
++<<<<<<< HEAD
+#~ msgstr "Kliknij, aby włączyć bądź wyłączyć losowe odtwarzanie."
++=======
+ #~ msgstr "Kliknij by włączyć bądź wyłączyć losowe odtwarzanie."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
#~ "Directory path where images files should be saved.If not set, then images "
#~ "will be automatically saved in users homedir."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Ścieżka katalogu, w którym zapisywane będą pliki obrazów. Brak ścieżki "
++=======
+ #~ "Ścieżka katalogu w którym zapisywane będą pliki obrazów. Brak ścieżki "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "oznacza automatycznie zapisywane plików w domowym katalogu użytkownika."
#, fuzzy
@@@ -32279,12 -32280,12 +34257,20 @@@
#~ "Sterownik XVideo przyspieszenia renderowania nie obsługuje wymaganej "
#~ "rozdzielczości: %ux%u pikseli. Maksymalna obsługiwana rozdzielczość to "
#~ "%<PRIu32>x%<PRIu32>.\n"
++<<<<<<< HEAD
+#~ "Przyspieszenie zostanie wyłączone. Jednak renderowanie filmów o zbyt "
++=======
+ #~ "Przyspieszenie zostanie wyłączone. Jednak, renderowanie filmów o zbyt "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "dużej rozdzielczości, może spowodować poważny spadek wydajności."
#, fuzzy
#~ msgid "Consider width and height as maximum values."
++<<<<<<< HEAD
+#~ msgstr "Kliknij, aby odtwarzać dźwięk z maksymalną głośnością."
++=======
+ #~ msgstr "Kliknij by odtwarzać dźwięk z maksymalną głośnością."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
@@@ -32317,8 -32318,8 +34303,13 @@@
#, fuzzy
#~ msgid "One instance when started from file"
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Używaj tylko jednej instancji, gdy uruchomiony został przez menedżera "
+#~ "plików"
++=======
+ #~ "Używaj tylko jednej instancji gdy uruchomiony został przez menedżera "
+ #~ "plików."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Enqueue items to playlist when in one instance mode"
@@@ -32547,15 -32548,15 +34538,24 @@@
#~ "This file countains an optional CRL to prevent remote clients from using "
#~ "revoked certificates in TLS sessions."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Ten plik zawiera opcjonalną listę CRL, aby zapobiec używaniu "
+#~ "unieważnionych certyfikatów podczas sesji TLS."
++=======
+ #~ "Ten plik zawiera opcjonalną listę CRL by zapobiec używaniu unieważnionych "
+ #~ "certyfikatów podczas sesji TLS."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
#~ "This allow you to configure the initial caching amount for stream output "
#~ "muxer. This value should be set in milliseconds."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "To pozwala skonfigurować początkową kwotę buforowania dla muksera "
++=======
+ #~ "To pozwala skonfigurować początkową kwotę buforowania dla muxera "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "strumienia wyjściowego. Ta wartość powinna podana być w milisekundach."
#, fuzzy
@@@ -32591,8 -32592,8 +34591,13 @@@
#, fuzzy
#~ msgid "Allow only one running instance when started from file."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Używaj tylko jednej instancji, gdy uruchomiony został przez menedżera "
+#~ "plików"
++=======
+ #~ "Używaj tylko jednej instancji gdy uruchomiony został przez menedżera "
+ #~ "plików."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Leave fullscreen"
@@@ -32684,7 -32685,7 +34689,11 @@@
#~ "This Blu-Ray Disc needs a library for AACS decoding, and your system does "
#~ "not have it."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Ta płyta Blu-ray wymaga biblioteki do dekodowania AACS, a Twój system jej "
++=======
+ #~ "Ta płyta Blu-ray wymaga biblioteki do dekodowania AACS, a twój system jej "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "nie posiada."
#, fuzzy
@@@ -32696,7 -32697,7 +34705,11 @@@
#~ "This Blu-Ray Disc needs a library for BD+ decoding, and your system does "
#~ "not have it."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Ta płyta Blu-ray wymaga biblioteki do dekodowania BD+, a Twój system jej "
++=======
+ #~ "Ta płyta Blu-ray wymaga biblioteki do dekodowania BD+, a twój system jej "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "nie posiada."
#, fuzzy
@@@ -32717,7 -32718,7 +34730,11 @@@
#~ "default, 25, 29.97, 50, 59.94, etc.)"
#~ msgstr ""
#~ "Wymuś używanie specjalnej liczby klatek dla wejścia obrazu DirectShow "
++<<<<<<< HEAD
+#~ "(np. 0 to domyślna, 25, 29.97, 50, 59.94 itp.)"
++=======
+ #~ "(np. 0 to domyślna, 25, 29.97, 50, 59.94, itp.)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Refresh list"
@@@ -32727,7 -32728,7 +34744,11 @@@
#~ msgid "VLC cannot open ANY capture device.Check the error log for details."
#~ msgstr ""
#~ "VLC nie może otworzyć jakiegokolwiek urządzenia przechwytywania. Sprawdź "
++<<<<<<< HEAD
+#~ "dziennik błędów, aby uzyskać szczegóły."
++=======
+ #~ "dziennik błędów by uzyskać szczegóły."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
@@@ -32795,15 -32796,15 +34816,27 @@@
#, fuzzy
#~ msgid "Bitrate peak"
++<<<<<<< HEAD
+#~ msgstr "Bitrate"
+
+#, fuzzy
+#~ msgid "Bitrate mode"
+#~ msgstr "ZastÄ…p bitrate"
+
+#, fuzzy
+#~ msgid "Audio bitmask"
+#~ msgstr "Bitrate dźwięku"
++=======
+ #~ msgstr "Przepływność"
+
+ #, fuzzy
+ #~ msgid "Bitrate mode"
+ #~ msgstr "Zastąp przepływność"
+
+ #, fuzzy
+ #~ msgid "Audio bitmask"
+ #~ msgstr "Przepływność dźwięku"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Audio volume (0-65535)."
@@@ -33363,7 -33364,7 +35396,11 @@@
#, fuzzy
#~ msgid "Outline Color"
++<<<<<<< HEAD
+#~ msgstr "Kolor konturu"
++=======
+ #~ msgstr "Kolor kontur"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Enable Video"
@@@ -33399,7 -33400,7 +35436,11 @@@
#, fuzzy
#~ msgid " input bitrate : %6.0f kb/s"
++<<<<<<< HEAD
+#~ msgstr "| bitrate wejściowy : %6.0f kb/s"
++=======
+ #~ msgstr "| przepływność wejściowa : %6.0f kb/s"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid " demux bytes read : %8.0f KiB"
@@@ -33407,7 -33408,7 +35448,11 @@@
#, fuzzy
#~ msgid " demux bitrate : %6.0f kb/s"
++<<<<<<< HEAD
+#~ msgstr "| bitrate demuksu : %6.0f kb/s"
++=======
+ #~ msgstr "| przepływność demuksu : %6.0f kb/s"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid " [Video Decoding]"
@@@ -33455,7 -33456,7 +35500,11 @@@
#, fuzzy
#~ msgid " sending bitrate : %6.0f kb/s"
++<<<<<<< HEAD
+#~ msgstr "| wysłany bitrate : %6.0f kb/s"
++=======
+ #~ msgstr "| wysłana przepływność : %6.0f kb/s"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid " m Show/Hide metadata box"
@@@ -33622,7 -33623,7 +35671,11 @@@
#, fuzzy
#~ msgid "Filename of the SQLite database"
++<<<<<<< HEAD
+#~ msgstr "Nazwa pliku czcionki, której chcesz używać"
++=======
+ #~ msgstr "Nazwa pliku czcionki której chcesz używać"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Path to the file containing the SQLite database"
@@@ -33831,7 -33832,7 +35884,11 @@@
#, fuzzy
#~ msgid "VLC could not open the video output module."
++<<<<<<< HEAD
+#~ msgstr "VLC nie może otworzyć modułu dekodera."
++=======
+ #~ msgstr "VLC nie może otworzyć modułu dekodera"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Deinterlace method to use for local playback."
@@@ -33928,11 -33929,11 +35985,19 @@@
#, fuzzy
#~ msgid "Video Bit Rate"
++<<<<<<< HEAD
+#~ msgstr "Bitrate obrazu"
+
+#, fuzzy
+#~ msgid "Audio Bit Rate"
+#~ msgstr "Bitrate dźwięku"
++=======
+ #~ msgstr "Przepływność obrazu"
+
+ #, fuzzy
+ #~ msgid "Audio Bit Rate"
+ #~ msgstr "Przepływność dźwięku"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Audio Sample Rate"
@@@ -34103,7 -34104,7 +36168,11 @@@
#~ "RTP packets will be authenticated and deciphered with this Secure RTP "
#~ "master shared secret key."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Pakiety RTP będą uwierzytelnione i odcyfrowane z tym wspólnym tajnym "
++=======
+ #~ "Pakiety RTP będa uwierzytelnione i odcyfrowane z tym wspólnym tajnym "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "kluczem mastera Secure RTP. Musi to być 32-znakowy ciąg szesnastkowy."
#, fuzzy
@@@ -34277,7 -34278,7 +36346,11 @@@
#, fuzzy
#~ msgid "VLC media player - Flash Viewer"
++<<<<<<< HEAD
+#~ msgstr "VLC media player - Interfejs internetowy"
++=======
+ #~ msgstr "VLC media player - Internetowy interfejs"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Streaming Output"
@@@ -34764,8 -34765,8 +36837,13 @@@
#~ "Name of the video device to use. If you don't specify anything, no video "
#~ "device will be used."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Nazwa urządzenia obrazu, które ma być używane przez wtyczkę DirectShow. "
+#~ "Jeśli nic nie podałeś, to będzie używane urządzenie domyślne."
++=======
+ #~ "Nazwa urządzenia obrazu które ma być używane przez wtyczkę DirectShow. "
+ #~ "Jeśli nic nie podałeś to będzie używane urządzenie domyślne."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
@@@ -34773,7 -34774,7 +36851,11 @@@
#~ "I420 (default), RV24, etc.)"
#~ msgstr ""
#~ "Wymuś używanie specjalnego formatu chromy dla wyjścia obrazu DirectShow "
++<<<<<<< HEAD
+#~ "(np. I420 (domyślny), RV24 itp.)"
++=======
+ #~ "(np. I420 (domyślny), RV24, itp.)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Audio Channel"
@@@ -34789,7 -34790,7 +36871,11 @@@
#, fuzzy
#~ msgid "Tuner to use, if there are several ones."
++<<<<<<< HEAD
+#~ msgstr "Mukser używany dla strumienia."
++=======
+ #~ msgstr "Muxer używany dla strumienia."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Set this option if the capture device outputs MJPEG"
@@@ -34801,7 -34802,7 +36887,11 @@@
#, fuzzy
#~ msgid "Quality of the stream."
++<<<<<<< HEAD
+#~ msgstr "Mukser używany dla strumienia."
++=======
+ #~ msgstr "Muxer używany dla strumienia."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Video4Linux"
@@@ -35056,9 -35057,9 +37146,15 @@@
#~ "network interfaces (0.0.0.0). If you want the HTTP interface to be "
#~ "available only on the local machine, enter 127.0.0.1"
#~ msgstr ""
++<<<<<<< HEAD
+#~ "To jest host, na którym interfejs będzie nasłuchiwać. Domyślnie dotyczy "
+#~ "to wszystkich interfejsów sieciowych (0.0.0.0). Jeśli chcesz, aby "
+#~ "interfejs był dostępny tylko na komputerze lokalnym, wpisz \"127.0.0.1\"."
++=======
+ #~ "To jest host na którym interfejs będzie nasłuchiwać. Domyślnie dotyczy to "
+ #~ "wszystkich interfejsów sieciowych (0.0.0.0). Jeśli chcesz aby interfejs "
+ #~ "był dostępny tylko na komputerze lokalnym, wpisz \"127.0.0.1\"."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "HTTP interace Certificates Revocation List file."
@@@ -35282,7 -35283,7 +37378,11 @@@
#, fuzzy
#~ msgid "\\ sending bitrate : %6.0f kb/s"
++<<<<<<< HEAD
+#~ msgstr "| wysłany bitrate : %6.0f kb/s"
++=======
+ #~ msgstr "| wysłana przepływność : %6.0f kb/s"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid " Playlist (By category) "
@@@ -35443,16 -35444,16 +37543,29 @@@
#~ "Title, $L Time Remaining, $N Name, $O Audio language, $P Position, $R "
#~ "Rate, $S Sample rate, $T Time elapsed, $U Publisher, $V Volume"
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Wyświetla przewijający się tekst. (Dostępny format ciągów: Dotyczące "
+#~ "czasu: %Y = rok, %m = miesiąc, %d = dzień, %H = godzina, %M = minuta, %S "
+#~ "= sekunda, ... DotyczÄ…ce metadanych: $a = wykonawca, $b = album, $c = "
+#~ "prawa autorskie, $d = opis, $e = kodowane przez, $g = gatunek, $l = "
+#~ "język, $n = numer utworu, $p = teraz odtwarzane, $r = ocena, $s = język "
+#~ "napisów, $t = tytuł, $u = adres URL, $A = data, $B = bitrate dźwięku (w "
+#~ "kb/s), $C = rozdział, $D = czas trwania, $F = pełna ścieżka z nazwą, $I = "
+#~ "tytuł, $L = pozostało, $N = nazwa, $O = język dźwięku, $P = pozycja (w "
+#~ "%), $R = częstotliwość, $S = częstotliwość próbkowania dźwięku (w kHz), "
+#~ "$T = czas, $U = wydawca, $V = głośność, $_ = nowa linia)"
++=======
+ #~ "Wyświetla przewijający się tekst. (Dostępny format stringów: Dotyczące "
+ #~ "czasu: %Y = rok, %m = miesiąc, %d = dzień, %H = godzina, %M = minuta, %S "
+ #~ "= sekunda, ... DotyczÄ…ce metadane: $a = wykonawca, $b = album, $c = prawa "
+ #~ "autorskie, $d = opis, $e = kodowane przez, $g = gatunek, $l = język, $n = "
+ #~ "numer utworu, $p = teraz odtwarzane, $r = ocena, $s = język napisów, $t = "
+ #~ "tytuł, $u = adres URL, $A = data, $B = przepływność dźwięku (w kb/s), $C "
+ #~ "= rozdział, $D = czas trwania, $F = pełna ścieżka z nazwą, $I = tytuł, $L "
+ #~ "= pozostało, $N = nazwa, $O = język dźwięku, $P = pozycja (w %), $R = "
+ #~ "częstotliwość, $S = częstotliwość próbkowania dźwięku (w kHz), $T = czas, "
+ #~ "$U = wydawca, $V = głośność, $_ = nowa linia)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Use SAP cache"
@@@ -35518,7 -35519,7 +37631,11 @@@
#~ "Output chroma for the snapshot image (a 4 character string, like "
#~ "\"RV32\")."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Chroma wyjścia dla obrazu pamięci jako 4-literowy ciąg, np. \"RV32\"."
++=======
+ #~ "Chroma wyjścia dla obrazu pamięci jako 4-literowy string, np. \"RV32\"."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Snapshot output"
@@@ -35645,7 -35646,7 +37762,11 @@@
#, fuzzy
#~ msgid "Settings for audio+video and miscellaneous decoders and encoders."
++<<<<<<< HEAD
+#~ msgstr "Ustawienia tylko dekoderów i koderów dźwiękowych."
++=======
+ #~ msgstr "Ustawienia dekoderów i koderów tylko dźwiękowych."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Random off"
@@@ -35657,7 -35658,7 +37778,11 @@@
#, fuzzy
#~ msgid "VLC could not open the packetizer module."
++<<<<<<< HEAD
+#~ msgstr "VLC nie może otworzyć modułu dekodera."
++=======
+ #~ msgstr "VLC nie może otworzyć modułu dekodera"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Show interface with mouse"
@@@ -36008,7 -36009,7 +38133,11 @@@
#, fuzzy
#~ msgid "Bitrate Tolerance:"
++<<<<<<< HEAD
+#~ msgstr "Tolerancja bitrate obrazu"
++=======
+ #~ msgstr "Tolerancja przepływności obrazu"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Deinterlace:"
@@@ -36319,7 -36320,7 +38448,11 @@@
#, fuzzy
#~ msgid "Video On Demand"
++<<<<<<< HEAD
+#~ msgstr "Wideo na życzenie (VOD)"
++=======
+ #~ msgstr "Wideo na żądanie ( VOD )"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "FFmpeg video filter"
@@@ -36457,24 -36458,24 +38590,39 @@@
#~ "Name of the device to use. If you don't specify anything, /dev/video0 "
#~ "will be used."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Nazwa urządzenia obrazu, które ma być używane przez wtyczkę DirectShow. "
+#~ "Jeśli nic nie podałeś, to będzie używane urządzenie domyślne."
++=======
+ #~ "Nazwa urządzenia obrazu które ma być używane przez wtyczkę DirectShow. "
+ #~ "Jeśli nic nie podałeś to będzie używane urządzenie domyślne."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
#~ "Name of the audio device to use. If you don't specify anything, \"/dev/dsp"
#~ "\" will be used for OSS."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Nazwa urządzenia dźwięku, które ma być używane przez wtyczkę DirectShow. "
+#~ "Jeśli nic nie podałeś, to będzie używane urządzenie domyślne."
++=======
+ #~ "Nazwa urządzenia dźwięku które ma być używane przez wtyczkę DirectShow. "
+ #~ "Jeśli nic nie podałeś to będzie używane urządzenie domyślne."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
#~ "Name of the audio device to use. If you don't specify anything, \"/dev/dsp"
#~ "\" will be used for OSS, \"hw\" for Alsa."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Nazwa urządzenia dźwięku, które ma być używane przez wtyczkę DirectShow. "
+#~ "Jeśli nic nie podałeś, to będzie używane urządzenie domyślne."
++=======
+ #~ "Nazwa urządzenia dźwięku które ma być używane przez wtyczkę DirectShow. "
+ #~ "Jeśli nic nie podałeś to będzie używane urządzenie domyślne."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Audio method"
@@@ -36485,8 -36486,8 +38633,13 @@@
#~ "Name of the audio device to use. If you don't specify anything, no audio "
#~ "device will be used."
#~ msgstr ""
++<<<<<<< HEAD
+#~ "Nazwa urządzenia dźwięku, które ma być używane przez wtyczkę DirectShow. "
+#~ "Jeśli nic nie podałeś, to będzie używane urządzenie domyślne."
++=======
+ #~ "Nazwa urządzenia dźwięku które ma być używane przez wtyczkę DirectShow. "
+ #~ "Jeśli nic nie podałeś to będzie używane urządzenie domyślne."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "spatializer"
diff --combined po/ps.po
index 2d039cd,b68ac9a..cbcac16
--- a/po/ps.po
+++ b/po/ps.po
@@@ -11,7 -11,7 +11,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2009-04-12 10:26-0800\n"
"Last-Translator: Zabeeh Khan <zabeehkhan @ gmail.com>\n"
"Language-Team: Pashto\n"
@@@ -135,7 -135,7 +139,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -446,10 -446,10 +454,17 @@@ msgid "&About
msgstr "په اړه&"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -492,17 -492,17 +507,29 @@@ msgid "Save...
msgstr "ساتل..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "ټول تکرارول"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr ""
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -585,7 -585,7 +612,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "ناتوانول"
@@@ -1285,20 -1285,20 +1316,36 @@@ msgstr "چوکاټ چټکتيا
msgid "Decoded format"
msgstr "وزله"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1694,7 -1694,7 +1741,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1778,7 -1778,7 +1829,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Ù‡ÛÚ…"
@@@ -1802,7 -1802,7 +1857,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "ويډيو توانول"
@@@ -1992,7 -1992,7 +2051,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "تل پر سر"
@@@ -2043,7 -2043,7 +2106,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2052,7 -2052,7 +2119,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2108,7 -2108,7 +2179,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2278,7 -2278,7 +2353,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "چوکاټونه پرÛښودل"
@@@ -2407,12 -2407,12 +2486,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2420,7 -2420,7 +2508,11 @@@ msgid "Default
msgstr "تلواله"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2728,7 -2728,7 +2820,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3549,7 -3549,7 +3645,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "پرÛښودل"
@@@ -3573,8 -3573,8 +3673,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3656,10 -3656,10 +3761,17 @@@ msgid "Slower (fine)
msgstr "ورو (سم)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3672,10 -3672,10 +3784,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "مخکنی"
@@@ -3684,9 -3684,9 +3803,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3921,9 -3921,9 +4046,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "غلي کول"
@@@ -4350,7 -4350,7 +4481,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "سملاسی انÚور"
@@@ -4547,12 -4547,12 +4682,21 @@@ msgstr "رالÛÚšÙ„ Ú©ÙŠÚ–ÙŠ ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "بندول"
@@@ -5319,7 -5319,7 +5463,11 @@@ msgstr "سکڼل
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7689,7 -7689,7 +7837,11 @@@ msgstr "پرده ننوتÛ
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "پرده"
@@@ -8473,7 -8473,7 +8625,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9620,7 -9620,7 +9776,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "السا غږيز وتÛ"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "د غږيز ÙˆØªÛ Ù¾Ø§ØªÛ Ø±Ø§ØºÙ„Ù‡"
@@@ -9655,7 -9655,7 +9815,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "د ويډيو ياد وتÛ"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "د غږيز ÙˆØªÛ Ù¾Ø§ØªÛ Ø±Ø§ØºÙ„Ù‡"
@@@ -9665,31 -9665,31 +9829,55 @@@
msgid "Last audio device"
msgstr "د غږيز وزله"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "د غږيز وزله وټاکئ"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10875,46 -10875,46 +11063,74 @@@ msgstr "سوری
msgid "Outline"
msgstr "بهرليکه"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "تور"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "خړ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "سپين"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "سور"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10922,61 -10922,61 +11138,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "زÛÚ“"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "شين"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "نيله"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11106,7 -11106,7 +11358,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12933,10 -12933,10 +13189,17 @@@ msgid "Fast
msgstr "ګړندی"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Ù„ÛÙˆÛŒ"
@@@ -13046,8 -13046,8 +13309,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13393,9 -13393,9 +13661,15 @@@ msgstr "Ù¾Ûلول Ú©ÙŠÚ–ÙŠ
msgid "Opening"
msgstr "پرانيستل کيږي"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Úنډول"
@@@ -15328,7 -15328,7 +15602,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15507,7 -15507,7 +15785,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "لړيال"
@@@ -15601,9 -15601,9 +15883,15 @@@ msgstr "_Ùايل
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "ساتل"
@@@ -15746,7 -15746,7 +16034,11 @@@ msgstr "کوم Ù†Ù†ÙˆØªÛ ÙˆÙ†Ù‡ مون
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15767,7 -15767,7 +16059,11 @@@ msgstr "
msgid "Backward"
msgstr "ورو&سته ټوپ وهل"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15777,7 -15777,7 +16073,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15798,87 -15798,87 +16098,158 @@@ msgstr "_وديو
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "_Ùايل"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "نه تکرارول"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "تلواله ډکون"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "اغÛزÛ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -15919,7 -15919,7 +16290,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16118,8 -16118,8 +16493,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "دوديز"
@@@ -16212,37 -16212,37 +16592,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "Ø±Ø³Ù†Û Ú©ØªØ§Ø¨ØªÙˆÙ† کارول"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "پرمختلل"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "زاړه غوراوي ړنګول غواړﺉ؟"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "زاړه غوراوي ړنګول غواړﺉ؟"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16396,7 -16396,7 +16808,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Lock Aspect Ratio"
msgstr "د بروكرام به هكله"
@@@ -16534,7 -16534,7 +16950,11 @@@ msgstr "پټول VLC
msgid "Hide Others"
msgstr "نور پټول"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "ټول ښودل"
@@@ -16623,15 -16623,15 +17043,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16647,30 -16647,30 +17079,56 @@@ msgstr "غږ ټيټول
msgid "Audio Device"
msgstr "د غږيز وزله"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Ù„ÛÙˆÛŒ Ú©Ú†"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Ù¾Ø±Ø¯Û Ø³Ø±Ù‡ برابرول"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Ù„ÛÙˆÛŒ Ú©Ú†"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Ù¾Ø±Ø¯Û Ø³Ø±Ù‡ برابرول"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16679,7 -16679,7 +17137,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "د Ú…Ûرمه سرليک دوتنه"
@@@ -16920,7 -16920,7 +17382,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "ټاکل..."
@@@ -17104,7 -17104,7 +17570,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr "_Ùايل"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "د Ù„ÙŠÚ©Ø¨Ú¼Û Ú©Ú†"
@@@ -17335,12 -17335,12 +17805,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "غوراوي"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "ټول پاکول"
@@@ -17524,133 -17524,128 +18002,241 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "بيا غږول"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "د ښوون امستنÛ"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "د ښوون امستنÛ"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "د Ù„ÙŠÚ©Ø¨Ú¼Û Ø±Ù†Ú«"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "ليکبڼه"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "_Ùايل"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "_غر"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "بهرليکه"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "ښوون"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "ÙˆØªÛ Ø±ØºØ¨ÛÙ„Ú«Ù‡"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "پوښÛ"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "بڼه"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "ÙˆØªÛ Ø±ØºØ¨ÛÙ„Ú«Ù‡"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "پوښÛ"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "بڼه"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "غوراوي پاکول"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17663,35 -17658,35 +18249,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "ټاکل"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "ټاکل"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19715,20 -19710,20 +20331,36 @@@ msgstr "ټاکل شوی توکی ړنګ
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "جوړول"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "You must set a name for the profile."
msgstr "_Ùايل"
@@@ -23163,46 -23158,46 +23795,82 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "د Ù„ÙŠÚ©Ø¨Ú¼Û Ú©Ú† په Ù¾Ûکسلو"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "د Ù„ÙŠÚ©Ø¨Ú¼Û Ú©Ú† په Ù¾Ûکسلو"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "بهرليکه"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23211,99 -23206,99 +23879,179 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "شاليد"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "شاليد"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "بهرليکه"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
++=======
+ #: modules/text_renderer/freetype.c:187
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow opacity"
msgstr "سوری"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "سوری"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
++=======
+ #: modules/text_renderer/freetype.c:189
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow angle"
msgstr "سوری"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "وړوکی"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "وړوکی"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "غټ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/pt_BR.po
index ad53709,0ee3268..7157ec2
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-02-04 12:42-0300\n"
"Last-Translator: Sidney Doria <ssdoria at gmail.com>\n"
"Language-Team: Brazilian Portuguese\n"
@@@ -137,7 -137,7 +141,11 @@@ msgstr "Outras configurações e módul
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -493,10 -493,10 +501,17 @@@ msgid "&About
msgstr "&Sobre"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -535,17 -535,17 +550,29 @@@ msgid "Save...
msgstr "Salvar..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Repetir Todas"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Repertir Um"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -652,7 -652,7 +679,11 @@@ msgstr "O número máximo de filtros (%
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Desabilitar"
@@@ -1403,22 -1403,22 +1434,38 @@@ msgstr "Taxa de quadros
msgid "Decoded format"
msgstr "Formato decodificado"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "A entrada não pode ser aberta"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "A entrada não pode ser aberta"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"O VLC não é capaz de abrir o MRL '%s'. Verifique o registro de erros para "
"maiores detalhes."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "Não foi possÃvel reconhecer o formato da entrada"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "Não foi possÃvel reconhecer o formato da entrada"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1858,7 -1858,7 +1905,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1947,7 -1947,7 +1998,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Nenhum"
@@@ -1978,7 -1978,7 +2033,11 @@@ msgstr "
"Este é o método de saÃda de vÃdeo usado pelo VLC. O padrão é selecionar "
"automaticamente o melhor método disponÃvel."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Habilitar vÃdeo"
@@@ -2188,7 -2188,7 +2247,11 @@@ msgstr "
"por padrão."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Sempre visÃvel"
@@@ -2243,7 -2243,7 +2306,11 @@@ msgstr "Oculta o cursor e o controle d
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2252,7 -2252,7 +2319,11 @@@ msgstr "Desentrelaçamento
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Modo desentrelaçar"
@@@ -2310,7 -2310,7 +2381,11 @@@ msgstr "
"Impede a ação do gerenciador de energia durante a reprodução, para evitar "
"que o computador entre em suspensão por inatividade."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Decorações da janela"
@@@ -2512,7 -2512,7 +2587,11 @@@ msgstr "
"perpendiculares (1:1). Se você tem uma tela em 16:9, pode precisar modificar "
"esta proporção para 4:3 de forma a manter a imagem proporcional."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Descartar quadros"
@@@ -2658,12 -2658,12 +2737,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2671,7 -2671,7 +2759,11 @@@ msgid "Default
msgstr "Padrão"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -3025,7 -3025,7 +3117,11 @@@ msgid "You can completely disable the s
msgstr "Você pode desabilitar completamente o processamento de sub telas."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3991,7 -3991,7 +4087,11 @@@ msgid "These settings are the global VL
msgstr ""
"Estas configurações definem as teclas conhecidas como \"teclas de atalho\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignorar"
@@@ -4017,8 -4017,8 +4117,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4101,10 -4101,10 +4206,17 @@@ msgid "Slower (fine)
msgstr "Mais lento (um pouco)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4117,10 -4117,10 +4229,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Selecionar tecla de atalho para reprodução do próximo item da lista."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Anterior"
@@@ -4129,9 -4129,9 +4248,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "Selecionar tecla de atalho para reprodução do item anterior da lista."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4372,9 -4372,9 +4497,15 @@@ msgid "Select the key to decrease audi
msgstr "Selecione a tecla de atalho para diminuir o volume."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Sem Ãudio"
@@@ -4805,7 -4805,7 +4936,11 @@@ msgstr "Repete os dispositivos de áudi
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Capturar Imagem"
@@@ -5011,12 -5011,12 +5146,21 @@@ msgstr "Baixando...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Cancelar"
@@@ -5784,7 -5784,7 +5928,11 @@@ msgstr "Recortar
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Proporção"
@@@ -8323,7 -8323,7 +8471,11 @@@ msgstr "Entrada de tela
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Tela"
@@@ -9090,7 -9090,7 +9242,11 @@@ msgstr "Volume máx #
msgid "Volume Set"
msgstr "Configuração do Volume"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10307,7 -10307,7 +10463,11 @@@ msgstr "Efeito Som Ambiente 7.1
msgid "ALSA audio output"
msgstr "SaÃda de áudio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Falha na saÃda de áudio"
@@@ -10341,7 -10341,7 +10501,11 @@@ msgstr "SaÃda de áudio AudioQueue (iO
msgid "Android AudioTrack audio output"
msgstr "SaÃda de vÃdeo do Android Surface"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "SaÃda AudioUnit HAL"
@@@ -10351,21 -10351,21 +10515,37 @@@
msgid "Last audio device"
msgstr "Dispositivo de áudio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "SaÃda AudioUnit HAL"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "SaÃda AudioUnit HAL"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"O dispositivo de saÃda de áudio selecionado está em uso por outro programa."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "O dispositivo de áudio não está configurado"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "O dispositivo de áudio não está configurado"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
@@@ -10375,12 -10375,12 +10555,20 @@@ msgstr "
"\"Configuração de Ãudio Midi\" em /Aplicativos/Utilitários. O modo estéreo "
"está sendo usado agora."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Selecionar seu dispositivo de saÃda de áudio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (SaÃda Codificada)"
@@@ -11685,46 -11685,46 +11873,74 @@@ msgstr "Sombra
msgid "Outline"
msgstr "Roteiro"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Preto"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Cinza"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Prata"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Branco"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Marrom"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Vermelho"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11732,61 -11732,61 +11948,97 @@@ msgid "Fuchsia
msgstr "Fuchsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Amarelo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Verde-oliva"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Verde"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Esmeralda"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Limão"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Roxo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Naval"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Azul"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11939,7 -11939,7 +12191,11 @@@ msgstr "Legendas (avançado)
msgid "Subtitle renderers using libass"
msgstr "Legendas são exibidas usando libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Configurando o cache de fontes"
@@@ -13932,10 -13932,10 +14188,17 @@@ msgid "Fast
msgstr "Mais rápido"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -14053,8 -14053,8 +14316,13 @@@ msgid "D-Bus control interface
msgstr "Interface de controle D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14412,9 -14412,9 +14680,15 @@@ msgstr "Iniciando
msgid "Opening"
msgstr "Abrindo"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pausar"
@@@ -16429,7 -16429,7 +16703,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Descombinador de fluxo de transporte MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Tele texto"
@@@ -16609,7 -16609,7 +16887,11 @@@ msgid "VLC media player Help
msgstr "Ajuda do Reprodutor de MÃdias VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Ãndice"
@@@ -16700,9 -16700,9 +16982,15 @@@ msgstr "Preencha um nome para a nova pa
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Salvar"
@@@ -16852,7 -16852,7 +17140,11 @@@ msgstr "
"O fluxo deve estar sendo reproduzido ou pausado para que os favoritos "
"funcionem."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Saltar para o momento"
@@@ -16872,7 -16872,7 +17164,11 @@@ msgstr "
msgid "Backward"
msgstr "Retroceder"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16882,7 -16882,7 +17178,11 @@@ msgstr "
msgid "Forward"
msgstr "Avançar"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16903,90 -16903,90 +17203,161 @@@ msgstr "Alternar Modo Tela Inteira
msgid "Click to enable fullscreen video playback."
msgstr "Desabilitar a proteção de tela durante a reprodução de vÃdeo."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "Selecionar tecla de atalho para parar a reprodução."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Exibir/Ocultar Lista de Reprodução"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Exibir/Ocultar Lista de Reprodução"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Repetir"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Aleatório"
+
+#: modules/gui/macosx/ControlsBar.m:484
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Aleatório"
+
+ #: modules/gui/macosx/ControlsBar.m:450
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to enable or disable random playback."
msgstr "Selecionar um es individual para habilitar ou desabilitar do fluxo"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "Selecione a tecla de atalho para desabilitar o áudio."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Volume Total"
+
+#: modules/gui/macosx/ControlsBar.m:493
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Volume Total"
+
+ #: modules/gui/macosx/ControlsBar.m:459
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to play the audio at maximum volume."
msgstr "Considera a largura e a altura como os valores máximos."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efeitos"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr "Selecionar tecla de atalho para reprodução do item anterior da lista."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the next playlist item."
msgstr "O VLC reproduzirá o item atual da lista de reprodução."
++<<<<<<< HEAD
++=======
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -17027,7 -17027,7 +17398,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17226,8 -17226,8 +17601,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Personalizado"
@@@ -17330,38 -17330,38 +17710,70 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "Reprodutor de MÃdias VLC"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Registro de travamentos não encontrado"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Registro de travamentos não encontrado"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Continuar"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Não foi possÃvel encotrar nenhum registro do defeito anterior."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Excluir as preferências anteriores?"
+
+#: modules/gui/macosx/intf.m:1937
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Não foi possÃvel encotrar nenhum registro do defeito anterior."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Excluir as preferências anteriores?"
+
+ #: modules/gui/macosx/intf.m:1922
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "We just found an older version of VLC's preferences files."
msgstr ""
"Encontramos uma versão mais antiga do VLC nos arquivos de configuração."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Excluir e reiniciar o VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Excluir e reiniciar o VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "Registro de Depuração do VLC (%s).rtfd"
@@@ -17538,7 -17538,7 +17950,11 @@@ msgid "
msgstr ""
"Esta opção permite que a interface modifique seu Ãcone em várias ocasiões."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Manter Proporção entre Altura e Largura"
@@@ -17679,7 -17679,7 +18095,11 @@@ msgstr "Ocultar o VLC
msgid "Hide Others"
msgstr "Ocultar Outros"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Exibir Todos"
@@@ -17768,15 -17768,15 +18188,27 @@@ msgstr "Sincronização da Trilha
msgid "A→B Loop"
msgstr "Repetir A->B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Fechar após a Reprodução"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Avançar um Passo"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Fechar após a Reprodução"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Avançar um Passo"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Retroceder um Passo"
@@@ -17792,30 -17792,30 +18224,56 @@@ msgstr "Diminuir Volume
msgid "Audio Device"
msgstr "Dispositivo de Ãudio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Metade do Tamanho"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Tamanho Normal"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dobrar Tamanho"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Ajustar ao Tamanho da Tela"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Metade do Tamanho"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Tamanho Normal"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dobrar Tamanho"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Ajustar ao Tamanho da Tela"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Destacar"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Dispositivo de vÃdeo de Tela Inteira"
@@@ -17824,7 -17824,7 +18282,11 @@@
msgid "Post processing"
msgstr "Pós processamento"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Arquivo de legenda"
@@@ -18063,7 -18063,7 +18525,11 @@@ msgid "Play another media synchronously
msgstr "Reproduzir outra mÃdia de forma sÃncrona"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Procurar..."
@@@ -18255,7 -18255,7 +18721,11 @@@ msgstr "QPS
msgid "Subtitle encoding"
msgstr "Codificação de legendas"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Tamanho da fonte"
@@@ -18485,12 -18485,12 +18955,20 @@@ msgstr "Erro salvando metadados
msgid "VLC was unable to save the meta data."
msgstr "O VLC não conseguiu salvar os metadados."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Preferências"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Restaurar Padrão"
@@@ -18674,132 -18674,127 +19152,240 @@@ msgstr "
msgid "Lua HTTP"
msgstr "HTTP Lua"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Pausar a reprodução"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Codificação padrão"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Configurações da Tela"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Codificação padrão"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Configurações da Tela"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Cor da fonte"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Fonte"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Idioma da legenda"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Idioma preferido para a legenda"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Habilitar OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Habilitar OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Opacidade"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Impor negrito"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Impor negrito"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Cor do esboço"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Espessura da linha"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Tela Escura em Modo Tela Inteira"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Tela Escura em Modo Tela Inteira"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Exibir"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Módulos de saÃda"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Capturas de vÃdeo"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Pasta"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Formato"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefixo"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Numeração seqüencial"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Última verificação em: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Nenhuma verificação foi feita ainda."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Módulos de saÃda"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Capturas de vÃdeo"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Pasta"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Formato"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefixo"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Numeração seqüencial"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Última verificação em: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Nenhuma verificação foi feita ainda."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "MÃnima latência"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Baixa latência"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Alta latência"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Máxima latência"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Restaurar Preferências"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18812,21 -18807,21 +19398,38 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Escolhe a pasta para gravar suas capturas de vÃdeo."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Escolher"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Escolhe a pasta para gravar suas capturas de vÃdeo."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Escolher"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Choose the directory or filename where the records will be stored."
msgstr ""
"Escolha a pasta ou nome do arquivo onde os registros serão armazenados."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18834,16 -18829,16 +19437,29 @@@ msgstr "
"Digite novas teclas para\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Combinação inválida"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Lamentavelmente, estas teclas não podem ser associadas a atalhos."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Combinação inválida"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Lamentavelmente, estas teclas não podem ser associadas a atalhos."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Esta combinação já é usada por \"%@\"."
@@@ -20968,20 -20963,20 +21584,36 @@@ msgstr "Excluir o perfil selecionado
msgid "Create a new profile"
msgstr "Criar um perfil novo"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Criar"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Perfil Sem Nome"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Perfil Sem Nome"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Você deve preencher um nome para o perfil."
@@@ -24565,23 -24560,23 +25197,43 @@@ msgstr "SaÃda do transcodificador de f
msgid "Overlays/Subtitles"
msgstr "Sobreposições/Legendas"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "FamÃlia de fontes para a fonte que deseja usar"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Nome do arquivo para a fonte que deseja usar"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Tamanho da fonte em pontos"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "FamÃlia de fontes para a fonte que deseja usar"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Nome do arquivo para a fonte que deseja usar"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Tamanho da fonte em pontos"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24590,11 -24585,11 +25242,19 @@@ msgstr "
"Tamanho padrão das fontes que serão exibidas no vÃdeo. Se for definido algo "
"diferente de zero, esta opção irá sobrepor o tamanho relativo da fonte."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Opacidade do texto"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Opacidade do texto"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24602,12 -24597,12 +25262,20 @@@ msgstr "
"A opacidade (inverso de translucidez) do texto que será desenhado na tela. 0 "
"= transparente, 255 = totalmente opaco."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Cor padrão do texto"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24620,12 -24615,12 +25288,20 @@@ msgstr "
"verde, então o azul. #000000 = preto, #FF0000 = vermelho, #00FF00 = verde, "
"#FFFF00 = amarelo (vermelho + verde), #FFFFFF = branco"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Fonte de tamanho relativo"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24634,59 -24629,59 +25310,111 @@@ msgstr "
"Tamanho relativo das fontes que serão exibidas no vÃdeo. Se um tamanho "
"absoluto de fonte for especificado, o tamanho relativo será sobreposto."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Opacidade do fundo"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Cor do fundo"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Opacidade do esboço"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Opacidade da sombra"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Cor da sombra"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Ângulo da sombra"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Distância da sombra"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Opacidade do fundo"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Cor do fundo"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Opacidade do esboço"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Opacidade da sombra"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Cor da sombra"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Ângulo da sombra"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Distância da sombra"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Menor"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Pequeno"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Grande"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Maior"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Usar exibição YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Usar exibição YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24694,23 -24689,23 +25422,43 @@@ msgstr "
"Exibe a fonte usando \"YUV paletizada\". Esta opção só é necessária se você "
"quiser codificar em legendas DVB"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Fino"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Cheio"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Gerador de textos"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Gerador de fonte Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Fino"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Cheio"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Gerador de textos"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Gerador de fonte Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/pt_PT.po
index 64f06b6,14608e2..33a978c
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@@ -17,7 -17,7 +17,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-10-25 16:44+0000\n"
"Last-Translator: Bruno Queiros <bqueiros at gmail.com>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/"
@@@ -146,7 -146,7 +150,11 @@@ msgstr "Várias definições e módulo
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -501,10 -501,10 +509,17 @@@ msgid "&About
msgstr "(&A)Sobre"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -543,17 -543,17 +558,29 @@@ msgid "Save...
msgstr "&Guardar como..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Repetir Todos"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Repetir Um"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -659,7 -659,7 +686,11 @@@ msgstr "O número máximo de filtros (%
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Desactivar"
@@@ -1348,20 -1348,20 +1379,36 @@@ msgstr "Taxa de frames
msgid "Decoded format"
msgstr "Formato descodificado"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "A sua entrada não pode ser aberta"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "A sua entrada não pode ser aberta"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC não consegue abrir o MRL '%s'. Verifique os detalhes no log."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC não consegue reconhecer o formato de entrada"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC não consegue reconhecer o formato de entrada"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1795,7 -1795,7 +1842,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1884,7 -1884,7 +1935,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Nenhum"
@@@ -1914,7 -1914,7 +1969,11 @@@ msgstr "
"Este é o método de saÃda de vÃdeo usado por VLC. O comportamento padrão é "
"seleccionar o melhor método disponÃvel."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Activar vÃdeo"
@@@ -2125,7 -2125,7 +2184,11 @@@ msgstr "
"por padrão."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Sempre no topo"
@@@ -2181,7 -2181,7 +2244,11 @@@ msgstr "Oculta o cursor e o controle d
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2190,7 -2190,7 +2257,11 @@@ msgstr "Desentrelaçar
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Modo de desentrelaçar"
@@@ -2248,7 -2248,7 +2319,11 @@@ msgstr "
"Inibir o daemon de gestão de energia durante a reprodução para evitar que o "
"computador entre em suspensão devido a inactividade."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Decorações de janela"
@@@ -2451,7 -2451,7 +2526,11 @@@ msgstr "
"perpendiculares (1:1). Se você tem uma tela em 16:9, pode precisar modificar "
"esta proporção para 4:3 de forma a manter a imagem proporcional."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Saltar frames"
@@@ -2597,12 -2597,12 +2676,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2610,7 -2610,7 +2698,11 @@@ msgid "Default
msgstr "Padrão"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2959,7 -2959,7 +3051,11 @@@ msgid "You can completely disable the s
msgstr "Você pode desactivar completamente o processamento de sub-imagens."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3923,7 -3923,7 +4019,11 @@@ msgid "These settings are the global VL
msgstr ""
"Estas configurações definem as teclas conhecidas como \"teclas de atalho\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignorar"
@@@ -3949,8 -3949,8 +4049,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4034,10 -4034,10 +4139,17 @@@ msgid "Slower (fine)
msgstr "Mais lento (um pouco)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4050,10 -4050,10 +4162,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Selecionar tecla de atalho para reprodução do próximo item da lista."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Anterior"
@@@ -4062,9 -4062,9 +4181,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "Selecionar tecla de atalho para reprodução do item anterior da lista."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4305,9 -4305,9 +4430,15 @@@ msgid "Select the key to decrease audi
msgstr "Seleccione a tecla de atalho para diminuir o volume."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Emudecer"
@@@ -4732,7 -4732,7 +4863,11 @@@ msgstr "Alterna os dispositivos de áud
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Snapshot"
@@@ -4938,12 -4938,12 +5073,21 @@@ msgstr "a transferir ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Cancelar"
@@@ -5708,7 -5708,7 +5852,11 @@@ msgstr "Cortar
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Proporção de aspecto"
@@@ -8194,7 -8194,7 +8342,11 @@@ msgstr "Entrada do ecrã
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Ecrã"
@@@ -8928,7 -8928,7 +9080,11 @@@ msgstr "Max vol #
msgid "Volume Set"
msgstr "Configura Volume"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10040,7 -10040,7 +10196,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "SaÃda de áudio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "SaÃda de áudio falhou"
@@@ -10073,7 -10073,7 +10233,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -10081,32 -10081,32 +10245,56 @@@
msgid "Last audio device"
msgstr "Último dispositivo de audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "SaÃda AudioUnit HAL"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "SaÃda AudioUnit HAL"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"O dispositivo de saÃda de audio seleccionado encontra-se em uso exclusivo "
"por outro programa."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Dispositivo de áudio não está configurado"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Dispositivo de áudio não está configurado"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (SaÃda Codificada)"
@@@ -11284,46 -11284,46 +11472,74 @@@ msgstr "Sombra
msgid "Outline"
msgstr "Contorno"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Preto"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Cinzento"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Prata"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Branco"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Marrom"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Vermelho"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11331,61 -11331,61 +11547,97 @@@ msgid "Fuchsia
msgstr "Magenta"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Amarelo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Cor de azeitona"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Verde"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Teal"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lima"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Roxo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Marinho"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Azul"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11517,7 -11517,7 +11769,11 @@@ msgstr "Legendas (avançadas)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13323,10 -13323,10 +13579,17 @@@ msgid "Fast
msgstr "Rápido"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -13435,8 -13435,8 +13698,13 @@@ msgid "D-Bus control interface
msgstr "Interface de controlo D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13772,9 -13772,9 +14040,15 @@@ msgstr "Inicializando
msgid "Opening"
msgstr "Abrindo"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pausa"
@@@ -15656,7 -15656,7 +15930,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletexto"
@@@ -15835,7 -15835,7 +16113,11 @@@ msgid "VLC media player Help
msgstr "Ajuda do media player VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Ãndice"
@@@ -15923,9 -15923,9 +16205,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Gravar"
@@@ -16067,7 -16067,7 +16355,11 @@@ msgstr "Nenhuma entrada encontrada
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Saltar Para Tempo"
@@@ -16087,7 -16087,7 +16379,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16097,7 -16097,7 +16393,11 @@@ msgstr "
msgid "Forward"
msgstr "Avançar"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16117,84 -16117,84 +16417,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Repetir"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Misturar"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Misturar"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efeitos"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16230,7 -16230,7 +16601,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16413,8 -16413,8 +16788,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Personalizado"
@@@ -16507,36 -16507,36 +16887,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Continuar"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Remover preferências antigas?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Remover preferências antigas?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16689,7 -16689,7 +17101,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16818,7 -16818,7 +17234,11 @@@ msgstr "Esconder VLC
msgid "Hide Others"
msgstr "Esconder Outros"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Mostrar Todos"
@@@ -16903,15 -16903,15 +17323,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Salto curto para a frente"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Salto curto para a frente"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Salto curto para trás"
@@@ -16927,30 -16927,30 +17359,56 @@@ msgstr "Diminuir Volume
msgid "Audio Device"
msgstr "Dispositivo Ãudio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Metade do Tamanho"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Tamanho Normal"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dobro do Tamanho"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Preencher o Ecrã"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Metade do Tamanho"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Tamanho Normal"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dobro do Tamanho"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Preencher o Ecrã"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Flutar no topo"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16959,7 -16959,7 +17417,11 @@@
msgid "Post processing"
msgstr "Pós-processamento"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -17190,7 -17190,7 +17652,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Escolha..."
@@@ -17361,7 -17361,7 +17827,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Tamanho da fonte"
@@@ -17590,12 -17590,12 +18060,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Preferências"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Limpar tudo"
@@@ -17772,129 -17772,125 +18250,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Codificação Padrão"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Definições de Visualização"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Codificação Padrão"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Definições de Visualização"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Cor do tipo de letra"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Tipo de letra"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Linguagem da legenda"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Linguagem da legenda"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Activar OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Activar OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Opacidade"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Mostrar"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Módulo de saÃda"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Miniaturas de vÃdeo"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Pasta"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Formato"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefixo"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Numeração sequencial"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Módulo de saÃda"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Miniaturas de vÃdeo"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Pasta"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Formato"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefixo"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Numeração sequencial"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Latência mais baixa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Latência baixa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Latência alta"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Latência mais alta"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Limpar preferências"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17907,35 -17903,35 +18493,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Escolher"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Escolher"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19921,20 -19917,20 +20537,36 @@@ msgstr "Remover perfil seleccionado
msgid "Create a new profile"
msgstr "Criar um novo perfile"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Criar"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Falta Nome do Perfil"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Falta Nome do Perfil"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Tem de escolher um nome para o perfil."
@@@ -23243,45 -23239,45 +23875,81 @@@ msgstr "SaÃda da emissão transcodific
msgid "Overlays/Subtitles"
msgstr "Sobreposições/Legendas"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Tamanho do tipo de letra em pÃxeis"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Tamanho do tipo de letra em pÃxeis"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Cor padrão do texto"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23290,93 -23286,93 +23958,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Tamanho relativo do tipo de letra"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Mais pequeno"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Pequeno"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Grande"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Maior"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Usar renderizador YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Usar renderizador YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Renderização de texto"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Renderizador do tipo de letra Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Renderização de texto"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Renderizador do tipo de letra Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/ro.po
index 5fa41e2,5974d91..52041cd
--- a/po/ro.po
+++ b/po/ro.po
@@@ -7,15 -7,13 +7,24 @@@
# Circo Radu <circo DOT radusorin AT gmail DOT com>, 2005
# Cristian Secară <cristi AT secarica DOT ro>, 2007-2013
# Cristian Silaghi <cristian.silaghi at mozilla.ro>, 2013
++<<<<<<< HEAD
+# bogdog <emil_preda2007 at yahoo.com>, 2013
+# kuteutza <ileana.vucicovici at gmail.com>, 2013
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-12-03 21:24+0000\n"
+"Last-Translator: bogdog <emil_preda2007 at yahoo.com>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-10-25 17:33+0000\n"
+ "Last-Translator: roentgen <arthur.titeica at gmail.com>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Romanian (http://www.transifex.com/projects/p/vlc-trans/"
"language/ro/)\n"
"Language: ro\n"
@@@ -97,7 -95,7 +106,11 @@@ msgstr "Audio
#: include/vlc_config_cat.h:54
msgid "Audio settings"
++<<<<<<< HEAD
+msgstr "Setări audio generale"
++=======
+ msgstr "Setări audio"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:56
msgid "General audio settings"
@@@ -144,7 -142,7 +157,11 @@@ msgstr "Diverse setări audio și modul
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -499,10 -497,10 +516,17 @@@ msgid "&About
msgstr "&Despre"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -541,17 -539,17 +565,29 @@@ msgid "Save...
msgstr "Salvează..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Repetă tot"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Repetă o dată"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -657,7 -655,7 +693,11 @@@ msgstr "A fost atins numărul maxim de
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Dezactivat"
@@@ -862,10 -860,9 +902,16 @@@ msgstr "
msgid "%u module was not displayed because it only has advanced options.\n"
msgid_plural ""
"%u modules were not displayed because they only have advanced options.\n"
++<<<<<<< HEAD
+msgstr[0] "%u modul nu a fost afișat deoarece are doar opțiuni avansate.\n"
+msgstr[1] "%u module nu au fost afișate deoarece au doar opțiuni avansate.\n"
+msgstr[2] ""
+"%u de module nu au fost afișate deoarece au doar opțiuni avansate.\n"
++=======
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/help.c:704 src/config/help.c:708
msgid ""
@@@ -910,11 -907,11 +956,19 @@@ msgstr "
#: src/config/keys.c:57
msgid "Brightness Down"
++<<<<<<< HEAD
+msgstr "Scade luminozitatea"
+
+#: src/config/keys.c:58
+msgid "Brightness Up"
+msgstr "Creste luminozitatea"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:58
+ msgid "Brightness Up"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:59
msgid "Browser Back"
@@@ -953,7 -950,7 +1007,11 @@@ msgstr "Șterge
#: src/config/keys.c:67
msgid "Down"
++<<<<<<< HEAD
+msgstr "Jos"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:68 modules/control/rc.c:74
msgid "End"
@@@ -1017,7 -1014,7 +1075,11 @@@ msgstr "F9
#: src/config/keys.c:83
msgid "Home"
++<<<<<<< HEAD
+msgstr "Acasa"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:84
msgid "Insert"
@@@ -1025,11 -1022,11 +1087,19 @@@ msgstr "Insert
#: src/config/keys.c:86
msgid "Media Angle"
++<<<<<<< HEAD
+msgstr "Unghi media"
+
+#: src/config/keys.c:87
+msgid "Media Audio Track"
+msgstr "Pista audio pentru media"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:87
+ msgid "Media Audio Track"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:88
msgid "Media Forward"
@@@ -1359,20 -1356,20 +1429,36 @@@ msgstr "Frecvență de cadre
msgid "Decoded format"
msgstr "Format decodat"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Intrarea nu a putut fi deschisă"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Intrarea nu a putut fi deschisă"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC nu a putut deschide MRL-ul „%sâ€. Verifică jurnalul pentru detalii."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC nu a putut recunoaște formatul de intrare"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC nu a putut recunoaște formatul de intrare"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1717,11 -1714,11 +1803,19 @@@ msgstr "
#: src/libvlc-module.c:138
msgid "Audio gain"
++<<<<<<< HEAD
+msgstr "Castig audio"
+
+#: src/libvlc-module.c:140
+msgid "This linear gain will be applied to outputted audio."
+msgstr "Castigul liniar va fi aplicat la iesirea audio."
++=======
+ msgstr ""
+
+ #: src/libvlc-module.c:140
+ msgid "This linear gain will be applied to outputted audio."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:142
msgid "Audio output volume step"
@@@ -1801,7 -1798,7 +1895,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1821,7 -1818,7 +1919,11 @@@ msgstr "Oprit
#: src/libvlc-module.c:182
msgid "Stereo audio output mode"
++<<<<<<< HEAD
+msgstr "Modul de iesire audio stereo"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:194
msgid "This adds audio post processing filters, to modify the sound rendering."
@@@ -1886,7 -1883,7 +1988,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Fără"
@@@ -1917,7 -1914,7 +2023,11 @@@ msgstr "
"Aceasta este metoda de ieșire video folosită de VLC. Comportamentul implicit "
"este de a selecta automat cea mai bună metodă disponibilă."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Activează video"
@@@ -2126,7 -2123,7 +2236,11 @@@ msgstr "
"(abilitatea de a randa video direct). VLC va încerca să o utilizeze implicit."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "ÃŽntotdeauna deasupra"
@@@ -2179,7 -2176,7 +2293,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2188,7 -2185,7 +2306,11 @@@ msgstr "Deîntrețesere
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Mod de deîntrețesere"
@@@ -2244,7 -2241,7 +2366,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Decorațiuni fereastră"
@@@ -2439,7 -2436,7 +2565,11 @@@ msgstr "
"pixeli pătrați (1:1). Dacă aveți un ecran 16:9, ar putea fi necesar să "
"schimbați aceasta în 4:3 pentru a putea păstra proporțiile."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Omite cadre"
@@@ -2584,12 -2581,12 +2714,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2597,7 -2594,7 +2736,11 @@@ msgid "Default
msgstr "Implicit"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2928,7 -2925,7 +3071,11 @@@ msgid "You can completely disable the s
msgstr "Puteți dezactiva complet procesarea sub-imaginilor."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3843,7 -3840,7 +3990,11 @@@ msgstr "
"Aceste setări sunt asocierile de taste globale ale VLC, cunoscute ca „taste "
"rapide†(hotkeys)."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignoră"
@@@ -3867,8 -3864,8 +4018,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3950,10 -3947,10 +4106,17 @@@ msgid "Slower (fine)
msgstr "Mai lent (fin)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3968,10 -3965,10 +4131,17 @@@ msgstr "
"de redare."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Precedent"
@@@ -3982,9 -3979,9 +4152,15 @@@ msgstr "
"Selectează tasta rapidă folosită pentru a omite elementul precedent din "
"lista de redare."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4222,9 -4219,9 +4398,15 @@@ msgid "Select the key to decrease audi
msgstr "Selectează tasta pentru micșorarea volumului audio."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Mut"
@@@ -4639,7 -4636,7 +4821,11 @@@ msgstr "Comutare ciclică prin dispozit
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Instantaneu"
@@@ -4843,12 -4840,12 +5029,21 @@@ msgstr "Se descarcă ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Renunță"
@@@ -5610,7 -5607,7 +5805,11 @@@ msgstr "Trunchiere
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Raport de aspect"
@@@ -5710,21 -5707,20 +5909,36 @@@ msgstr "
#: modules/access/bluray.c:60
msgid "Blu-ray menus"
++<<<<<<< HEAD
+msgstr "Meniuri Blu-ray"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:61
msgid "Use Blu-ray menus. If disabled, the movie will start directly"
msgstr ""
++<<<<<<< HEAD
+"Folosește meniurile Blu-ray. Dacă se dezactivează, filmul va începe direct"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:69 modules/services_discovery/udev.c:596
#: modules/gui/qt4/ui/open_disk.h:299
msgid "Blu-ray"
++<<<<<<< HEAD
+msgstr "Blu-ray"
+
+#: modules/access/bluray.c:70
+msgid "Blu-ray Disc support (libbluray)"
+msgstr "Suport pentru disc Blu-ray Disc (libbluray)"
++=======
+ msgstr ""
+
+ #: modules/access/bluray.c:70
+ msgid "Blu-ray Disc support (libbluray)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:263
msgid ""
@@@ -5734,7 -5730,7 +5948,11 @@@ msgstr "
#: modules/access/bluray.c:272
msgid "Blu-ray Disc is corrupted."
++<<<<<<< HEAD
+msgstr "Discul Blu-ray este corupt."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:275
msgid "Missing AACS configuration file!"
@@@ -5772,7 -5768,7 +5990,11 @@@ msgstr "
#: modules/access/bluray.c:370
msgid "Blu-ray error"
++<<<<<<< HEAD
+msgstr "Eroare Blu-ray"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/cdda.c:62 modules/gui/macosx/open.m:162
#: modules/gui/qt4/ui/open_disk.h:300
@@@ -6752,11 -6748,11 +6974,19 @@@ msgstr "
#: modules/access/fs.c:42
msgid "Collapse"
++<<<<<<< HEAD
+msgstr "Pliază"
+
+#: modules/access/fs.c:42
+msgid "Expand"
+msgstr "Expandează"
++=======
+ msgstr ""
+
+ #: modules/access/fs.c:42
+ msgid "Expand"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/fs.c:44
msgid "Ignored extensions"
@@@ -7983,7 -7979,7 +8213,11 @@@ msgstr "Intrare ecran
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Ecran"
@@@ -8050,7 -8046,7 +8284,11 @@@ msgstr "Dimensiune de citire
#: modules/access/sftp.c:54
msgid "Size of the request for reading access"
++<<<<<<< HEAD
+msgstr "Marimea celei cerute pentru acces la citire"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/sftp.c:58
msgid "SFTP input"
@@@ -8064,16 -8060,14 +8302,27 @@@ msgstr "Autentificare SFTP
#, c-format
msgid "Please enter a valid login and password for the sftp connexion to %s"
msgstr ""
++<<<<<<< HEAD
+"Introduce-ți vă rog un utilizator și o parola validă pentru conectiunea sftp "
+"la %s"
+
+#: modules/access/shm.c:45 modules/access/vnc.c:57
+msgid "Frame buffer depth"
+msgstr "Adâncimea tamponului de cadru"
+
+#: modules/access/shm.c:47
+msgid "Pixel depth of the frame buffer, or zero for XWD file"
+msgstr "Adâncimea pixelului tamponului de cadru, sau zero pentru un fișier XWD"
++=======
+
+ #: modules/access/shm.c:45 modules/access/vnc.c:57
+ msgid "Frame buffer depth"
+ msgstr ""
+
+ #: modules/access/shm.c:47
+ msgid "Pixel depth of the frame buffer, or zero for XWD file"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/shm.c:49
msgid "Frame buffer width"
@@@ -8135,7 -8129,7 +8384,11 @@@ msgstr "32 de biți
#: modules/access/shm.c:82
msgid "Framebuffer input"
++<<<<<<< HEAD
+msgstr "Input pentru tamponul de cadru"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/shm.c:83
msgid "Shared memory framebuffer"
@@@ -8195,11 -8189,11 +8448,19 @@@ msgstr "Restaurează la implicit
#: modules/access/v4l2/v4l2.c:44
msgid "Video capture device"
++<<<<<<< HEAD
+msgstr "Dispozitivul pentru captură video"
+
+#: modules/access/v4l2/v4l2.c:45
+msgid "Video capture device node."
+msgstr "Nodul dispozitivului de captură video"
++=======
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:45
+ msgid "Video capture device node."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:46
msgid "VBI capture device"
@@@ -8227,7 -8221,7 +8488,11 @@@ msgstr "
#: modules/access/v4l2/v4l2.c:61
msgid "Input of the card to use (see debug)."
++<<<<<<< HEAD
+msgstr "Inputul cardului folosit (vezi debug)."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:62
msgid "Audio input"
@@@ -8235,7 -8229,7 +8500,11 @@@ msgstr "Intrare audio
#: modules/access/v4l2/v4l2.c:64
msgid "Audio input of the card to use (see debug)."
++<<<<<<< HEAD
+msgstr "Inputul audio a cardului folosit (vezi debug)."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:68
msgid ""
@@@ -8249,7 -8243,7 +8518,11 @@@ msgstr "Dispozitiv radio
#: modules/access/v4l2/v4l2.c:74
msgid "Radio tuner device node."
++<<<<<<< HEAD
+msgstr "Nodul dispozitivului de tunare radio."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:75
#: modules/gui/qt4/components/open_panels.cpp:1060
@@@ -8266,7 -8260,7 +8539,11 @@@ msgstr "Mod audio
#: modules/access/v4l2/v4l2.c:80
msgid "Tuner audio mono/stereo and track selection."
++<<<<<<< HEAD
+msgstr "Acordor audio mono/stereo și selectia pistei."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:82
msgid "Reset controls"
@@@ -8284,7 -8278,7 +8561,11 @@@ msgstr "Luminozitate
#: modules/access/v4l2/v4l2.c:85
msgid "Picture brightness or black level."
++<<<<<<< HEAD
+msgstr "Luminozitatea imaginii sau nivelul negrului."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:86
msgid "Automatic brightness"
@@@ -8487,16 -8481,16 +8768,28 @@@ msgstr "
#: modules/access/v4l2/v4l2.c:164
msgid "Black & white"
++<<<<<<< HEAD
+msgstr "Negru & alb"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:164 modules/gui/macosx/VideoEffects.m:136
#: modules/video_filter/sepia.c:65 modules/gui/qt4/ui/video_effects.h:1341
msgid "Sepia"
++<<<<<<< HEAD
+msgstr "Sepia"
+
+#: modules/access/v4l2/v4l2.c:164
+msgid "Negative"
+msgstr "Negativul"
++=======
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:164
+ msgid "Negative"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:165
msgid "Emboss"
@@@ -8529,7 -8523,7 +8822,11 @@@ msgstr "Volum audio
#: modules/access/v4l2/v4l2.c:171
msgid "Volume of the audio input."
++<<<<<<< HEAD
+msgstr "Volumul de intrare audio."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:172
msgid "Audio balance"
@@@ -8591,11 -8585,11 +8888,19 @@@ msgstr "
#: modules/access/v4l2/v4l2.c:247
msgid "525 lines / 60 Hz"
++<<<<<<< HEAD
+msgstr "525 linii / 60 Hz"
+
+#: modules/access/v4l2/v4l2.c:247
+msgid "625 lines / 50 Hz"
+msgstr "625 linii / 50 Hz"
++=======
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:247
+ msgid "625 lines / 50 Hz"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:255
msgid "PAL N Argentina"
@@@ -8655,7 -8649,7 +8960,11 @@@ msgstr "
#: modules/access/v4l2/v4l2.c:432
msgid "Video4Linux radio tuner"
++<<<<<<< HEAD
+msgstr "Tunare radio Video4Linux"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vcd/vcd.c:47
msgid "VCD"
@@@ -8667,7 -8661,7 +8976,11 @@@ msgstr "Intrare VCD
#: modules/access/vcd/vcd.c:54
msgid "[vcd:][device][#[title][,[chapter]]]"
++<<<<<<< HEAD
+msgstr "[vcd:][dispozitiv][#[titlu][,[capitol]]]"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vcdx/access.c:272 modules/access/vcdx/access.c:352
#: modules/access/vcdx/access.c:674 modules/access/vcdx/info.c:229
@@@ -8717,7 -8711,7 +9030,11 @@@ msgstr "Vol max #
msgid "Volume Set"
msgstr "Stabilire volum audio"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -8862,7 -8856,7 +9179,11 @@@ msgstr "VDR
#: modules/access/vdr.c:91
msgid "VDR recordings"
++<<<<<<< HEAD
+msgstr "Înregistrări VDR"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vdr.c:809
msgid "VDR Cut Marks"
@@@ -8870,7 -8864,7 +9191,11 @@@ msgstr "
#: modules/access/vdr.c:872
msgid "Start"
++<<<<<<< HEAD
+msgstr "Pornire"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:48
msgid "X.509 Certificate Authority"
@@@ -8894,11 -8888,11 +9219,19 @@@ msgstr "
#: modules/access/vnc.c:53
msgid "Certificate for client authentification"
++<<<<<<< HEAD
+msgstr "Certificat pentru autentificarea clientului"
+
+#: modules/access/vnc.c:54
+msgid "X.509 Client private key"
+msgstr "Cheia privată X,509 a clientului "
++=======
+ msgstr ""
+
+ #: modules/access/vnc.c:54
+ msgid "X.509 Client private key"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:55
msgid "Private key for authentification by certificate"
@@@ -8930,7 -8924,7 +9263,11 @@@ msgstr "VNC
#: modules/access/vnc.c:82
msgid "VNC client access"
++<<<<<<< HEAD
+msgstr "Accesul VNC a clientului"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/zip/zipstream.c:38
msgid "Media in Zip"
@@@ -8942,11 -8936,11 +9279,19 @@@ msgstr "Calea către media în arhiva Z
#: modules/access/zip/zipstream.c:48
msgid "Zip files filter"
++<<<<<<< HEAD
+msgstr "Filtru pentru fișiere zip"
+
+#: modules/access/zip/zipstream.c:53
+msgid "Zip access"
+msgstr "Acces zip"
++=======
+ msgstr ""
+
+ #: modules/access/zip/zipstream.c:53
+ msgid "Zip access"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/arm_neon/chroma_yuv.c:34
msgid "ARM NEON video chroma conversions"
@@@ -9199,7 -9193,7 +9544,11 @@@ msgstr "Întârziere
#: modules/audio_filter/chorus_flanger.c:76
msgid "Add a delay effect to the sound"
++<<<<<<< HEAD
+msgstr "Adăugați un effect de întârziere sunetului."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/chorus_flanger.c:80
#: modules/audio_filter/stereo_widen.c:59
@@@ -9208,7 -9202,7 +9557,11 @@@ msgstr "Timp de întârziere
#: modules/audio_filter/chorus_flanger.c:81
msgid "Time in milliseconds of the average delay. Note average"
++<<<<<<< HEAD
+msgstr "Timpul unei întârzieri medie in milisecunde. Notați media."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/chorus_flanger.c:82
msgid "Sweep Depth"
@@@ -9239,7 -9233,7 +9592,11 @@@ msgstr "
#: modules/audio_filter/chorus_flanger.c:89
msgid "Gain on Feedback loop"
++<<<<<<< HEAD
+msgstr "Câștigul unei bucle de Feedback."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/chorus_flanger.c:91
msgid "Wet mix"
@@@ -9849,7 -9843,7 +10206,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "Ieșire audio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Ieșirea audio a eșuat"
@@@ -9880,7 -9874,7 +10241,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9888,30 -9882,30 +10253,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Ieșire HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Ieșire HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (ieșire codată)"
@@@ -10068,7 -10062,7 +10457,11 @@@ msgstr "
#: modules/audio_output/waveout.c:150
msgid "WaveOut audio output"
++<<<<<<< HEAD
+msgstr "Ieșire audio WaveOut"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/waveout.c:706
msgid "Microsoft Soundmapper"
@@@ -11125,46 -11119,46 +11518,74 @@@ msgstr "Umbră
msgid "Outline"
msgstr "Contur"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Negru"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Gri"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Argintiu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Alb"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Maro"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Roșu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11172,61 -11166,61 +11593,97 @@@ msgid "Fuchsia
msgstr "Roșu purpuriu"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Galben"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Oliv"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Verde"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Aquamarin"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lămâie verde"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Violet"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Bleumarin"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Albastru"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11356,7 -11350,7 +11813,11 @@@ msgstr "Subtitluri (avansat)
msgid "Subtitle renderers using libass"
msgstr "Rendere de subtitluri folsind libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Construire cache de font"
@@@ -11602,7 -11596,7 +12063,11 @@@ msgstr "
#: modules/codec/qsv.c:148
msgid "Number of parallel operations"
++<<<<<<< HEAD
+msgstr "Numărul de operațiuni paralele"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:149
msgid ""
@@@ -13180,20 -13174,20 +13645,34 @@@ msgstr "tesa
#: modules/codec/x264.c:429
msgid "Fast"
++<<<<<<< HEAD
+msgstr "Rapid"
+
+#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ msgstr ""
+
+ #: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normală"
#: modules/codec/x264.c:429
msgid "Slow"
++<<<<<<< HEAD
+msgstr "ÃŽncet"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:434
msgid "Spatial"
@@@ -13294,8 -13288,8 +13773,13 @@@ msgid "D-Bus control interface
msgstr "Interfețe de control D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13380,12 -13374,12 +13864,20 @@@ msgstr "
#: modules/control/hotkeys.c:195
#, c-format
msgid "Loop: %s"
++<<<<<<< HEAD
+msgstr "Buclă: %s"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:202
#, c-format
msgid "Random: %s"
++<<<<<<< HEAD
+msgstr "Aleator: %s"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:331
#, c-format
@@@ -13406,7 -13400,7 +13898,11 @@@ msgstr "
#: modules/control/hotkeys.c:424 modules/control/hotkeys.c:493
msgid "No active subtitle"
++<<<<<<< HEAD
+msgstr "Niciun subtitlu activ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:430
msgid "Sub sync: bookmarked subtitle time"
@@@ -13491,7 -13485,7 +13987,11 @@@ msgstr "Deîntrețesere pornită
#: modules/control/hotkeys.c:1022
msgid "Subtitle position: no active subtitle"
++<<<<<<< HEAD
+msgstr "Poziție subtitlu: niciun subtitlu activ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:1034
#, c-format
@@@ -13639,9 -13633,9 +14139,15 @@@ msgstr "Inițializare
msgid "Opening"
msgstr "Deschidere"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pauză"
@@@ -15550,7 -15544,7 +16056,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Demultiplexor de flux de transport MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -15692,7 -15686,7 +16202,11 @@@ msgstr "Despre VLC media player
#: modules/gui/macosx/about.m:95 modules/gui/qt4/dialogs/help.cpp:125
msgid "Credits"
++<<<<<<< HEAD
+msgstr "Credite"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/about.m:98 modules/gui/macosx/MainMenu.m:450
#: modules/gui/qt4/dialogs/help.cpp:119
@@@ -15710,7 -15704,7 +16224,11 @@@ msgstr "
#: modules/gui/macosx/about.m:115
msgid "Compiled by %s with %@"
++<<<<<<< HEAD
+msgstr "Compilat de %s cu %@"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/about.m:132 modules/gui/qt4/dialogs/help.cpp:94
msgid ""
@@@ -15729,7 -15723,7 +16247,11 @@@ msgid "VLC media player Help
msgstr "Ajutor VLC media player"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Index"
@@@ -15817,9 -15811,9 +16339,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Salvează"
@@@ -15958,7 -15952,7 +16486,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Salt la timpul"
@@@ -15978,7 -15972,7 +16510,11 @@@ msgstr "
msgid "Backward"
msgstr "ÃŽnapoi"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15988,7 -15982,7 +16524,11 @@@ msgstr "
msgid "Forward"
msgstr "Înaintează"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16008,84 -16002,84 +16548,155 @@@ msgstr "Comută modul pe tot ecranul
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Arată sau ascunde lista de redare"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Arată sau ascunde lista de redare"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Repetă"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Amestecă"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Amestecă"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Volum total"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Volum total"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efecte"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Clic pentru a merge la elementul precedent din lista de redare."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Clic pentru a merge la elementul precedent din lista de redare."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16121,7 -16115,7 +16732,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16304,8 -16298,8 +16919,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Personalizat"
@@@ -16403,36 -16397,36 +17023,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "Nu mai întreba"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Continuă"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Eliminați preferințele vechi ?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Eliminați preferințele vechi ?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16598,7 -16592,7 +17250,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Blochează raportul de aspect"
@@@ -16727,7 -16721,7 +17383,11 @@@ msgstr "Ascunde VLC
msgid "Hide Others"
msgstr "Ascunde celelalte"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Arată tot"
@@@ -16812,15 -16806,15 +17472,27 @@@ msgstr "Sincronizare pistă
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Închide programul după redare"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Pas înainte"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Închide programul după redare"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Pas înainte"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Pas înapoi"
@@@ -16836,30 -16830,30 +17508,56 @@@ msgstr "Scade volumul
msgid "Audio Device"
msgstr "Dispozitiv audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Dimensiune la jumătate"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Dimensiune normală"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dimensiune dublă"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Adaptează la ecran"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Dimensiune la jumătate"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Dimensiune normală"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dimensiune dublă"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Adaptează la ecran"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Flotant deasupra"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Dispozitiv video pe tot ecranul"
@@@ -16868,7 -16862,7 +17566,11 @@@
msgid "Post processing"
msgstr "Post procesare"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Adaugă fișier subtitlu..."
@@@ -17096,7 -17090,7 +17798,11 @@@ msgid "Play another media synchronously
msgstr "Redă sincron alt media"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Alege..."
@@@ -17269,7 -17263,7 +17975,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Codare subtitlu"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Dimensiune de font"
@@@ -17498,12 -17492,12 +18208,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Preferințe"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Resetează tot"
@@@ -17680,129 -17674,125 +18398,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Codare implicită"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Setări de afișare"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Codare implicită"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Setări de afișare"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Culoare de font"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Font"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Limbi subtitlu"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Limbi subtitlu"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Limba preferată pentru subtitlu"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Activează OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Activează OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Opacitate"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Forțează aldin"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Forțează aldin"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Culoarea conturului"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Grosimea conturului"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Zone negre de ecran în modul pe tot ecranul"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Zone negre de ecran în modul pe tot ecranul"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Afișare"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Module de ieșire"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Capturi video instantanee"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Dosar"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Format"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefix"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Numerotare secvențială"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Ultima verificare pe: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Module de ieșire"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Capturi video instantanee"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Dosar"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Format"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefix"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Numerotare secvențială"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Ultima verificare pe: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Cea mai mică latență"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Latență mică"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Latență mare"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Latență mai mare"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Resetare preferințe"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17815,35 -17805,35 +18641,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Alegeți dosarul în care să fie salvate instantaneele."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Alegeți"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Alege numele de fișier sau dosarul unde vor fi stocate înregistrările."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Alegeți dosarul în care să fie salvate instantaneele."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Alegeți"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Alege numele de fișier sau dosarul unde vor fi stocate înregistrările."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Combinație nevalidă"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Combinație nevalidă"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19824,20 -19814,20 +20680,36 @@@ msgstr "Șterge profilul selectat
msgid "Create a new profile"
msgstr "Creează un profil nou"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Creează"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Lipsește numele profilului"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Lipsește numele profilului"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Trebuie să specificați un nume pentru profil."
@@@ -21468,15 -21458,15 +22340,27 @@@ msgstr "
#: modules/misc/gnutls.c:294 modules/misc/gnutls.c:311
msgid "Insecure site"
++<<<<<<< HEAD
+msgstr "Sait nesigur"
+
+#: modules/misc/gnutls.c:295 modules/misc/gnutls.c:314
+msgid "Abort"
+msgstr "Renunță"
+
+#: modules/misc/gnutls.c:295
+msgid "View certificate"
+msgstr "Vezi certificat"
++=======
+ msgstr ""
+
+ #: modules/misc/gnutls.c:295 modules/misc/gnutls.c:314
+ msgid "Abort"
+ msgstr ""
+
+ #: modules/misc/gnutls.c:295
+ msgid "View certificate"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/gnutls.c:312
#, c-format
@@@ -21489,11 -21479,11 +22373,19 @@@ msgstr "
#: modules/misc/gnutls.c:314
msgid "Accept 24 hours"
++<<<<<<< HEAD
+msgstr "Acceptă 24 de ore"
+
+#: modules/misc/gnutls.c:315
+msgid "Accept permanently"
+msgstr "Acceptă permanent"
++=======
+ msgstr ""
+
+ #: modules/misc/gnutls.c:315
+ msgid "Accept permanently"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/inhibit/dbus.c:129
msgid "Playing some media."
@@@ -22712,7 -22702,7 +23604,11 @@@ msgstr "Numele sesiunii care va fi anun
#: modules/stream_out/rtp.c:96
msgid "Session category"
++<<<<<<< HEAD
+msgstr "Categoria sesiunii"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/rtp.c:98
msgid ""
@@@ -22722,7 -22712,7 +23618,11 @@@ msgstr "
#: modules/stream_out/rtp.c:100 modules/stream_out/standard.c:62
msgid "Session description"
++<<<<<<< HEAD
+msgstr "Descrierea sesiunii"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/rtp.c:102 modules/stream_out/standard.c:64
msgid ""
@@@ -22732,7 -22722,7 +23632,11 @@@ msgstr "
#: modules/stream_out/rtp.c:104 modules/stream_out/standard.c:66
msgid "Session URL"
++<<<<<<< HEAD
+msgstr "URL sesiune"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/rtp.c:106 modules/stream_out/standard.c:68
msgid ""
@@@ -22743,7 -22733,7 +23647,11 @@@ msgstr "
#: modules/stream_out/rtp.c:109 modules/stream_out/standard.c:71
msgid "Session email"
++<<<<<<< HEAD
+msgstr "Email pentru sesiune"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/rtp.c:111 modules/stream_out/standard.c:73
msgid ""
@@@ -22753,7 -22743,7 +23661,11 @@@ msgstr "
#: modules/stream_out/rtp.c:113 modules/stream_out/standard.c:75
msgid "Session phone number"
++<<<<<<< HEAD
+msgstr "Număr de telefon pentru sesiune"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/rtp.c:115 modules/stream_out/standard.c:77
msgid ""
@@@ -23225,23 -23215,23 +24137,43 @@@ msgstr "Transcodare flux de ieșire
msgid "Overlays/Subtitles"
msgstr "Overlay-uri/Subtitluri"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Fișierul de font pentru fontul care vreți să fie folosit"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Dimensiune de font în pixeli"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Fișierul de font pentru fontul care vreți să fie folosit"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Dimensiune de font în pixeli"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23251,11 -23241,11 +24183,19 @@@ msgstr "
"valoarea stabilită este diferită de 0, această opțiune va suprascrie "
"dimensiunea relativă a fontului."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Opacitatea textului"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Opacitatea textului"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -23263,12 -23253,12 +24203,20 @@@ msgstr "
"Opacitatea (opusul transparenței) textului care va fi randat pe video. 0 = "
"transparent, 255 = total opac."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Culoare implicită text"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23281,12 -23271,12 +24229,20 @@@ msgstr "
"pentru roșu, după care verde, după care albastru. #000000 = negru, #FF0000 "
"= roșu, #00FF00 = verde, #FFFF00 = galben (roșu + verde), #FFFFFF = alb"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Dimensiune relativă de font"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -23296,59 -23286,59 +24252,111 @@@ msgstr "
"Dacă este stabilită valoarea absolută a fontului, dimensiunea relativă va fi "
"suprascrsă."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Opacitatea fundalului"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Culoarea fundalului"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Opacitatea conturului"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Opacitatea umbrei"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Unghiul umbrei"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Unghiul umbrei"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Distanța umbrei"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Opacitatea fundalului"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Culoarea fundalului"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Opacitatea conturului"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Opacitatea umbrei"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Unghiul umbrei"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Unghiul umbrei"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Distanța umbrei"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Mai mic"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Mic"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Mare"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Mai mare"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Folosește render YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Folosește render YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -23356,23 -23346,23 +24364,43 @@@ msgstr "
"Aceasta randează fontul utilizând „YUV paletizatâ€. Această opÈ›iune este "
"necesară doar dacă vreți să codați subtitluri DVB."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Subțire"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Gros"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Randare de text"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Randare de font Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Subțire"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Gros"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Randare de text"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Randare de font Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -25681,7 -25671,7 +26709,11 @@@ msgstr "
#: modules/video_filter/puzzle.c:65
msgid "Auto shuffle"
++<<<<<<< HEAD
+msgstr "Amestecă automat"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:66
msgid "Auto shuffle delay during game"
@@@ -25689,7 -25679,7 +26721,11 @@@ msgstr "
#: modules/video_filter/puzzle.c:67
msgid "Auto solve"
++<<<<<<< HEAD
+msgstr "Rezolvă automat"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:68
msgid "Auto solve delay during game"
@@@ -26302,7 -26292,7 +27338,11 @@@ msgstr "
#: modules/video_output/decklink.cpp:74
msgid "Desired output mode"
++<<<<<<< HEAD
+msgstr "Modul de ieșire dorit"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:76
msgid ""
@@@ -26462,7 -26452,7 +27502,11 @@@ msgstr "
#: modules/video_output/gl.c:50
msgid "OpenGL ES2"
++<<<<<<< HEAD
+msgstr "OpenGL ES2"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/gl.c:51
msgid "OpenGL for Embedded Systems 2 video output"
@@@ -26559,7 -26549,7 +27603,11 @@@ msgstr "
#: modules/video_output/msw/direct2d.c:59
msgid "Direct2D video output"
++<<<<<<< HEAD
+msgstr "Ieșire video Direct2D"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/msw/direct3d.c:57
msgid "The desktop mode allows you to display the video on the desktop."
@@@ -26680,11 -26670,11 +27728,19 @@@ msgstr "
#: modules/video_output/vdummy.c:48
msgid "Dummy video output"
++<<<<<<< HEAD
+msgstr "Ieșire video falsă"
+
+#: modules/video_output/vdummy.c:58
+msgid "Statistics video output"
+msgstr "Statistici ieșire video"
++=======
+ msgstr ""
+
+ #: modules/video_output/vdummy.c:58
+ msgid "Statistics video output"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/vmem.c:43
msgid "Video memory buffer width."
@@@ -27266,7 -27256,7 +28322,11 @@@ msgstr "
#: share/lua/http/index.html:278
msgid "Are you sure you wish to create the stream?"
++<<<<<<< HEAD
+msgstr "Ești sigur că dorești să creezi fluxul?"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/about.h:287 modules/gui/qt4/ui/open.h:242
#: modules/gui/qt4/ui/podcast_configuration.h:100
@@@ -27296,7 -27286,7 +28356,11 @@@ msgstr "0.00 dB
#: modules/gui/qt4/ui/messages_panel.h:139
msgid "&Verbosity:"
++<<<<<<< HEAD
+msgstr "&Detaliere:"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/messages_panel.h:140
msgid "&Filter:"
@@@ -27680,7 -27670,7 +28744,11 @@@ msgstr "
#: modules/gui/qt4/ui/sprefs_input.h:344
msgid "Hardware-accelerated decoding"
++<<<<<<< HEAD
+msgstr "Decodare prin accelerare hardware"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_input.h:345
msgid "Skip H.264 in-loop deblocking filter"
@@@ -27853,7 -27843,7 +28921,11 @@@ msgstr "Codare implicită
#: modules/gui/qt4/ui/sprefs_subtitles.h:294
msgid "Subtitle effects"
++<<<<<<< HEAD
+msgstr "Efecte subtitlu"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:300
msgid "Add a shadow"
@@@ -27901,7 -27891,7 +28973,11 @@@ msgstr "Forțează raportul de aspect
#: modules/gui/qt4/ui/sprefs_video.h:361
msgid "vlc-snap"
++<<<<<<< HEAD
+msgstr "captură-vlc"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/streampanel.h:169
msgid "1"
@@@ -27965,7 -27955,7 +29041,11 @@@ msgstr "Se pornește cererea de actuali
#: modules/gui/qt4/ui/update.h:150
msgid "Do you want to download it?"
++<<<<<<< HEAD
+msgstr "Vrei să descarci?"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/video_effects.h:1315
msgid "Essential"
@@@ -28105,6 -28095,9 +29185,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Lista gestionarului media"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Arată detaliile"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -28422,6 -28415,9 +29508,12 @@@
#~ msgid "5.1"
#~ msgstr "5.1"
++<<<<<<< HEAD
++=======
+ #~ msgid "Win32 waveOut extension output"
+ #~ msgstr "Extensie de ieșire Win32 waveOut"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Only decode a low resolution version of the video. This requires less "
#~ "processing power"
@@@ -30044,14 -30040,6 +31136,17 @@@
#~ msgstr "Stabilește aspectul (gen 4:3) canavalei video"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Detalii codec"
+
+#, fuzzy
+#~ msgid "Win32 waveOut extension output"
+#~ msgstr "Ieșire audio WaveOut"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "| @name marq-x X . . . . . . . . . . . .offset from left"
#~ msgstr ""
#~ "| prev . . . . . . . . . . . . elementul precedent din lista de redare"
@@@ -31489,11 -31477,11 +32584,19 @@@
#, fuzzy
#~ msgid "Brightness of the video input."
++<<<<<<< HEAD
+#~ msgstr "Volumul de intrare audio."
+
+#, fuzzy
+#~ msgid "Color of the video input."
+#~ msgstr "Volumul de intrare audio."
++=======
+ #~ msgstr "Înălțimea totală a ferestrei video, în pixeli."
+
+ #, fuzzy
+ #~ msgid "Color of the video input."
+ #~ msgstr "Ieșire video artă-ASCII color"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Set this option if the capture device outputs MJPEG"
@@@ -31821,7 -31809,7 +32924,11 @@@
#, fuzzy
#~ msgid "Dummy video output function"
++<<<<<<< HEAD
+#~ msgstr "Ieșire video falsă"
++=======
+ #~ msgstr "Ieșire audio falsă"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Stats video output function"
@@@ -31837,7 -31825,7 +32944,11 @@@
#, fuzzy
#~ msgid "Number of resumed TLS sessions"
++<<<<<<< HEAD
+#~ msgstr "Numărul de operațiuni paralele"
++=======
+ #~ msgstr "Numărul de câte ori să fie amestecat"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Lua Interface Module (shortcuts)"
@@@ -31853,7 -31841,7 +32964,11 @@@
#, fuzzy
#~ msgid "HD1000 video output"
++<<<<<<< HEAD
+#~ msgstr "Ieșire video falsă"
++=======
+ #~ msgstr "Ieșire video YUV"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "OpenGL Provider"
@@@ -32436,7 -32424,7 +33551,11 @@@
#, fuzzy
#~ msgid "Compiled by "
++<<<<<<< HEAD
+#~ msgstr "Compilat de %s cu %@"
++=======
+ #~ msgstr "Compilator: %s\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Open:"
@@@ -32500,7 -32488,7 +33619,11 @@@
#, fuzzy
#~ msgid "DirectX video output"
++<<<<<<< HEAD
+#~ msgstr "Ieșire video Direct2D"
++=======
+ #~ msgstr "Ieșire video Direct3D"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "QT Embedded display"
diff --combined po/ru.po
index 3b012eb,4d395d1..eaceb99
--- a/po/ru.po
+++ b/po/ru.po
@@@ -13,7 -13,7 +13,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-09 08:20+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -144,7 -144,7 +148,11 @@@ msgstr "Прочие наÑтройкÐ
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -489,10 -489,10 +497,17 @@@ msgid "&About
msgstr "О программе"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -531,17 -531,17 +546,29 @@@ msgid "Save...
msgstr "Сохранить..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "ПовторÑÑ‚ÑŒ вÑе"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "ПовторÑÑ‚ÑŒ один"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -649,7 -649,7 +676,11 @@@ msgstr "ДоÑтигнуто макÑи
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "отключить"
@@@ -1351,21 -1351,21 +1382,37 @@@ msgstr "ЧаÑтота кадров
msgid "Decoded format"
msgstr "Декодированный формат"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Ðтот иÑточник не открываетÑÑ"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Ðтот иÑточник не открываетÑÑ"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC не может открыть MRL '%s'. Ищите более подробную информацию в лог-файле."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC не может определить формат входных данных."
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC не может определить формат входных данных."
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1798,7 -1798,7 +1845,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1884,7 -1884,7 +1935,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "нет"
@@@ -1915,7 -1915,7 +1970,11 @@@ msgstr "
"Метод вывода видео, иÑпользуемый VLC по умолчанию. ÐвтоматичеÑки выбираетÑÑ "
"наилучший доÑтупный метод."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Включить видео"
@@@ -2123,7 -2123,7 +2182,11 @@@ msgstr "
"видеопоток напрÑмую. VLC будет пытатьÑÑ Ð¸Ñпользовать Ñто по умолчанию."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Поверх вÑех окон"
@@@ -2181,7 -2181,7 +2244,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2190,7 -2190,7 +2257,11 @@@ msgstr "УÑтранение череÑ
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Режим уÑÑ‚Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ‡ÐµÑ€ÐµÑÑтрочноÑти"
@@@ -2248,7 -2248,7 +2319,11 @@@ msgstr "
"Отключать управление питанием на Ð²Ñ€ÐµÐ¼Ñ Ð²Ð¾ÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð²Ð¸Ð´ÐµÐ¾, чтобы "
"предотвратить переход в ждущий режим из-за отÑутÑÑ‚Ð²Ð¸Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾Ñти."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Оформление окна"
@@@ -2449,7 -2449,7 +2524,11 @@@ msgstr "
"квадратные (1:1). Ð”Ð»Ñ Ñкрана 16:9, возможно, Ñтоит уÑтановить Ñтот параметр "
"на 4:3 Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð¿Ð¾Ñ€Ñ†Ð¸Ð¹."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "ПропуÑкать кадры"
@@@ -2593,12 -2593,12 +2672,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2606,7 -2606,7 +2694,11 @@@ msgid "Default
msgstr "по умолчанию"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2955,7 -2955,7 +3047,11 @@@ msgid "You can completely disable the s
msgstr "Можно полноÑтью отключить обработку Ñлоев."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3909,7 -3909,7 +4005,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "Ðти параметры наÑтраивают общие привÑзки клавиш («горÑчие клавиши»)."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ðет"
@@@ -3935,8 -3935,8 +4035,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4017,10 -4017,10 +4122,17 @@@ msgid "Slower (fine)
msgstr "Ðемного медленнее"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4033,10 -4033,10 +4145,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Ðазначьте клавишу Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð° к Ñледующей позиции плейлиÑта."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Предыдущий"
@@@ -4045,9 -4045,9 +4164,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "Ðазначьте клавишу Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº предыдущей позиции плейлиÑта."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4282,9 -4282,9 +4407,15 @@@ msgid "Select the key to decrease audi
msgstr "Ðазначьте клавишу Ð´Ð»Ñ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¸Ñ Ð³Ñ€Ð¾Ð¼ÐºÐ¾Ñти аудио."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Выключить звук"
@@@ -4704,7 -4704,7 +4835,11 @@@ msgstr "ЦикличеÑки перек
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Снимок"
@@@ -4912,12 -4912,12 +5047,21 @@@ msgstr "Скачивание ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Отмена"
@@@ -5680,7 -5680,7 +5824,11 @@@ msgstr "Кадрирование
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Соотношение Ñторон"
@@@ -8167,7 -8167,7 +8315,11 @@@ msgstr "Ввод Ñ Ñкрана
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Ðкран"
@@@ -8920,7 -8920,7 +9072,11 @@@ msgstr "ÐœÐ°ÐºÑ Ñ‡Ð°ÑÑ‚ÑŒ #
msgid "Volume Set"
msgstr "Ðабор чаÑтей"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10102,7 -10102,7 +10258,11 @@@ msgstr "Звук 7.1
msgid "ALSA audio output"
msgstr "Вывод звука через ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "ВывеÑти звук не удалоÑÑŒ"
@@@ -10135,7 -10135,7 +10295,11 @@@ msgstr "Вывод звука череÐ
msgid "Android AudioTrack audio output"
msgstr "Вывод звука через Android AudioTrack"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "Вывод звука через AudioUnit Ð´Ð»Ñ iOS"
@@@ -10143,22 -10143,22 +10307,38 @@@
msgid "Last audio device"
msgstr "ПоÑледнее аудиоуÑтройÑтво"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Вывод звука через HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Вывод звука через HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Выбранное уÑтройÑтво вывода звука находитÑÑ Ð² иÑключительном пользовании "
"другой программы."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "ÐудиоуÑтройÑтво не Ñконфигурировано"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "ÐудиоуÑтройÑтво не Ñконфигурировано"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10166,11 -10166,11 +10346,19 @@@ msgstr "
"Ð’Ñ‹ должны определить Ñхему динамиков Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ утилиты «Audio Midi Setup», "
"находÑщейÑÑ Ð² /Applications/Utilities. Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð¸ÑпользуетÑÑ Ñ€ÐµÐ¶Ð¸Ð¼ Ñтерео."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "СиÑтемное уÑтройÑтво вывода звука"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "СиÑтемное уÑтройÑтво вывода звука"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Закодированный вывод)"
@@@ -11466,46 -11466,46 +11654,74 @@@ msgstr "Тень
msgid "Outline"
msgstr "контур"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "чёрный"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Ñерый"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "ÑеребрÑный"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "белый"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "бордовый"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "краÑный"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11513,61 -11513,61 +11729,97 @@@ msgid "Fuchsia
msgstr "розовый"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "жёлтый"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "оливковый"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "зелёный"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "бирюзовый"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Ñрко-зелёный"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "пурпурный"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "тёмно-Ñиний"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Ñиний"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11719,7 -11719,7 +11971,11 @@@ msgstr "Субтитры (раÑширÐ
msgid "Subtitle renderers using libass"
msgstr "Визуализаторы Ñубтитров, иÑпользующие libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Создание кÑша шрифтов"
@@@ -13737,10 -13737,10 +13993,17 @@@ msgid "Fast
msgstr "быÑтрый"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "обычный"
@@@ -13849,8 -13849,8 +14112,13 @@@ msgid "D-Bus control interface
msgstr "Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14201,9 -14201,9 +14469,15 @@@ msgstr "ИнициализациÑ
msgid "Opening"
msgstr "Открытие"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Пауза"
@@@ -16156,7 -16156,7 +16430,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "ДемультиплекÑор MPEG TS"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "ТелетекÑÑ‚"
@@@ -16345,7 -16345,7 +16623,11 @@@ msgid "VLC media player Help
msgstr "Справка по медиапроигрывателю VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "ИндекÑ"
@@@ -16433,9 -16433,9 +16715,15 @@@ msgstr "Введите Ð¸Ð¼Ñ Ð½Ð¾Ð²Ð¾Ð
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Сохранить"
@@@ -16578,7 -16578,7 +16866,11 @@@ msgstr "Ðет входного потÐ
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Поток должен находитьÑÑ Ð² режиме воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ паузы."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Переход ко времени"
@@@ -16598,7 -16598,7 +16890,11 @@@ msgstr "Щёлкните, чтобы в
msgid "Backward"
msgstr "Ðазад"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16610,7 -16610,7 +16906,11 @@@ msgstr "
msgid "Forward"
msgstr "Вперед"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16634,23 -16634,15 +16934,35 @@@ msgstr "Переключить полн
msgid "Click to enable fullscreen video playback."
msgstr "Щёлкните, чтобы перейти в полноÑкранный режим воÑпроизведениÑ."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "Ðажмите и удерживайте, чтобы перемотать назад текущий медиаобъект."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "Ðажмите и удерживайте, чтобы перемотать вперёд текущий медиаобъект."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Щёлкните, чтобы оÑтановить воÑпроизведение."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Показать/Ñкрыть плейлиÑÑ‚"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Щёлкните, чтобы оÑтановить воÑпроизведение."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Показать/Ñкрыть плейлиÑÑ‚"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -16658,12 -16650,12 +16970,20 @@@ msgstr "
"Щёлкните, чтобы выбрать, должен ли отображатьÑÑ Ð¿Ð»ÐµÐ¹Ð»Ð¸ÑÑ‚ или видео. ЕÑли в "
"оÑновном окне не видно видео, вы можете Ñкрыть плейлиÑÑ‚ Ñтой кнопкой."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Повтор"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -16671,16 -16663,16 +16991,28 @@@ msgstr "
"Щёлкните, чтобы Ñменить режим повторениÑ. Возможны три ÑоÑтоÑниÑ: повторÑÑ‚ÑŒ "
"одну позицию, повторÑÑ‚ÑŒ вÑе и выкл."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Случайный порÑдок"
+
+#: modules/gui/macosx/ControlsBar.m:484
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Случайный порÑдок"
+
+ #: modules/gui/macosx/ControlsBar.m:450
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Click to enable or disable random playback."
msgstr ""
"Щёлкните, чтобы включить или выключить Ñлучайный порÑдок воÑпроизведениÑ."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -16688,24 -16680,24 +17020,44 @@@ msgstr "
"Щёлкните и, ÑƒÐ´ÐµÑ€Ð¶Ð¸Ð²Ð°Ñ ÐºÐ½Ð¾Ð¿ÐºÑƒ мыши, перемещайте ползунок, чтобы изменить "
"громкоÑÑ‚ÑŒ."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Ðазначьте клавишу Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ/Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð·Ð²ÑƒÐºÐ°."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "ÐŸÐ¾Ð»Ð½Ð°Ñ Ð³Ñ€Ð¾Ð¼ÐºÐ¾ÑÑ‚ÑŒ"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Щёлкните, чтобы уÑтановить макÑимальную громкоÑÑ‚ÑŒ звука."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Ðазначьте клавишу Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ/Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð·Ð²ÑƒÐºÐ°."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "ÐŸÐ¾Ð»Ð½Ð°Ñ Ð³Ñ€Ð¾Ð¼ÐºÐ¾ÑÑ‚ÑŒ"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Щёлкните, чтобы уÑтановить макÑимальную громкоÑÑ‚ÑŒ звука."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Ðффекты"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -16713,14 -16705,22 +17065,33 @@@ msgstr "
"Щёлкните, чтобы открыть панель Ðудиофильтров, включающую Ñквалайзер и другие "
"фильтры."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Щёлкните, чтобы перейти к предыдущей позиции плейлиÑта."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Щёлкните, чтобы перейти к Ñледующей позиции плейлиÑта."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Щёлкните, чтобы перейти к предыдущей позиции плейлиÑта."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Щёлкните, чтобы перейти к Ñледующей позиции плейлиÑта."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "Ðажмите и удерживайте, чтобы перемотать назад текущий медиаобъект."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "Ðажмите и удерживайте, чтобы перемотать вперёд текущий медиаобъект."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Конвертировать/передавать"
@@@ -16756,7 -16756,7 +17127,11 @@@ msgstr "Определите адреÑ
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16943,8 -16943,8 +17318,13 @@@ msgid "A SDP export is requested, but n
msgstr "Выбран ÑкÑпорт SDP, но ÑоответÑтвующий Ð°Ð´Ñ€ÐµÑ Ð½Ðµ указан."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "другое"
@@@ -17048,36 -17048,36 +17428,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "Больше не Ñпрашивать"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "ВоÑпроизведение в VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Журнал Ñбоев не найден"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "ВоÑпроизведение в VLC"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Журнал Ñбоев не найден"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Продолжить"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Ðикаких признаков предыдущего ÑÐ±Ð¾Ñ Ð½Ðµ обнаружено."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Удалить Ñтарые наÑтройки?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Ðайдена более ÑÑ‚Ð°Ñ€Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² наÑтроек VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "ПеремеÑтить в корзину и перезапуÑтить VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Ðикаких признаков предыдущего ÑÐ±Ð¾Ñ Ð½Ðµ обнаружено."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Удалить Ñтарые наÑтройки?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Ðайдена более ÑÑ‚Ð°Ñ€Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² наÑтроек VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "ПеремеÑтить в корзину и перезапуÑтить VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "Отладочные ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ VLC (%s).rtf"
@@@ -17257,7 -17257,7 +17669,11 @@@ msgid "
msgstr ""
"Ðтот параметр разрешает VLC менÑÑ‚ÑŒ значок интерфейÑа в различных ÑитуациÑÑ…."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "ЗафикÑировать Ñоотношение Ñторон"
@@@ -17390,7 -17390,7 +17806,11 @@@ msgstr "Скрыть VLC
msgid "Hide Others"
msgstr "Скрыть оÑтальные"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Показать вÑÑ‘"
@@@ -17475,15 -17475,15 +17895,27 @@@ msgstr "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð´Ð¾
msgid "A→B Loop"
msgstr "Цикл Ð→Б"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Выйти поÑле воÑпроизведениÑ"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Вперед"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Выйти поÑле воÑпроизведениÑ"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Вперед"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Ðазад"
@@@ -17499,30 -17499,30 +17931,56 @@@ msgstr "Уменьшить громко
msgid "Audio Device"
msgstr "ÐудиоуÑтройÑтво"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Половина размера"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Ðормальный размер"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Двойной размер"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Подогнать под Ñкран"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Половина размера"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Ðормальный размер"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Двойной размер"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Подогнать под Ñкран"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Поверх вÑех окон"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "УÑтройÑтво полноÑкранного видео"
@@@ -17531,7 -17531,7 +17989,11 @@@
msgid "Post processing"
msgstr "ПоÑÑ‚-обработка"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Добавить файл Ñубтитров..."
@@@ -17771,7 -17771,7 +18233,11 @@@ msgid "Play another media synchronously
msgstr "Параллельно проигрывать другой медиаобъект"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Выбрать..."
@@@ -17959,7 -17959,7 +18425,11 @@@ msgstr "к/Ñек
msgid "Subtitle encoding"
msgstr "Кодировка Ñубтитров"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Размер шрифта"
@@@ -18188,12 -18188,12 +18658,20 @@@ msgstr "Ошибка при ÑохраÐ
msgid "VLC was unable to save the meta data."
msgstr "VLC не может Ñохранить Ñти мета-данные."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "ÐаÑтройки"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "СброÑить вÑÑ‘"
@@@ -18372,130 -18372,125 +18850,238 @@@ msgstr "Включить уведомл
msgid "Lua HTTP"
msgstr "HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "ПриоÑтановить iTunes на Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð³Ñ€Ñ‹ в VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Кодировка по умолчанию"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "ÐаÑтройки отображениÑ"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Кодировка по умолчанию"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "ÐаÑтройки отображениÑ"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Цвет шрифта"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Шрифт"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Язык Ñубтитров"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Язык Ñубтитров"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Предпочитаемый Ñзык Ñубтитров"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Включить Ñкранную индикацию"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Включить Ñкранную индикацию"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "ÐепрозрачноÑÑ‚ÑŒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Полужирный"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Полужирный"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Цвет контура"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Толщина контура"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Зачернить Ñкран в полноÑкранном режиме"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Зачернить Ñкран в полноÑкранном режиме"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Отображение"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Модуль вывода"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Снимки видео"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Папка"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Формат"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "ПрефикÑ"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "ПоÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð½ÑƒÐ¼ÐµÑ€Ð°Ñ†Ð¸Ñ"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "ПоÑледнÑÑ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ°: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Проверка ещё не выполнÑлаÑÑŒ."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Модуль вывода"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Снимки видео"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Папка"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Формат"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "ПрефикÑ"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "ПоÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð½ÑƒÐ¼ÐµÑ€Ð°Ñ†Ð¸Ñ"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "ПоÑледнÑÑ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ°: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Проверка ещё не выполнÑлаÑÑŒ."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Ð½Ð°Ð¸Ð¼ÐµÐ½ÑŒÑˆÐ°Ñ Ð·Ð°Ð´ÐµÑ€Ð¶ÐºÐ°"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Ð¼Ð°Ð»Ð°Ñ Ð·Ð°Ð´ÐµÑ€Ð¶ÐºÐ°"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Ð±Ð¾Ð»ÑŒÑˆÐ°Ñ Ð·Ð°Ð´ÐµÑ€Ð¶ÐºÐ°"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Ð½Ð°Ð¸Ð±Ð¾Ð»ÑŒÑˆÐ°Ñ Ð·Ð°Ð´ÐµÑ€Ð¶ÐºÐ°"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "СброÑить наÑтройки"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18517,20 -18512,20 +19103,37 @@@ msgstr "
"\n"
"Выполнить ÑÐ±Ñ€Ð¾Ñ Ð½Ð°Ñтроек?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Выберите папку Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñнимков видео"
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Выбрать"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Ð˜Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° или файла Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñей"
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Выберите папку Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñнимков видео"
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Выбрать"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Ð˜Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° или файла Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñей"
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18538,16 -18533,16 +19141,29 @@@ msgstr "
"Ðажмите Ñочетание клавиш длÑ\n"
"«%@»"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Ðти клавиши не могут быть назначены в качеÑтве горÑчих."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Ðти клавиши не могут быть назначены в качеÑтве горÑчих."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Ðта ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ ÑƒÐ¶Ðµ назначена Ð´Ð»Ñ Â«%@»."
@@@ -20614,20 -20609,20 +21230,36 @@@ msgstr "Удалить выделенн
msgid "Create a new profile"
msgstr "Создать новый профиль"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Создать"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "Ðтот микÑер не входит в ÑоÑтав VLC: он может отÑутÑтвовать."
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Ðет Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr "Ðтот микÑер не входит в ÑоÑтав VLC: он может отÑутÑтвовать."
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Ðет Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "У Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ быть название."
@@@ -24162,23 -24157,23 +24794,43 @@@ msgstr "Перекодирование
msgid "Overlays/Subtitles"
msgstr "Слои/Субтитры"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Моноширинный шрифт"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Ðазвание ÑемейÑтва шрифта, который вы хотите иÑпользовать"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Файл шрифта, который вы хотите иÑпользовать"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Размер шрифта в пикÑелах"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Моноширинный шрифт"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Ðазвание ÑемейÑтва шрифта, который вы хотите иÑпользовать"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Файл шрифта, который вы хотите иÑпользовать"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Размер шрифта в пикÑелах"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24187,11 -24182,11 +24839,19 @@@ msgstr "
"Размер шрифтов, которые будут выводитьÑÑ Ð½Ð° видео. ЕÑли значение Ñтого "
"параметра отлично от 0, то оно перепишет отноÑительный размер шрифта."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "ПрозрачноÑÑ‚ÑŒ текÑта"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "ПрозрачноÑÑ‚ÑŒ текÑта"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24199,12 -24194,12 +24859,20 @@@ msgstr "
"ПрозрачноÑÑ‚ÑŒ текÑта, который будет выводитьÑÑ Ð¿Ð¾Ð²ÐµÑ€Ñ… видео. 0 — прозрачный, "
"255 — полноÑтью непрозрачный."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Цвет текÑта"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24217,12 -24212,12 +24885,20 @@@ msgstr "
"затем зелёный и Ñиний. #000000 = чёрный, #FF0000 = краÑный, #00FF00 = "
"зелёный, #FFF00 = жёлтый (краÑный + зелёный), #FFFFFF = белый"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "ОтноÑительный размер шрифта"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24231,59 -24226,59 +24907,111 @@@ msgstr "
"ОтноÑительный размер шрифтов, которые будут выводитьÑÑ Ð½Ð° видео. ЕÑли указан "
"абÑолютный размер шрифта, отноÑительный будет проигнорирован."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "ПрозрачноÑÑ‚ÑŒ фона"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Цвет фона"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "ПрозрачноÑÑ‚ÑŒ контура"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "ПрозрачноÑÑ‚ÑŒ тени"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Цвет тени"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Угол тени"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Смещение тени"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "ПрозрачноÑÑ‚ÑŒ фона"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Цвет фона"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "ПрозрачноÑÑ‚ÑŒ контура"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "ПрозрачноÑÑ‚ÑŒ тени"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Цвет тени"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Угол тени"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Смещение тени"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "ещё меньше"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "маленький"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "большой"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "ещё больше"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "ИÑпользовать визуализатор YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "ИÑпользовать визуализатор YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24291,23 -24286,23 +25019,43 @@@ msgstr "
"Ð’Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ ÑˆÑ€Ð¸Ñ„Ñ‚Ð° Ñ Ð¸Ñпользованием «палитрой YUV». Ðтот параметр "
"необходим, только еÑли вы хотите закодировать Ñубтитры DVB"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Утончённый"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Утолщённый"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Визуализатор текÑта"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Визуализатор шрифтов Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Утончённый"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Утолщённый"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Визуализатор текÑта"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Визуализатор шрифтов Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/si.po
index ef9462d,4df4ef6..ff6a0d7
--- a/po/si.po
+++ b/po/si.po
@@@ -6,13 -6,12 +6,21 @@@
# Ajith Manjula <uthmax.sms at gmail.com>, 2010
# H.Shalitha Vikum <HSVIKUM at sinhalaya dot com>, 2010
# Pasindu Kavinda <pkavinda at gmail.com>, 2013
++<<<<<<< HEAD
+# leprabat <prab4th at gmail.com>, 2013
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-24 06:09+0000\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-10-04 02:41+0000\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Last-Translator: Pasindu Kavinda <pkavinda at gmail.com>\n"
"Language-Team: Sinhala (http://www.transifex.com/projects/p/vlc-trans/"
"language/si/)\n"
@@@ -41,7 -40,7 +49,11 @@@ msgstr "VLC අභිරුචින්
#: include/vlc_config_cat.h:35
msgid "Select \"Advanced Options\" to see all options."
++<<<<<<< HEAD
+msgstr "සියලුම විකල්ප නà·à¶»à¶¹à·“ම සඳහ෠\"සංකීර්ණ විකල්ප\" à¶à·à¶»à¶±à·Šà¶±."
++=======
+ msgstr "සියලුම විකල්ප දර්à·à¶±à¶º කිරීම සඳහ෠\"සංකීර්ණ විකල්ප\" à¶à·à¶»à¶±à·Šà¶±."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:38 modules/gui/macosx/simple_prefs.m:269
#: modules/gui/qt4/components/simple_preferences.cpp:220
@@@ -125,7 -124,7 +137,11 @@@ msgstr "ප්â€à¶»à¶à·’දà·à¶± ම
#: include/vlc_config_cat.h:65
msgid "General settings for audio output modules."
++<<<<<<< HEAD
+msgstr "à·à·Šâ€à¶»à·€à·Šâ€à¶º ප්â€à¶»à¶à·’දà·à¶± මොඩියුල සඳහ෠ප්â€à¶»à¶°à·à¶± à·ƒà·à¶šà·ƒà·”ම්."
++=======
+ msgstr "à·à·Šâ€à¶»à·€à·Šâ€à¶º ප්â€à¶»à¶à·’දà·à¶± මොඩියුල සඳහ෠සà·à¶¸à·à¶±à·Šâ€à¶º සිටුවම්."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:67 src/libvlc-module.c:1962
#: modules/gui/macosx/VideoEffects.m:85
@@@ -135,13 -134,13 +151,21 @@@ msgstr "ප්â€à¶»à¶šà·“ර්ණ
#: include/vlc_config_cat.h:68
msgid "Miscellaneous audio settings and modules."
++<<<<<<< HEAD
+msgstr "ප්â€à¶»à¶šà·“ර්ණ à·à·Šâ€à¶»à·€à·Šâ€à¶º à·ƒà·à¶šà·ƒà·”ම් සහ මොඩියුල."
++=======
+ msgstr "ප්â€à¶»à¶šà·“ර්ණ à·à·Šâ€à¶»à·€à·Šâ€à¶º සිටුවම් සහ මොඩියුල."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:71 src/input/es_out.c:2869 src/input/es_out.c:2951
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -240,7 -239,7 +264,11 @@@ msgstr "
#: include/vlc_config_cat.h:120
msgid "General input settings. Use with care..."
++<<<<<<< HEAD
+msgstr "ප්â€à¶»à¶°à·à¶± ආදà·à¶± à·ƒà·à¶šà·ƒà·”ම්. ප්â€à¶»à·€à·šà·à¶¸à·’න් භà·à·€à·’à¶à· කරන්න..."
++=======
+ msgstr "ප්â€à¶»à¶°à·à¶± ආදà·à¶± සිටුවම්. ප්â€à¶»à·€à·šà·à¶¸à·’න් භà·à·€à·’à¶à· කරන්න..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:123 src/libvlc-module.c:1897
#: modules/access/avio.h:56
@@@ -260,7 -259,7 +288,11 @@@ msgstr "
#: include/vlc_config_cat.h:133
msgid "General stream output settings"
++<<<<<<< HEAD
+msgstr "ප්â€à¶»à¶°à·à¶± දහර෠ප්â€à¶»à¶à·’දà·à¶± à·ƒà·à¶šà·ƒà·”ම්"
++=======
+ msgstr "ප්â€à¶»à¶°à·à¶± දහර෠ප්â€à¶»à¶à·’දà·à¶± සිටුවම්"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:135
msgid "Muxers"
@@@ -354,7 -353,7 +386,11 @@@ msgstr "සංකීර්ණ
#: include/vlc_config_cat.h:181
msgid "Advanced settings. Use with care..."
++<<<<<<< HEAD
+msgstr "සංකීර්ණ à·ƒà·à¶šà·ƒà·”ම්. ප්â€à¶»à·€à·šà·à¶¸à·’න් භà·à·€à·’à¶à· කරන්න..."
++=======
+ msgstr "සංකීර්ණ සිටුවම්. ප්â€à¶»à·€à·šà·à¶¸à·’න් භà·à·€à·’à¶à· කරන්න..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:183
msgid "Advanced settings"
@@@ -448,10 -447,10 +484,17 @@@ msgid "&About
msgstr "&මේ ගà·à¶±"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -490,17 -489,17 +533,31 @@@ msgid "Save...
msgstr "සුරකින්න..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
+msgid "Repeat All"
+msgstr "සියල්ල යළි වයන්න"
+
+#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
+msgid "Repeat One"
+msgstr "එකක් පමණක් යළි වයන්න"
+
+#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
+ msgid "Repeat All"
+ msgstr "සියල්ල යළි ධà·à·€à¶±à¶º"
+
+ #: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
+ msgid "Repeat One"
+ msgstr "එකක් පමණක් යළි යළිà¶à·Š ධà·à·€à¶±à¶º"
+
+ #: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -508,11 -507,11 +565,19 @@@ msgstr "අහඹු
#: include/vlc_intf_strings.h:80 modules/gui/macosx/CoreInteraction.m:382
msgid "Random Off"
++<<<<<<< HEAD
+msgstr "අහඹු à·€à·à¶¯à¶±à¶º අක්â€à¶»à·’යයි"
+
+#: include/vlc_intf_strings.h:81
+msgid "Add to Playlist"
+msgstr "à·€à·à¶¯à¶±à¶½à·à¶ºà·’ස්à¶à·”වට එක් කරන්න"
++=======
+ msgstr "අහඹු ධà·à·€à¶±à¶º වසන්න"
+
+ #: include/vlc_intf_strings.h:81
+ msgid "Add to Playlist"
+ msgstr "ධà·à·€à¶± ලà·à¶ºà·’ස්à¶à·”වට එක් කරන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:83
msgid "Add File..."
@@@ -520,11 -519,11 +585,19 @@@ msgstr "ගොනුවක් එකà·
#: include/vlc_intf_strings.h:84
msgid "Add Directory..."
++<<<<<<< HEAD
+msgstr "ඩිරෙක්ටරියක් එක් කරන්න..."
+
+#: include/vlc_intf_strings.h:85
+msgid "Add Folder..."
+msgstr "à·†à·à¶½à·Šà¶©à¶»à¶ºà¶šà·Š එක් කරන්න..."
++=======
+ msgstr "ඩිරෙක්ටරියක් එකà¶à·” කරන්න..."
+
+ #: include/vlc_intf_strings.h:85
+ msgid "Add Folder..."
+ msgstr "à·†à·à¶½à·Šà¶©à¶»à¶ºà¶šà·Š එකà¶à·” කරන්න..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:87
msgid "Save Playlist to &File..."
@@@ -569,31 -568,37 +642,65 @@@ msgid "
"can <b>promote</b> VLC media player.</p></body></html>"
msgstr ""
"<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; "
++<<<<<<< HEAD
+"charset=utf-8\" /></head><body><h2>VLC මà·à¶°à·Šâ€à¶º à·€à·à¶¯à¶šà¶ºà·š උදව් සඳහ෠සà·à¶¯à¶»à¶ºà·™à¶±à·Š පිළිගනිමු</"
+"h2><h3>ප්â€à¶»à¶½à·šà¶›à¶±à¶º</h3><p>ඔබට VideoLAN <a href=\"http://wiki.videolan.org\">විකි</"
+"a> වෙබ් අඩවිය à¶à·”ළින් VLC ප්â€à¶»à¶½à·šà¶›à¶±à¶º සොය෠ගà·à¶±à·“මට à·„à·à¶šà·’ වේවි.</p><p>ඔබ VLC මà·à¶°à·Šâ€à¶º à·€à·à¶¯à¶šà¶º සඳහ෠"
+"නවකයෙක් නම්, කරුණà·à¶šà¶»<br><a href=\"http://wiki.videolan.org/Documentation:"
+"VLC_for_dummies\"><em>VLC මà·à¶°à·Šâ€à¶º à·€à·à¶¯à¶šà¶º පිළිබඳ à·„à·à¶³à·’න්වීම</em></a> කියවන්න.</p><p>ඔබට "
+"මෙහි ඇà¶à·’ <br>\"<a href=\"http://wiki.videolan.org/Documentation:Play_HowTo"
+"\"><em>මà·à¶°à·Šâ€à¶º à·€à·à¶¯à¶šà¶º සමඟ ගොනු à·€à·à¶¯à¶±à¶º කරන්නේ කෙසේද?</em></a>\" නම් වූ ලේඛනය à¶à·”ළින් මà·à¶°à·Šâ€à¶º "
+"à·€à·à¶¯à¶šà¶º භà·à·€à·’à¶à· කරන්නේ කෙසේදà·à¶ºà·’ යන්න ගà·à¶± සමහර à¶à·œà¶»à¶à·”රු සොය෠ගà·à¶±à·“මට à·„à·à¶šà·’වේවි.</p><p>ගොනු "
+"සුරà·à¶šà·“ම, වෙනà¶à·Š ආකà·à¶»à¶ºà¶±à·Šà¶§ à·„à·à¶»à·€à·“ම, කේà¶à·à¶‚කණය කිරීම, mux කිරීම සහ දහරà·à·€à¶±à·Š සම්බන්ධ විවිධ වූ "
+"කà·à¶»à·Šà¶ºà¶ºà¶±à·Š පිළිබඳව ප්â€à¶»à¶ºà·à¶¢à¶±à·€à¶à·Š වන බොහà·à¶¸à¶ºà¶šà·Š à¶à·œà¶»à¶à·”රු <a href=\"http://wiki.videolan.org/"
+"Documentation:Streaming_HowTo\">දහර෠ප්â€à¶»à¶½à·šà¶›à¶±à¶º</a> à¶à·”ලින් ඔබට සොය෠ගà·à¶±à·“මට à·„à·à¶šà·’ වේවි."
+"</p><p>ඔබට මෙහි සඳහන් පà·à¶»à·’භà·à·‚ික à·à¶¶à·Šà¶¯à¶¸à·à¶½à·à·€ සම්බන්ධයෙන් විà·à·Šà·€à·à·ƒà¶ºà¶šà·Š නà·à¶à·’ නම්, කරුණà·à¶šà¶» <a "
+"href=\"http://wiki.videolan.org/Knowledge_Base\">දà·à¶±à·”ම් මූලය</a> à¶à·”ලින් උපදෙස් ලබ෠"
+"ගන්න.</p><p>>ප්â€à¶»à¶°à·à¶± යà¶à·”රු පුවරු කෙටිමං ගà·à¶± වටහ෠ගà·à¶±à·“මට <a href=\"http://wiki."
+"videolan.org/Hotkeys\">කෙටිමං</a> පිටුව කියවන්න.</p><h3>උදව්</h3><p>ඕනෑම ප්â€à¶»à·à·Šà¶±à¶ºà¶šà·Š "
+"ඇසීමට පෙරà·à¶à·”à·€ <a href=\"http://www.videolan.org/support/faq.html\">නිà¶à¶» අසන "
+"ප්â€à¶»à·à·Šà¶±</a> පිළිබඳවà¶à·Š සිචයොමු කරන්න.</p><p>ඔබට අවà·à·Šâ€à¶º නම් <a href=\"http://forum."
+"videolan.org\">à·†à·à¶»à¶¸</a>, <a href=\"http://www.videolan.org/vlc/lists.html"
+"\">à¶à·à¶´à·à¶½à·Š-ලà·à¶ºà·’ස්à¶à·”</a> හ෠අපේ IRC නà·à¶½à·’කà·à·€à·™à¶±à·Š (<em>#videolan</em> irc.freenode.net "
+"à·„à·“) උපකà·à¶» ගà·à¶±à·“මට (සහ දීමට) à·„à·à¶šà·’යි.</p><h3>ව්â€à¶ºà·à¶´à·˜à¶à·’යට දà·à¶ºà¶š වන්න</h3><p>ඇඳුම් නිර්මà·à¶«à¶º "
+"කිරීමට, ප්â€à¶»à¶½à·šà¶›à¶±à¶º පරිවර්à¶à¶±à¶º කිරීමට, පරීක්â€à·‚෠කිරීම සහ කේà¶à¶±à¶º කිරීමට ඔබගේ කà·à¶½à¶º ලබ෠දීමෙන් "
+"ප්â€à¶»à¶¢à·à·€à¶§ උපකà·à¶» කොට VideoLAN ව්â€à¶ºà·à¶´à·˜à¶à·’යට උදව් කිරීමට ඔබටà¶à·Š පුළුවනි. ඔබට à·„à·à¶šà·’යà·à·€à¶šà·Š ඇà¶à·Šà¶±à¶¸à·Š යම් "
+"කිසි ආධà·à¶»à¶ºà¶šà·Š හ෠ද්â€à¶»à·€à·Šâ€à¶ºà¶¸à¶º දෑ ලබ෠දීමෙන් අපට උපකà·à¶» කල à·„à·à¶šà·’යි. ඒ වගේම, ඔබට VLC මà·à¶°à·Šâ€à¶º "
+"à·€à·à¶¯à¶šà¶º <b>අන් අයටà¶à·Š හඳුන්ව෠දීමෙන් සහ භà·à·€à·’à¶à· කිරීමට අනුබල දීමෙන්</b> අප වෙචඅනුග්â€à¶»à·„ය දක්වන්නට "
+"පුළුවනි.</p></body></html>"
++=======
+ "charset=utf-8\" /></head><body><h2>VLC මà·à¶°à·Šâ€à¶ºÂ ධà·à·€à¶šà¶ºà·š උදව් සඳහ෠සà·à¶¯à¶»à¶ºà·™à¶±à·Š පිළිගනිමු෴</"
+ "h2><h3>ප්â€à¶»à¶½à·šà¶›à¶±à¶º</h3><p>ඔබට VLC ප්â€à¶»à¶½à·šà¶›à¶±à¶º සොය෠ගà·à¶±à·“මට à·„à·à¶šà·’ වේවි VideoLAN ගේ <a "
+ "href=\"http://wiki.videolan.org\">විකි</a> වෙබ් අඩවිය à¶à·”ළින්.</p><p>ඔබ VLC "
+ "මà·à¶°à·Šâ€à¶ºÂ ධà·à·€à¶šà¶º සඳහ෠නවකයෙක් නම්, පළමුව කරුණà·à¶šà¶» මෙය කියවන්න.<br><a href=\"http://wiki."
+ "videolan.org/Documentation:VLC_for_dummies\"><em>VLC මà·à¶°à·Šâ€à¶ºÂ ධà·à·€à¶šà¶º පිළිබඳ à·„à·à¶³à·’න්වීම</"
+ "em></a>.</p><p>මෙම මà·à¶°à·Šâ€à¶º ධà·à·€à¶šà¶º භà·à·€à·’à¶à· කරන්නේ කෙසේදà·à¶ºà·’ යන්න ගà·à¶± සමහර à¶à·œà¶»à¶à·”රු ඔබට "
+ "සොය෠ගà·à¶±à·“මට à·„à·à¶šà·’වේවි මෙහි ඇà¶à·’ <br>\"<a href=\"http://wiki.videolan.org/"
+ "Documentation:Play_HowTo\"><em>VLC මà·à¶°à·Šâ€à¶º ධà·à·€à¶šà¶º සමගින් ගොනු ධà·à·€à¶±à¶º කරන්නේ කෙසේද?</"
+ "em></a>\" නම් වූ ලේඛනය à¶à·”ළින්.</p><p>ගොනු සුරà·à¶šà·“ම, වෙනà¶à·Š ආකà·à¶»à¶ºà¶±à·Šà¶§ à·„à·à¶»à·€à·“ම, කේà¶à·à¶‚කණය කිරීම, "
+ "mux කිරීම සහ දහරà·à·€à¶±à·Š සම්බන්ධ විවිධ වූ කà·à¶»à·Šà¶ºà¶ºà¶±à·Š පිළිබඳව ප්â€à¶»à¶ºà·à¶¢à¶±à·€à¶à·Š වන බොහà·à¶¸à¶ºà¶šà·Š à¶à·œà¶»à¶à·”රු ඔබට à·„à·à¶šà·’ "
+ "වේවි සොය෠ගà·à¶±à·“මට <a href=\"http://wiki.videolan.org/Documentation:"
+ "Streaming_HowTo\">Streaming Documentation</a>ලේඛනය à¶à·”ළින්.</p><p>ඔබට මෙහි සඳහන් "
+ "පà·à¶»à·’භà·à·‚ික à·à¶¶à·Šà¶¯à¶¸à·à¶½à·à·€ සම්බන්ධයෙන් විà·à·Šà·€à·à·ƒà¶ºà¶šà·Š නà·à¶à·’ නම්, කරුණà·à¶šà¶» මෙà¶à·à¶±à·’න් උපදෙස් ලබ෠ගන්න <a "
+ "href=\"http://wiki.videolan.org/Knowledge_Base\">knowledge base</a>.</"
+ "p><p>ප්â€à¶»à¶°à·à¶± යà¶à·”රු පුවරු කෙටිමං ගà·à¶± වටහ෠ගà·à¶±à·“මට කියවන්න <a href=\"http://wiki.videolan."
+ "org/Hotkeys\">කෙටිමං</a> පිටුව.</p><h3>උදව්</h3><p>ඕනෑම ප්â€à¶»à·à·Šà¶±à¶ºà¶šà·Š ඇසීමට පෙරà·à¶à·”à·€ "
+ "කරුණà·à¶šà¶» ඔබ විසින්ම මේ පිළිබඳවà¶à·Š සිචයොමු කරන්න.<a href=\"http://www.videolan.org/"
+ "support/faq.html\">නිà¶à¶» අසන ප්â€à¶»à·à·Šà¶± (FAQ)</a>.</p><p>එපමණක් ද නොව, ඔබට යම් කිසිවක් "
+ "වටහ෠ගà·à¶±à·“මට (සහ දීමට) à·„à·à¶šà·’යි <a href=\"http://forum.videolan.org\">පà·à¶»à¶¸</a>, à·„à· "
+ "<a href=\"http://www.videolan.org/vlc/lists.html\">à¶à·à¶´à·à¶½à·Š ලà·à¶ºà·’ස්à¶à·”à·€</a> හ෠අපගේ "
+ "IRC චà·à¶±à¶½à¶º ඔස්සේ (<em>#videolan</em> on irc.freenode.net).<h3>මේ ව්â€à¶ºà·à¶´à·˜à¶à·’ය සඳහ෠"
+ "ඔබගේ දà·à¶ºà¶šà¶à·Šà·€à¶º ලබ෠දෙන්න</h3><p>ඔබටà¶à·Š පුළුවන් VideoLAN ව්â€à¶ºà·à¶´à·˜à¶à·’යට උදව් කිරීමට, ප්â€à¶»à¶¢à·à·€à¶§ "
+ "නොදන්න෠දේ කිය෠දීමට ඔබගේ කà·à¶½à¶º ලබ෠දීමෙන්, VLC සඳහ෠ඇඳුම් (skins) නිර්මà·à¶«à¶º කිරීමෙන්, "
+ "ප්â€à¶»à¶½à·šà¶›à¶± සහ ලිපි පරිවර්à¶à¶±à¶º කිරීමෙන්, පරීක්â€à·‚෠කිරීමෙන් සහ කේà¶à¶±à¶º කිරීමෙන්. එපමණක්ම නොවෙයි. ඔබට "
+ "පුළුවන් à·„à·à¶šà·’යà·à·€à¶šà·Š ඇà¶à·Šà¶±à¶¸à·Š යම් කිසි ආධà·à¶»à¶ºà¶šà·Š හ෠ද්â€à¶»à·€à·Šâ€à¶ºà¶¸à¶º ද෠අපට උදව්වක් ලෙස ලබ෠දීමට. ඒ à·€à·à¶œà·šà¶¸, "
+ "ඔබ à·ƒà·à¶¸à¶§à¶¸ පුළුවන් VLC මà·à¶°à·Šâ€à¶º ධà·à·€à¶šà¶º <b>අන් අයටà¶à·Š හඳුන්ව෠දීමෙන් සහ භà·à·€à·’à¶à· කිරීමට අනුබල දීමෙන්</"
+ "b> අප වෙචඅනුග්â€à¶»à·„ය දක්වන්නට.<p><b>සිංහල අà¶à·”රුමුහුණචහ෠සම්බන්ධ ගà·à¶§à·…à·”:<b></p><p>ඔබගේ සිංහල "
+ "අà¶à·”රු මුහුණà¶à·™à·„à·’ අකුරු අà¶à¶» අනවà·à·Šâ€à¶º ලෙස හිස් ඉඩ පවà¶à·’න්නේ ද? එසේ නම් පහචදà·à¶šà·Šà·€à·™à¶± ෆොන්ට ඉවà¶à·Š කර "
+ "නà·à·€à¶ වරක් පරීක්â€à·‚෠කර බලන්න. මෙම ෆොන්ට වල ඇà¶à·’ යම් දà·à·‚ සහගචà¶à¶à·Šà·€à¶ºà¶šà·Š නිස෠සමහර අකුරු අà¶à¶» "
+ "අනවà·à·Šâ€à¶º පරිදි පරà¶à¶»à¶ºà¶šà·Š ඇà¶à·’ විය à·„à·à¶šà·’යි. Bhashitha, Dinamina UniWeb (වින්ඩà·à·ƒà·Š පරිà·à·“ලකයන් සඳහ෠"
+ "පමණයි)</p><p></p><p>ස්à¶à·–à¶à·’යි෴</p></p></body></html>"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/audio_output/filters.c:247
msgid "Audio filtering failed"
@@@ -606,9 -611,9 +713,15 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
+msgid "Disable"
+msgstr "අක්â€à¶»à·’ය කරන්න"
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
+ msgid "Disable"
+ msgstr "අක්â€à¶»à·’ය"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/audio_output/output.c:223 modules/visualization/visual/visual.c:126
msgid "Spectrometer"
@@@ -797,7 -802,7 +910,11 @@@ msgstr "සම්පà·à¶¯à¶±à¶º කර
#: src/config/help.c:794
#, c-format
msgid "Compiler: %s\n"
++<<<<<<< HEAD
+msgstr "සම්පà·à¶¯à¶šà¶º: %s\n"
++=======
+ msgstr "සම්පà·à¶¯à¶š: %s\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/help.c:827
msgid ""
@@@ -958,11 -963,11 +1075,19 @@@ msgstr "මà·à¶°à·Šâ€à¶º ඊළඟ à¶
#: src/config/keys.c:92
msgid "Media Play Pause"
++<<<<<<< HEAD
+msgstr "මà·à¶°à¶º ධà·à·€à¶±à¶º/විරà·à¶¸à¶º"
+
+#: src/config/keys.c:93
+msgid "Media Prev Frame"
+msgstr "මà·à¶°à·Šâ€à¶º ඊළඟ රà·à¶¸à·”à·€"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:93
+ msgid "Media Prev Frame"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:94
msgid "Media Prev Track"
@@@ -970,7 -975,7 +1095,11 @@@ msgstr "
#: src/config/keys.c:95
msgid "Media Record"
++<<<<<<< HEAD
+msgstr "මà·à¶°à·Šâ€à¶ºà¶ºà·š à·€à·à¶»à·Šà¶à·à·€"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:96
msgid "Media Repeat"
@@@ -982,23 -987,23 +1111,43 @@@ msgstr "
#: src/config/keys.c:98
msgid "Media Select"
++<<<<<<< HEAD
+msgstr "මà·à¶°à·Šâ€à¶ºà¶ºà·š à¶à·à¶»à·à¶œà·à¶±à·“ම"
+
+#: src/config/keys.c:99
+msgid "Media Shuffle"
+msgstr "මà·à¶°à·Šâ€à¶º කලවම"
+
+#: src/config/keys.c:100
+msgid "Media Stop"
+msgstr "මà·à¶°à·Šâ€à¶ºà¶ºà·š නවà¶à·à¶½à·“ම"
+
+#: src/config/keys.c:101
+msgid "Media Subtitle"
+msgstr "මà·à¶°à·Šâ€à¶ºà¶ºà·š උපසිරුසි"
+
+#: src/config/keys.c:102
+msgid "Media Time"
+msgstr "මà·à¶°à·Šâ€à¶ºà¶ºà·š කà·à¶½à¶º"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:99
+ msgid "Media Shuffle"
+ msgstr ""
+
+ #: src/config/keys.c:100
+ msgid "Media Stop"
+ msgstr ""
+
+ #: src/config/keys.c:101
+ msgid "Media Subtitle"
+ msgstr ""
+
+ #: src/config/keys.c:102
+ msgid "Media Time"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:103
msgid "Media View"
@@@ -1064,7 -1069,7 +1213,11 @@@ msgstr "
#: src/config/keys.c:119
msgid "Zoom In"
++<<<<<<< HEAD
+msgstr "විà·à·à¶½à¶±à¶º"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:120
msgid "Zoom Out"
@@@ -1268,20 -1273,20 +1421,36 @@@ msgstr "රà·à¶¸à·” අනුපà·à¶
msgid "Decoded format"
msgstr "විකේà¶à¶š à·„à·à¶©à¶à¶½à¶º"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "ඔබගේ ආදà·à¶±à¶º විවෘචකිරීමට නොහà·à¶šà·’ විය"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "ඔබගේ ආදà·à¶±à¶º විවෘචකිරීමට නොහà·à¶šà·’ විය"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC හට MRL '%s' විවෘචකිරීමට නොහà·à¶šà·’ විය. à·€à·à¶©à·’ විස්à¶à¶» සඳහ෠ලොග් සටහන පරීක්â€à·‚෠කරන්න."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC හට ආදà·à¶±à¶ºà·š à·„à·à¶©à¶à¶½à¶º හඳුන෠ගà·à¶±à·“මට නොහà·à¶šà·’ විය."
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC හට ආදà·à¶±à¶ºà·š à·„à·à¶©à¶à¶½à¶º හඳුන෠ගà·à¶±à·“මට නොහà·à¶šà·’ විය."
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1311,7 -1316,7 +1480,11 @@@ msgstr "ප්â€à¶»à¶·à·šà¶¯à¶º
#: src/input/meta.c:58 modules/mux/asf.c:60
msgid "Copyright"
++<<<<<<< HEAD
+msgstr "ප්â€à¶»à¶šà·à·à¶± අයිà¶à·’ය"
++=======
+ msgstr "අයිà¶à·’ය"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/meta.c:59 src/libvlc-module.c:230 modules/access/vcdx/info.c:63
#: modules/gui/macosx/MainMenu.m:73
@@@ -1421,12 -1426,12 +1594,20 @@@ msgstr "පෙර පරිච්ඡේ
#: src/input/vlm.c:638 src/input/vlm.c:1023
#, c-format
msgid "Media: %s"
++<<<<<<< HEAD
+msgstr "මà·à¶°à·Šâ€à¶º: %s"
++=======
+ msgstr "මà·à¶°à·Šâ€à¶º: %s "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/interface/interface.c:81 modules/gui/macosx/MainMenu.m:312
#: modules/gui/macosx/MainMenu.m:313
msgid "Add Interface"
++<<<<<<< HEAD
+msgstr "අà¶à·”රුමුහුණà¶à¶šà·Š එක් කරන්න"
++=======
+ msgstr "අà¶à·”රුමුහුණà¶à¶šà·Š එකà¶à·” කරන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/interface/interface.c:88
msgid "Console"
@@@ -1438,7 -1443,7 +1619,11 @@@ msgstr "ටෙල්නෙට්
#: src/interface/interface.c:95
msgid "Web"
++<<<<<<< HEAD
+msgstr "ජà·à¶½à¶º"
++=======
+ msgstr "වෙබ්"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/interface/interface.c:98
msgid "Debug logging"
@@@ -1476,7 -1481,7 +1661,11 @@@ msgstr "1:2 භà·à¶œà¶º
#: src/libvlc.h:137 src/libvlc-module.c:1321 src/video_output/vout_intf.c:87
msgid "1:1 Original"
++<<<<<<< HEAD
+msgstr "1:1 නියම"
++=======
+ msgstr "1:1 à·ƒà·à¶¸à·à¶±à·Šâ€à¶º"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc.h:138 src/libvlc-module.c:1322 src/video_output/vout_intf.c:88
msgid "2:1 Double"
@@@ -1685,7 -1690,7 +1874,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1767,7 -1772,7 +1960,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "කිසිවක් නොමà·à¶"
@@@ -1793,7 -1798,7 +1990,11 @@@ msgstr "
"මෙය VLC විසින් භà·à·€à·’à¶à· කරනු ලබන වීඩිය෠ප්â€à¶»à¶à·’දà·à¶± ක්â€à¶»à¶¸à¶ºà¶ºà·’. පෙරනිමි à·„à·à·ƒà·’රීම වනුයේ ලබà·à¶œà¶ à·„à·à¶šà·’ හොඳම "
"ක්â€à¶»à¶¸à¶º ස්වයංක්â€à¶»à·“යව à¶à·à¶»à· ගà·à¶±à·“මයි."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "වීඩිය෠සබල කරන්න"
@@@ -1985,7 -1990,7 +2186,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "à·ƒà·à¶¸à·€à·’ටම ඉහළින් à¶à¶¶à¶±à·Šà¶±"
@@@ -2036,7 -2041,7 +2241,11 @@@ msgstr "මිලිà¶à¶à·Šà¶´à¶» n à
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2045,7 -2050,7 +2254,11 @@@ msgstr "සුමට කිරීම
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2101,7 -2106,7 +2314,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "කවුළු ආයිà¶à·Šà¶à¶¸à·Š"
@@@ -2270,7 -2275,7 +2487,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "රà·à¶¸à·” මගහරින්න"
@@@ -2399,12 -2404,12 +2620,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2412,7 -2417,7 +2642,11 @@@ msgid "Default
msgstr "පෙරනිමි "
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2723,7 -2728,7 +2957,11 @@@ msgid "You can completely disable the s
msgstr "උප-අනුරූ à·ƒà·à¶šà·ƒà·“ම සම්පූර්ණයෙන්ම අහà·à·ƒà·’ කිරීමට මෙයින් ඔබට à·„à·à¶šà·’යි."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -2935,7 -2940,7 +3173,11 @@@ msgstr "
#: src/libvlc-module.c:827
msgid "HTTP/TLS server certificate"
++<<<<<<< HEAD
+msgstr "HTTP/TLS සර්වර් සහà¶à·’කය"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:829
msgid "This X.509 certicate file (PEM format) is used for server-side TLS."
@@@ -3555,9 -3560,9 +3797,15 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
+msgid "Ignore"
+msgstr "නොසලකන්න"
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
+ msgid "Ignore"
+ msgstr "නොසලක෠හරින්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1197
msgid "Volume Control"
@@@ -3579,8 -3584,8 +3827,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3660,10 -3665,10 +3913,17 @@@ msgid "Slower (fine)
msgstr "සෙමින් (සියුම්ව)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3676,21 -3681,21 +3936,37 @@@ msgid "Select the hotkey to use to ski
msgstr "ධà·à·€à¶± ලà·à¶ºà·’ස්à¶à·”වේ ඊළඟ අයිà¶à¶¸à¶º මගහà·à¶»à·“ම සඳහ෠භà·à·€à·’à¶à· කිරීමට කෙටි යà¶à·”ර à¶à·à¶»à¶±à·Šà¶±."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
+#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
+msgid "Previous"
+msgstr "පෙර"
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
+ #: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
+ msgid "Previous"
+ msgstr "කළින්"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1226
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "ධà·à·€à¶± ලà·à¶ºà·’ස්à¶à·”වේ පෙර අයිà¶à¶¸à¶º මගහà·à¶»à·“ම සඳහ෠භà·à·€à·’à¶à· කිරීමට කෙටි යà¶à·”ර à¶à·à¶»à¶±à·Šà¶±."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3862,7 -3867,7 +4138,11 @@@ msgstr "ඩීවීඩී මෙනà·
#: src/libvlc-module.c:1280
msgid "Activate"
++<<<<<<< HEAD
+msgstr "සක්â€à¶»à·’ය කරන්න"
++=======
+ msgstr "සක්â€à¶»à·’ය කිරීම"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1281
msgid "Select the key to activate selected item in DVD menus."
@@@ -3925,9 -3930,9 +4205,15 @@@ msgid "Select the key to decrease audi
msgstr "à·à·Šâ€à¶»à·€à·Šâ€à¶º à·à¶¶à·Šà¶¯à¶º අඩු කිරීම සඳහ෠යà¶à·”ර à¶à·à¶»à¶±à·Šà¶±."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "නිහඬ"
@@@ -4250,7 -4255,7 +4536,11 @@@ msgstr "අà¶à·”රුමුහුණà
#: src/libvlc-module.c:1387
msgid "Context menu"
++<<<<<<< HEAD
+msgstr "සන්දර්භ මෙනුව"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1388
msgid "Show the contextual popup menu."
@@@ -4341,7 -4346,7 +4631,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "à·ƒà·à¶«à¶»à·”à·€ (Snapshot)"
@@@ -4378,11 -4383,11 +4672,19 @@@ msgstr "ධà·à·€à¶± පà·à¶½à¶š
#: src/libvlc-module.c:1730
msgid "Default devices"
++<<<<<<< HEAD
+msgstr "පෙරනිමි ආම්පන්න"
+
+#: src/libvlc-module.c:1739
+msgid "Network settings"
+msgstr "ජà·à¶½ à·ƒà·à¶šà·ƒà·”ම්"
++=======
+ msgstr "පෙරනිමි ආම්පන්නය"
+
+ #: src/libvlc-module.c:1739
+ msgid "Network settings"
+ msgstr "ජà·à¶½ සිටුවම්"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1764
msgid "Socks proxy"
@@@ -4540,12 -4545,12 +4842,21 @@@ msgstr "බà·à¶œà¶±à·’මින්...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "අවලංගු කරන්න"
@@@ -5306,7 -5311,7 +5617,11 @@@ msgstr "ඡේදනය
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "දර්à·à¶± අනුපà·à¶à¶º "
@@@ -5406,7 -5411,7 +5721,11 @@@ msgstr "
#: modules/access/bluray.c:60
msgid "Blu-ray menus"
++<<<<<<< HEAD
+msgstr "බ්ලූ-රේ මෙනු"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:61
msgid "Use Blu-ray menus. If disabled, the movie will start directly"
@@@ -5415,7 -5420,7 +5734,11 @@@ msgstr "
#: modules/access/bluray.c:69 modules/services_discovery/udev.c:596
#: modules/gui/qt4/ui/open_disk.h:299
msgid "Blu-ray"
++<<<<<<< HEAD
+msgstr "බ්ලූ-රේ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:70
msgid "Blu-ray Disc support (libbluray)"
@@@ -5449,7 -5454,7 +5772,11 @@@ msgstr "
#: modules/access/bluray.c:287
msgid "AACS MMC failed."
++<<<<<<< HEAD
+msgstr "AACS MMC අසà·à¶»à·Šà¶®à¶šà¶ºà·’."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:293
msgid "Your system AACS decoding library does not work. Missing keys?"
@@@ -7623,7 -7628,7 +7950,11 @@@ msgstr "à¶à·’ර ආදà·à¶±à¶º
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "à¶à·’රය"
@@@ -8355,7 -8360,7 +8686,11 @@@ msgstr "Vol max #
msgid "Volume Set"
msgstr "පරිමà·à·€ සකසන්න"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9466,7 -9471,7 +9801,11 @@@ msgstr "සරවුන්ඩ් 7.1
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9497,7 -9502,7 +9836,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9505,30 -9510,30 +9848,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10694,46 -10699,46 +11061,74 @@@ msgstr "සෙවනà·à¶½à·’
msgid "Outline"
msgstr "වටසන (Outline)"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "කළු"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "අළු"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "රිදී"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "සුදු"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "මෙරූන්"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "රà¶à·”"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10741,61 -10746,61 +11136,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "කහ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "ඔලිව්"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "කොළ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "දෙහි පà·à·„à·à¶º"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "දම්"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "නිල්"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10925,7 -10930,7 +11356,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr " font cache මà¶à¶šà¶º ගොඩනංවමින්..."
@@@ -10995,7 -11000,7 +11430,11 @@@ msgstr "
#: modules/codec/qsv.c:56
msgid "Enable software mode"
++<<<<<<< HEAD
+msgstr "මෘදුකà·à¶‚ග ක්â€à¶»à¶¸à¶º සක්â€à¶»à·’ය කරන්න"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:57
msgid ""
@@@ -11058,7 -11063,7 +11497,11 @@@ msgstr "
#: modules/codec/qsv.c:90
msgid "IDR interval"
++<<<<<<< HEAD
+msgstr "IDR අන්à¶à¶»à¶º"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:92
msgid ""
@@@ -12714,10 -12719,10 +13157,17 @@@ msgid "Fast
msgstr "වේගවà¶à·Š"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "à·ƒà·à¶¸à·à¶±à·Šâ€à¶º"
@@@ -12822,8 -12827,8 +13272,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13159,9 -13164,9 +13614,15 @@@ msgstr "ආරම්භ වෙමින
msgid "Opening"
msgstr "විවෘචවෙමින්"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "විරà·à¶¸à¶º"
@@@ -15041,7 -15046,7 +15502,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG පරිවහන දහර෠ඩිමක්සර්"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "ටෙලිටෙක්ස්"
@@@ -15183,7 -15188,7 +15648,11 @@@ msgstr "VLC මà·à¶°à·Šâ€à¶º à·€à·à¶
#: modules/gui/macosx/about.m:95 modules/gui/qt4/dialogs/help.cpp:125
msgid "Credits"
++<<<<<<< HEAD
+msgstr "ස්à¶à·”à¶à·’ය"
++=======
+ msgstr "à¶à·”à¶à·’"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/about.m:98 modules/gui/macosx/MainMenu.m:450
#: modules/gui/qt4/dialogs/help.cpp:119
@@@ -15227,7 -15232,7 +15696,11 @@@ msgid "VLC media player Help
msgstr "VLC මà·à¶°à·Šâ€à¶º ධà·à·€à¶šà¶º උදව්"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "සූචිය"
@@@ -15315,9 -15320,9 +15788,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "සුරකින්න"
@@@ -15456,7 -15461,7 +15935,11 @@@ msgstr "ආදà·à¶±à¶º සොය෠à¶
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15476,7 -15481,7 +15959,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15486,7 -15491,7 +15973,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15506,84 -15511,84 +15997,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "ප්â€à¶»à¶ºà·à¶œ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15619,7 -15624,7 +16181,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15804,8 -15809,8 +16370,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "රිසිකළ"
@@@ -15898,36 -15903,36 +16469,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "නà·à·€à¶ නොවිමසන්න"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "බිඳවà·à¶§à·”ම් ලොගය සොය෠ගà·à¶±à·“මට â€à¶±à·à¶"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "බිඳවà·à¶§à·”ම් ලොගය සොය෠ගà·à¶±à·“මට â€à¶±à·à¶"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "අඛණ්ඩව කරගෙන යන්න"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "මින් පෙර බිඳ à·€à·à¶§à·”ණු ලකුණු කිසිවක් සොය෠ගà·à¶±à·“මට නොහà·à¶šà·’ විය."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "පà·à¶»à¶«à·’ අභිරුචි ඉවà¶à·Š කරන්නද?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "VLC à·„à·’ පà·à¶»à¶«à·’ අනුවà·à¶¯à¶ºà¶š අභිරුචි ගොනු අපට සොය෠ගà·à¶±à·“මට à·„à·à¶šà·’විය."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "පිළිසකර බඳුනට ගෙන යන්න සහ VLC යළි ධà·à·€à¶±à¶º කරන්න"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "මින් පෙර බිඳ à·€à·à¶§à·”ණු ලකුණු කිසිවක් සොය෠ගà·à¶±à·“මට නොහà·à¶šà·’ විය."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "පà·à¶»à¶«à·’ අභිරුචි ඉවà¶à·Š කරන්නද?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "VLC à·„à·’ පà·à¶»à¶«à·’ අනුවà·à¶¯à¶ºà¶š අභිරුචි ගොනු අපට සොය෠ගà·à¶±à·“මට à·„à·à¶šà·’විය."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "පිළිසකර බඳුනට ගෙන යන්න සහ VLC යළි ධà·à·€à¶±à¶º කරන්න"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16081,7 -16086,7 +16684,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16210,7 -16215,7 +16817,11 @@@ msgstr "VLC සඟවන්න
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "සියල්ලම පෙන්වන්න"
@@@ -16295,15 -16300,15 +16906,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "ධà·à·€à¶±à¶ºà·™à¶±à·Š පසුව ඉවà¶à·Šà·€à¶±à·Šà¶±"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "පියවරක් ඉදිරියට"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "ධà·à·€à¶±à¶ºà·™à¶±à·Š පසුව ඉවà¶à·Šà·€à¶±à·Šà¶±"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "පියවරක් ඉදිරියට"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "පියවරක් පසුපසට"
@@@ -16319,30 -16324,30 +16942,56 @@@ msgstr "à·à¶¶à·Šà¶¯ පරිමà·à·
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "à·ƒà·à¶¸à·à¶±à·Šâ€à¶º ප්â€à¶»à¶¸à·à¶«à¶º"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "ද්විà¶à·Šà·€ ප්â€à¶»à¶¸à·à¶«à¶º"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "à·ƒà·à¶¸à·à¶±à·Šâ€à¶º ප්â€à¶»à¶¸à·à¶«à¶º"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "ද්විà¶à·Šà·€ ප්â€à¶»à¶¸à·à¶«à¶º"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16351,9 -16356,9 +17000,15 @@@
msgid "Post processing"
msgstr "පෙර à·ƒà·à¶šà·ƒà·“ම"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
+msgid "Add Subtitle File..."
+msgstr "උපසිරà·à·ƒà·’ ගොනුවක් එක් කරන්න..."
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
+ msgid "Add Subtitle File..."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:415 modules/gui/macosx/MainMenu.m:416
msgid "Subtitles Track"
@@@ -16361,11 -16366,11 +17016,19 @@@ msgstr "උපසිරà·à·ƒà·’ පථ
#: modules/gui/macosx/MainMenu.m:417
msgid "Text Size"
++<<<<<<< HEAD
+msgstr "පෙළ ප්â€à¶»à¶¸à·à¶«à¶º"
+
+#: modules/gui/macosx/MainMenu.m:418
+msgid "Text Color"
+msgstr "පෙළ වර්ණය"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:418
+ msgid "Text Color"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:419
msgid "Outline Thickness"
@@@ -16373,11 -16378,11 +17036,19 @@@ msgstr "
#: modules/gui/macosx/MainMenu.m:421 modules/gui/macosx/MainMenu.m:422
msgid "Background Opacity"
++<<<<<<< HEAD
+msgstr "පසුබිමෙහි පà·à¶»à·à¶±à·Šà¶°à¶à·à·€"
+
+#: modules/gui/macosx/MainMenu.m:423
+msgid "Background Color"
+msgstr "පසුබිමෙහි වර්ණය"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:423
+ msgid "Background Color"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:425
msgid "Transparent"
@@@ -16579,7 -16584,7 +17250,11 @@@ msgid "Play another media synchronously
msgstr "සමකà·à¶½à·“නව වෙනà¶à·Š මà·à¶°à·Šâ€à¶ºà¶ºà¶šà·Š ධà·à·€à¶±à¶º කරන්න"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "à¶à·à¶»à¶±à·Šà¶±..."
@@@ -16740,7 -16745,7 +17415,11 @@@ msgstr "
#: modules/gui/macosx/open.m:361
msgid "Add Subtitle File:"
++<<<<<<< HEAD
+msgstr "උපසිරà·à·ƒà·’ ගොනුවක් එක් කරන්න:"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:366
msgid "Click to setup subtitle playback in full detail."
@@@ -16762,7 -16767,7 +17441,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "ෆොන්ට ප්â€à¶»à¶¸à·à¶«à¶º"
@@@ -16991,12 -16996,12 +17674,20 @@@ msgstr "පà·à¶»-දà¶à·Šà¶ සුà¶
msgid "VLC was unable to save the meta data."
msgstr "VLC හට පà·à¶»-දà¶à·Šà¶ සුරà·à¶šà·“මට නොහà·à¶šà·’ විය."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "අභිරුචීන්"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "සියල්ල යළි සකසන්න"
@@@ -17042,7 -17047,7 +17733,11 @@@ msgstr "
#: modules/gui/macosx/simple_prefs.m:277
msgid "Input & Codec Settings"
++<<<<<<< HEAD
+msgstr "ආදà·à¶± සහ කොඩෙක් à·ƒà·à¶šà·ƒà·”ම්"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/simple_prefs.m:311
msgid "General Audio"
@@@ -17173,129 -17178,125 +17868,238 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "පෙරනිමි ආකේà¶à¶šà¶º"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "දසුන් සිටුවම්"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "පෙරනිමි ආකේà¶à¶šà¶º"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "දසුන් සිටුවම්"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "අක්ෂර වර්ණය"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "අකුරුවර්ගය"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "උපසිරà·à·ƒà·’ භà·à·‚à·"
+
+#: modules/gui/macosx/simple_prefs.m:384
+#: modules/gui/qt4/ui/sprefs_subtitles.h:292
+msgid "Preferred subtitle language"
+msgstr "අභිමචඋපසිරà·à·ƒà·’ භà·à·‚à·à·€"
+
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "à¶à·’රමචදර්à·à¶±à¶º සබල කරන්න"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:292
+ msgid "Preferred subtitle language"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "à¶à·’රමචදර්à·à¶±à¶º සබල කරන්න"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "පà·à¶»à·à¶±à·Šà¶°à¶à·à·€à¶º"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "වීඩියà·à·€ පුන්à¶à·’ර ප්â€à¶»à¶šà·à¶»à¶ºà·šà¶¯à·“ කළුපà·à·„à· à¶à·’ර "
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "වීඩියà·à·€ පුන්à¶à·’ර ප්â€à¶»à¶šà·à¶»à¶ºà·šà¶¯à·“ කළුපà·à·„à· à¶à·’ර "
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "දසුන්"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "ප්â€à¶»à¶à·’දà·à¶± මොඩියුල "
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "වීඩිය෠සà·à¶«à¶»à·”à·€"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "à·†à·à¶½à·Šà¶©à¶»à¶º"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "à·„à·à¶©à·„ුරුව"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "උපසර්ගය"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "අනුක්â€à¶»à¶¸à·’ක අංක යොදන්න"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "ප්â€à¶»à¶à·’දà·à¶± මොඩියුල "
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "වීඩිය෠සà·à¶«à¶»à·”à·€"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "à·†à·à¶½à·Šà¶©à¶»à¶º"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "à·„à·à¶©à·„ුරුව"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "උපසර්ගය"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "අනුක්â€à¶»à¶¸à·’ක අංක යොදන්න"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "අඩුà¶à¶¸ නොපෙනී පà·à·€à¶à·“ම"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "අඩු නොපෙනී පà·à·€à¶à·“ම"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "ඉහළ නොපෙනී පà·à·€à¶à·“ම"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "ඉහළà¶à¶¸ නොපෙනී පà·à·€à¶à·“ම"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "අභිරුචි යළි සකසන්න"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17308,35 -17309,35 +18112,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "ඔබගේ වීඩිය෠සà·à¶«à¶»à·– සුරà·à¶šà·“ම සඳහ෠ෆà·à¶½à·Šà¶©à¶»à¶ºà¶šà·Š â€à¶à·à¶»à¶±à·Šà¶±."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "à¶à·à¶»à¶±à·Šà¶±"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "රෙකà·à¶©à·Š කළ ඩිරෙක්ටරිය à·„à· â€à¶œà·œà¶±à·” නà·à¶¸à¶º සුරක්â€à·‚ිචවන ස්ථà·à¶±à¶º "
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "ඔබගේ වීඩිය෠සà·à¶«à¶»à·– සුරà·à¶šà·“ම සඳහ෠ෆà·à¶½à·Šà¶©à¶»à¶ºà¶šà·Š â€à¶à·à¶»à¶±à·Šà¶±."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "à¶à·à¶»à¶±à·Šà¶±"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "රෙකà·à¶©à·Š කළ ඩිරෙක්ටරිය à·„à· â€à¶œà·œà¶±à·” නà·à¶¸à¶º සුරක්â€à·‚ිචවන ස්ථà·à¶±à¶º "
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "වලංගු නොවන සංකලනයකි"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "වලංගු නොවන සංකලනයකි"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -18285,7 -18286,7 +19119,11 @@@ msgstr " a, z à·à¶¶à
#: modules/gui/ncurses.c:892
msgid " m Mute"
++<<<<<<< HEAD
+msgstr " m නිහඬ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#. xgettext: You can use ↑ and ↓ characters
#: modules/gui/ncurses.c:894
@@@ -18332,7 -18333,7 +19170,11 @@@ msgstr " g à·€à¶à
#: modules/gui/ncurses.c:910
msgid " / Look for an item"
++<<<<<<< HEAD
+msgstr " / අයිà¶à¶¸à¶ºà¶šà·Š සඳහ෠බලන්න"
++=======
+ msgstr " / අයිà¶à¶¸à¶ºà¶šà·Š සඳහ෠බලන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:911
msgid " ; Look for the next item"
@@@ -18392,7 -18393,7 +19234,11 @@@ msgstr "[ලූපය]
#: modules/gui/ncurses.c:1061
#, c-format
msgid " Source : %s"
++<<<<<<< HEAD
+msgstr "මූලà·à·à·Šâ€à¶»à¶º : %s"
++=======
+ msgstr "මූලය : %s"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:1094
#, c-format
@@@ -18401,12 -18402,12 +19247,20 @@@ msgstr "ස්ථà·à¶±à¶º : %s/%s
#: modules/gui/ncurses.c:1099
msgid " Volume : Mute"
++<<<<<<< HEAD
+msgstr " à·à¶¶à·Šà¶¯à¶º : නිහඬ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:1100
#, c-format
msgid " Volume : %3ld%%"
++<<<<<<< HEAD
+msgstr " à·à¶¶à·Šà¶¯à¶º : %3ld%%"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:1100
msgid " Volume : ----"
@@@ -18424,7 -18425,7 +19278,11 @@@ msgstr "පරිච්ඡේදය
#: modules/gui/ncurses.c:1117
msgid " Source: <no current item> "
++<<<<<<< HEAD
+msgstr "මූලà·à·à·Šâ€à¶»à¶º: <à·€à¶à·Šà¶¸à¶±à·Š අයිà¶à¶¸ නà·à¶>"
++=======
+ msgstr " මූලය: <à·€à¶à·Šà¶¸à¶±à·Š අයිà¶à¶¸ නà·à¶>"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:1119
msgid " [ h for help ]"
@@@ -18771,7 -18772,7 +19629,11 @@@ msgstr "
#: modules/gui/qt4/components/info_panels.cpp:142
msgid "&Fingerprint"
++<<<<<<< HEAD
+msgstr "&ඇඟිලි සටහන"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/info_panels.cpp:143
msgid "Find meta data using audio fingerprinting"
@@@ -18842,7 -18843,7 +19704,11 @@@ msgstr "
#: modules/gui/qt4/components/info_panels.cpp:573
#: modules/gui/qt4/components/info_panels.cpp:575
msgid "frames"
++<<<<<<< HEAD
+msgstr "රà·à¶¸à·”"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/info_panels.cpp:574
#: modules/gui/qt4/components/info_panels.cpp:587
@@@ -19005,7 -19006,7 +19871,11 @@@ msgstr "
#: modules/gui/qt4/components/open_panels.cpp:1024
msgid "Device name"
++<<<<<<< HEAD
+msgstr "උපà·à¶‚ගයේ නම"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/open_panels.cpp:1084
msgid "Your display will be opened and played in order to stream or save it."
@@@ -19203,7 -19204,7 +20073,11 @@@ msgstr "යà¶à·”ර:
#: modules/gui/qt4/components/simple_preferences.cpp:228
#: modules/gui/qt4/components/simple_preferences.cpp:597
msgid "Input & Codecs Settings"
++<<<<<<< HEAD
+msgstr "ආදà·à¶± සහ කොඩෙක් à·ƒà·à¶šà·ƒà·”ම්"
++=======
+ msgstr "ආදà·à¶± සහ කොඩෙක් සිටුවම්"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:230
#: modules/gui/qt4/components/simple_preferences.cpp:884
@@@ -19232,7 -19233,7 +20106,11 @@@ msgstr "
#: modules/gui/qt4/components/simple_preferences.cpp:752
msgid "System's default"
++<<<<<<< HEAD
+msgstr "පද්ධà¶à·’යේ පෙරනිමිය"
++=======
+ msgstr "පද්ධà¶à·’යේ පෙරනිමිය "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:1242
msgid "File associations"
@@@ -19251,7 -19252,7 +20129,11 @@@ msgstr "ව්දෘà·à·Šâ€à¶º ගො
#: modules/gui/qt4/components/simple_preferences.cpp:1253
#: modules/gui/qt4/dialogs_provider.hpp:43
msgid "Playlist Files"
++<<<<<<< HEAD
+msgstr "à·€à·à¶¯à¶±à¶½à·à¶ºà·’ස්à¶à·” ගොනු"
++=======
+ msgstr "ධà·à·€à¶± ලà·à¶ºà·’ස්à¶à·” ගොනු"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:1305
msgid "&Apply"
@@@ -19278,28 -19279,28 +20160,52 @@@ msgstr "à¶à·à¶»à¶± ලද පà·à¶à·
#: modules/gui/qt4/components/sout/profile_selector.cpp:65
msgid "Delete selected profile"
++<<<<<<< HEAD
+msgstr "à¶à·à¶»à·à¶œà¶à·Š පà·à¶à·’කඩ මකන්න"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:70
+msgid "Create a new profile"
+msgstr "නව පà·à¶à·’කඩක් à¶à¶±à¶±à·Šà¶±"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ msgstr "à¶à·à¶»à¶± ලද පà·à¶à·’කඩ මක෠දමන්න"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:70
+ msgid "Create a new profile"
+ msgstr "නව පà·à¶à·’කඩක් සකස් කරන්න"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "à¶à¶±à¶±à·Šà¶±"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "පà·à¶à·’කඩ නà·à¶¸à¶º අස්ථà·à¶±à¶œà¶ වී ඇà¶"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
+msgid "You must set a name for the profile."
+msgstr "පà·à¶à·’කඩ සඳහ෠ඔබ විසින් නමක් ලබ෠දිය යුà¶à·”ය."
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "පà·à¶à·’කඩ නà·à¶¸à¶º අස්ථà·à¶±à¶œà¶ වී ඇà¶"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
+ msgid "You must set a name for the profile."
+ msgstr "පà·à¶à·’කඩ සඳහ෠ඔබ විසින් නà·à¶¸à¶ºà¶šà·Š ලබ෠දිය යුà¶à·”ය."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/sout/sout_widgets.cpp:40
msgid "File/Directory"
@@@ -19328,7 -19329,7 +20234,11 @@@ msgstr "
#: modules/gui/qt4/components/sout/sout_widgets.cpp:92
msgid "Filename"
++<<<<<<< HEAD
+msgstr "ගොනුනà·à¶¸à¶º"
++=======
+ msgstr "ගොනු නà·à¶¸à¶º"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/sout/sout_widgets.cpp:135
#: modules/gui/qt4/dialogs/convert.cpp:130
@@@ -19505,7 -19506,7 +20415,11 @@@ msgstr "
#: modules/gui/qt4/dialogs/firstrun.cpp:98
msgid "Automatically retrieve media info"
++<<<<<<< HEAD
+msgstr "මà·à¶°à·Šâ€à¶º à¶à·œà¶»à¶à·”රු ස්වයංක්â€à¶»à·“යව ලබà·à¶œà¶±à·Šà¶±"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:103
msgid "Regularly check for VLC updates"
@@@ -20206,11 -20207,11 +21120,19 @@@ msgstr "&දෘෂ්ඨිකල්ප
#: modules/gui/qt4/menus.cpp:637
msgid "Add &Subtitle File..."
++<<<<<<< HEAD
+msgstr "උපසිරà·à·ƒà·’ ගොනුවක් එක් කරන්න..."
+
+#: modules/gui/qt4/menus.cpp:639
+msgid "Sub &Track"
+msgstr "උපසිරුසි &පථය"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/menus.cpp:639
+ msgid "Sub &Track"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:662
msgid "Video &Track"
@@@ -22479,7 -22480,7 +23401,11 @@@ msgstr "
#: modules/stream_out/transcode/transcode.c:83
msgid "Audio encoder"
++<<<<<<< HEAD
+msgstr "à·à·Šâ€à¶»à·€à·Šâ€à¶º ආකේà¶à¶šà¶º"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:85
msgid ""
@@@ -22603,45 -22604,45 +23529,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "ෆොන්â€à¶§ ප්â€à¶»à¶¸à·à¶«à¶º පික්සෙල වලින්"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "ෆොන්â€à¶§ ප්â€à¶»à¶¸à·à¶«à¶º පික්සෙල වලින්"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22650,93 -22651,93 +23612,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "කුඩà·à¶¸"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "කුඩà·"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "විà·à·à¶½"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "විà·à·à¶½à¶à¶¸"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -22758,7 -22759,7 +23800,11 @@@ msgstr "
#: modules/text_renderer/svg.c:66
msgid "SVG template file"
++<<<<<<< HEAD
+msgstr "SVG à·ƒà·à¶šà·’ලි ගොනුව"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/svg.c:67
msgid ""
@@@ -22907,7 -22908,7 +23953,11 @@@ msgstr "
#: modules/video_filter/antiflicker.c:50
msgid "Window size"
++<<<<<<< HEAD
+msgstr "කවුළුවේ ප්â€à¶»à¶¸à·à¶«à¶º"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/antiflicker.c:51
msgid "Number of frames (0 to 100)"
@@@ -22947,7 -22948,7 +23997,11 @@@ msgstr "
#: modules/video_filter/atmo/atmo.cpp:134
msgid "Device type"
++<<<<<<< HEAD
+msgstr "උපà·à¶‚ගයේ වර්ගය"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:135
msgid ""
@@@ -22977,7 -22978,7 +24031,11 @@@ msgstr "MoMoLight
#: modules/video_filter/atmo/atmo.cpp:158
msgid "fnordlicht"
++<<<<<<< HEAD
+msgstr "fnordlicht"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:161
msgid "Count of AtmoLight channels"
@@@ -24289,7 -24290,7 +25347,11 @@@ msgstr "
#: modules/video_filter/marq.c:104
msgid "Text file"
++<<<<<<< HEAD
+msgstr "පෙළ ගොනුව"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:105
msgid "File to read the marquee text from."
@@@ -24969,7 -24970,7 +26031,11 @@@ msgstr "
#: modules/video_filter/puzzle.c:55
msgid "Game mode"
++<<<<<<< HEAD
+msgstr "ක්â€à¶»à·“ඩ෠ආකà·à¶»à¶º"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:56
msgid "Select game mode variation from jigsaw puzzle to sliding puzzle."
@@@ -24977,7 -24978,7 +26043,11 @@@ msgstr "
#: modules/video_filter/puzzle.c:57
msgid "Border"
++<<<<<<< HEAD
+msgstr "කඩඉම"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:58
msgid "Unshuffled Border width."
@@@ -24985,19 -24986,19 +26055,35 @@@ msgstr "
#: modules/video_filter/puzzle.c:59
msgid "Small preview"
++<<<<<<< HEAD
+msgstr "කුඩ෠පෙරදà·à¶šà·Šà¶¸"
+
+#: modules/video_filter/puzzle.c:60
+msgid "Show small preview."
+msgstr "කුඩ෠පෙරදà·à¶šà·Šà¶¸ පෙන්වන්න."
+
+#: modules/video_filter/puzzle.c:61
+msgid "Small preview size"
+msgstr "කුඩ෠පෙරදà·à¶šà·Šà¶¸à·š ප්â€à¶»à¶¸à·à¶«à¶º"
+
+#: modules/video_filter/puzzle.c:62
+msgid "Show small preview size (percent of source)."
+msgstr "කුඩ෠පෙරදà·à¶šà·Šà¶¸à·š ප්â€à¶»à¶¸à·à¶«à¶º පෙන්වන්න (මූලà·à·à·Šâ€à¶»à¶ºà·™à¶±à·Š ප්â€à¶»à¶à·’à·à¶à¶ºà¶šà·Š ලෙස)"
++=======
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:60
+ msgid "Show small preview."
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:61
+ msgid "Small preview size"
+ msgstr ""
+
+ #: modules/video_filter/puzzle.c:62
+ msgid "Show small preview size (percent of source)."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:63
msgid "Piece edge shape size"
@@@ -25009,7 -25010,7 +26095,11 @@@ msgstr "
#: modules/video_filter/puzzle.c:65
msgid "Auto shuffle"
++<<<<<<< HEAD
+msgstr "ස්වයං කලවම්"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:66
msgid "Auto shuffle delay during game"
@@@ -25061,7 -25062,7 +26151,11 @@@ msgstr "0/90/180/270
#: modules/video_filter/puzzle.c:75
msgid "0/90/180/270/mirror"
++<<<<<<< HEAD
+msgstr "0/90/180/270/ආදර්à·à¶º"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:83
msgid "Puzzle interactive game video filter"
@@@ -25085,15 -25086,15 +26179,27 @@@ msgstr "VNC කවුළුව
#: modules/video_filter/remoteosd.c:76
msgid "VNC port number."
++<<<<<<< HEAD
+msgstr "VNC කවුළු අංකය."
+
+#: modules/video_filter/remoteosd.c:78
+msgid "VNC Password"
+msgstr "VNC මුරපදය"
+
+#: modules/video_filter/remoteosd.c:80
+msgid "VNC password."
+msgstr "VNC මුරපදය"
++=======
+ msgstr ""
+
+ #: modules/video_filter/remoteosd.c:78
+ msgid "VNC Password"
+ msgstr ""
+
+ #: modules/video_filter/remoteosd.c:80
+ msgid "VNC password."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/remoteosd.c:82
msgid "VNC poll interval"
@@@ -25617,7 -25618,7 +26723,11 @@@ msgstr "
#: modules/video_output/decklink.cpp:69
msgid "Output card"
++<<<<<<< HEAD
+msgstr "ප්â€à¶»à¶à·’දà·à¶± කà·à¶©à·Šà¶´à¶"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:71
msgid "DeckLink output card, if multiple exist. The cards are numbered from 0."
@@@ -26159,11 -26160,11 +27269,19 @@@ msgstr "
#: modules/video_output/yuv.c:59
msgid "YUV output"
++<<<<<<< HEAD
+msgstr "YUV ප්â€à¶»à¶à·’දà·à¶±à¶º"
+
+#: modules/video_output/yuv.c:60
+msgid "YUV video output"
+msgstr "YUV විදෘà·à·Šâ€à¶º ප්â€à¶»à¶à·’දà·à¶±à¶º"
++=======
+ msgstr ""
+
+ #: modules/video_output/yuv.c:60
+ msgid "YUV video output"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/visualization/goom.c:45
msgid "Goom display width"
@@@ -26426,16 -26427,16 +27544,28 @@@ msgstr "MUX විකල්පයන්
#: share/lua/http/dialogs/create_stream.html:303
msgid "Video scale"
++<<<<<<< HEAD
+msgstr "වීඩිâ€à¶ºà· පරිමà·à¶«à¶º"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:330
#: share/lua/http/dialogs/create_stream.html:374
msgid "Output port"
++<<<<<<< HEAD
+msgstr "ප්â€à¶»à¶à·’දà·à¶± කවුළුව"
+
+#: share/lua/http/dialogs/create_stream.html:338
+msgid "Output\tfile"
+msgstr "ප්â€à¶»à¶à·’දà·à¶±\tගොනුව"
++=======
+ msgstr ""
+
+ #: share/lua/http/dialogs/create_stream.html:338
+ msgid "Output\tfile"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:355
msgid "Input media"
@@@ -26521,7 -26522,7 +27651,11 @@@ msgstr "ලූපනය කරන්න
#: share/lua/http/index.html:242
msgid "Empty Playlist"
++<<<<<<< HEAD
+msgstr "හිස් à·€à·à¶¯à¶±à¶½à·à¶ºà·’ස්à¶à·”à·€"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:243
msgid "Queue Selected"
@@@ -26591,7 -26592,7 +27725,11 @@@ msgstr "දෙබස්
#: modules/gui/qt4/ui/about.h:288 modules/gui/qt4/ui/about.h:289
msgid "Update"
++<<<<<<< HEAD
+msgstr "යà·à·€à¶à·Šà¶šà·à¶½à·“නය"
++=======
+ msgstr "යà·à·€à¶à·Šà¶šà·à¶½à·“න කරන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/equalizer.h:132 modules/gui/qt4/ui/open_disk.h:296
#: modules/gui/qt4/ui/open_net.h:96 modules/gui/qt4/ui/sprefs_audio.h:411
@@@ -26836,7 -26837,7 +27974,11 @@@ msgstr "මෙනු
#: modules/gui/qt4/ui/profiles.h:714
msgid "Same as source"
++<<<<<<< HEAD
+msgstr "මූලà·à·à·Šâ€à¶»à¶º ලෙසම"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:716
msgid " fps"
@@@ -26966,7 -26967,7 +28108,11 @@@ msgstr "පරිමà·à·€ ප්â€à¶»
#: modules/gui/qt4/ui/sprefs_audio.h:428
msgid "Preferred audio language:"
++<<<<<<< HEAD
+msgstr "අභිමචà·à·Šâ€à¶»à·€à·Šâ€à¶º භà·à·‚à·à·€:"
++=======
+ msgstr "වඩà·à¶à·Š කà·à¶¸à¶à·’ à·à·Šâ€à¶»à·€à·Šâ€à¶º භà·à·‚à·à·€:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:429
msgid "Password:"
@@@ -27022,7 -27023,7 +28168,11 @@@ msgstr "පලුදු වූ à·„à· à
#: modules/gui/qt4/ui/sprefs_input.h:355
msgid "HTTP proxy URL"
++<<<<<<< HEAD
+msgstr "HTTP පෙරකලà·à·ƒà·’ URL"
++=======
+ msgstr "HTTP ප්â€à¶»à·œà¶šà·Šà·ƒà·’ URL"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_input.h:356
msgid "HTTP (default)"
@@@ -27046,11 -27047,11 +28196,19 @@@ msgstr "මෙනු භà·à·‚à·à·€:
#: modules/gui/qt4/ui/sprefs_interface.h:515
msgid "Look and feel"
++<<<<<<< HEAD
+msgstr "පෙනුම සහ à·„à·à¶Ÿà·“ම"
+
+#: modules/gui/qt4/ui/sprefs_interface.h:516
+msgid "Use custom skin"
+msgstr "අභිමචඈඳුමක් භà·à·€à·’à¶à· කරන්න"
++=======
+ msgstr "පෙනුම සහ à·„à·à¶Ÿà·“ම්"
+
+ #: modules/gui/qt4/ui/sprefs_interface.h:516
+ msgid "Use custom skin"
+ msgstr "අභිමචඈඳුම් භà·à·€à·’à¶à· කරන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:518
msgid "This is VLC's default interface, with a native look and feel."
@@@ -27082,7 -27083,7 +28240,11 @@@ msgstr "අවම වූ දර්à·à¶
#: modules/gui/qt4/ui/sprefs_interface.h:526
msgid "Force window style:"
++<<<<<<< HEAD
+msgstr "බලà·à¶à·Šà¶¸à¶š කවුළු රටà·à·€:"
++=======
+ msgstr "කවුළු රට෠බලà·à¶à·Šà¶¸à¶š කරන්න:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:527
msgid "Integrate video in interface"
@@@ -27090,11 -27091,11 +28252,19 @@@ msgstr "වීඩියà·à·€ අà¶à·”
#: modules/gui/qt4/ui/sprefs_interface.h:528
msgid "Show systray icon"
++<<<<<<< HEAD
+msgstr "systray අයිකනය පෙන්වන්න"
+
+#: modules/gui/qt4/ui/sprefs_interface.h:529
+msgid "Skin resource file:"
+msgstr "ඈඳුම් සම්පà¶à·Š ගොනුව:"
++=======
+ msgstr "පද්ධà¶à·’ à¶à·à¶§à·’ අයිකනය පෙන්වන්න"
+
+ #: modules/gui/qt4/ui/sprefs_interface.h:529
+ msgid "Skin resource file:"
+ msgstr "ඈඳුම් (Skin) සම්පà¶à·Š ගොනුව:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:531
msgid "Playlist and Instances"
@@@ -27134,7 -27135,7 +28304,11 @@@ msgstr "යà·à·€à¶à·Šà¶šà·à¶½à·“න
#: modules/gui/qt4/ui/sprefs_interface.h:548
msgid "Operating System Integration"
++<<<<<<< HEAD
+msgstr "මෙහෙයුම් පද්ධà¶à·’ සංකලනය"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:549
msgid "File extensions association"
@@@ -27146,7 -27147,7 +28320,11 @@@ msgstr "VLC මගින් විවà·
#: modules/gui/qt4/ui/sprefs_subtitles.h:287
msgid "Enable On Screen Display (OSD)"
++<<<<<<< HEAD
+msgstr "à¶à·’ර මචදර්à·à¶±à¶º (OSD) සක්â€à¶»à·’ය කරන්න"
++=======
+ msgstr "à¶à·’ර මචදර්à·à¶±à¶º (OSD) සබල කරන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:288
msgid "Show media title on video start"
@@@ -27154,7 -27155,7 +28332,11 @@@ msgstr "වීඩියà·à·€ ආරම
#: modules/gui/qt4/ui/sprefs_subtitles.h:290
msgid "Enable subtitles"
++<<<<<<< HEAD
+msgstr "උපසිරුසි සක්â€à¶»à·’ය කරන්න"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:291
msgid "Subtitle Language"
@@@ -27170,11 -27171,11 +28352,19 @@@ msgstr "
#: modules/gui/qt4/ui/sprefs_subtitles.h:300
msgid "Add a shadow"
++<<<<<<< HEAD
+msgstr "සෙවණà·à¶½à·Šà¶½à¶šà·Š එක් කරන්න"
+
+#: modules/gui/qt4/ui/sprefs_subtitles.h:301
+msgid "Add a background"
+msgstr "පසුබිමක් එක් කරන්න"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:301
+ msgid "Add a background"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:303
#: modules/gui/qt4/ui/video_effects.h:1317
@@@ -27210,7 -27211,7 +28400,11 @@@ msgstr "Deinterlacing
#: modules/gui/qt4/ui/sprefs_video.h:355
msgid "Force Aspect Ratio"
++<<<<<<< HEAD
+msgstr "බලà·à¶à·Šà¶¸à¶š දර්à·à¶± අනුපà·à¶à¶º"
++=======
+ msgstr "දර්à·à¶± අනුපà·à¶à¶º බලà·à¶à·Šà¶¸à¶š කරන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:361
msgid "vlc-snap"
@@@ -27270,11 -27271,11 +28464,19 @@@ msgstr "ලà·à¶ºà·’ස්à¶à·”à·€ à·„
#: modules/gui/qt4/ui/update.h:148
msgid "Check for VLC updates"
++<<<<<<< HEAD
+msgstr "VLC යà·à·€à¶à·Šà¶šà·à¶½à·“නය සඳහ෠පරික්ෂ෠කරන්න"
+
+#: modules/gui/qt4/ui/update.h:149
+msgid "Launching an update request..."
+msgstr "යà·à·€à¶à·Šà¶šà·à¶½à·“න අයදුමක් දියà¶à·Š කරමින්..."
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/ui/update.h:149
+ msgid "Launching an update request..."
+ msgstr "යà·à·€à¶à·Šà¶šà·à¶½à·“නය සඳහ෠ඉල්ලීමක් කරමින්..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/update.h:150
msgid "Do you want to download it?"
@@@ -27356,7 -27357,7 +28558,11 @@@ msgstr "
#: modules/gui/qt4/ui/video_effects.h:1392
msgid "Soften"
++<<<<<<< HEAD
+msgstr "මෘදු කෙරූ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/video_effects.h:1396
msgid "Spatial blur"
@@@ -27376,7 -27377,7 +28582,11 @@@ msgstr "VLM වින්â€à¶ºà·à·ƒà¶š
#: modules/gui/qt4/ui/vlm.h:287
msgid "Media Manager Edition"
++<<<<<<< HEAD
+msgstr "මà·à¶°à·Šâ€à¶º කළමනà·à¶šà¶»à·” සංස්කරණය"
++=======
+ msgstr "මà·à¶°à·Šâ€à¶º කළමනà·à¶šà¶»à·” à·ƒà·à¶šà·ƒà·”ම"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:288
msgid "Name:"
@@@ -27418,6 -27419,9 +28628,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "මà·à¶°à·Šâ€à¶º කළමණà·à¶šà¶»à¶« ලà·à¶ºà·’ස්à¶à·”à·€"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "විස්à¶à¶» පෙන්වන්න"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Some options are available but hidden. Check \"Advanced options\" to see "
#~ "them."
@@@ -28095,6 -28099,9 +29311,12 @@@
#~ msgid "Add controls to the video window"
#~ msgstr "වීඩිය෠ආදà·à¶±à¶ºà·š අසමà¶à·à·€à¶º."
++<<<<<<< HEAD
++=======
+ #~ msgid "Input Settings not saved"
+ #~ msgstr "ආදà·à¶± සිටුවම් සුරක්â€à·‚ිචවී නà·à¶"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "On Screen Display/Subtitle Settings not saved"
#~ msgstr "à¶à·’රමචදර්à·à¶±/උපසිරà·à·ƒà·’ සිටුවම් සුරක්â€à·‚ිචවී නà·à¶"
@@@ -28188,16 -28195,8 +29410,21 @@@
#~ msgstr "දà·à¶±à·Š à·€à·à¶¯à¶±à¶º වන මà·à¶°à·Šâ€à¶ºà¶ºà·š හ෠ස්ට්â€à¶»à·’ම් à·€à·à¶¯à¶±à¶ºà·š සංඛ්â€à¶ºà·à¶± දà¶à·Šà¶"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "කොඩෙක් විස්à¶à¶»"
+
+#, fuzzy
+#~ msgid "Input Settings not saved"
+#~ msgstr "ආදà·à¶± සහ කොඩෙක් à·ƒà·à¶šà·ƒà·”ම්"
+
+#, fuzzy
+#~ msgid "Add a subtitle file"
+#~ msgstr "උපසිරà·à·ƒà·’ ගොනුවක් එක් කරන්න:"
++=======
+ #~ msgid "Add a subtitle file"
+ #~ msgstr "උපසිරà·à·ƒà·’ ගොනුව භà·à·€à·’à¶à· කරන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Subtitles/OSD"
@@@ -28498,7 -28497,7 +29725,11 @@@
#, fuzzy
#~ msgid "Input & Codec settings"
++<<<<<<< HEAD
+#~ msgstr "ආදà·à¶± සහ කොඩෙක් à·ƒà·à¶šà·ƒà·”ම්"
++=======
+ #~ msgstr "ආදà·à¶± සහ කොඩෙක් සිටුවම්"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Enable Audio"
@@@ -28514,7 -28513,7 +29745,11 @@@
#, fuzzy
#~ msgid "Preferred Subtitle Language"
++<<<<<<< HEAD
+#~ msgstr "අභිමචඋපසිරà·à·ƒà·’ භà·à·‚à·à·€"
++=======
+ #~ msgstr "වඩà·à¶à·Š කà·à¶¸à¶à·’ à·à·Šâ€à¶»à·€à·Šâ€à¶º භà·à·‚à·à·€"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Outline Color"
@@@ -28538,7 -28537,7 +29773,11 @@@
#, fuzzy
#~ msgid " [Audio Decoding]"
++<<<<<<< HEAD
+#~ msgstr "à·à·Šâ€à¶»à·€à·Šâ€à¶º ආකේà¶à¶šà¶º"
++=======
+ #~ msgstr "à·à·Šâ€à¶»à·€à·Šâ€à¶º à·ƒà·à¶šà·ƒà·”ම්"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid " [Streaming]"
@@@ -28562,11 -28561,11 +29801,19 @@@
#, fuzzy
#~ msgid "Enable spatializer"
++<<<<<<< HEAD
+#~ msgstr "උපසිරුසි සක්â€à¶»à·’ය කරන්න"
+
+#, fuzzy
+#~ msgid "Add to playlist"
+#~ msgstr "à·€à·à¶¯à¶±à¶½à·à¶ºà·’ස්à¶à·”වට එක් කරන්න"
++=======
+ #~ msgstr "අවකà·à·à·à¶ºà¶±à¶º"
+
+ #, fuzzy
+ #~ msgid "Add to playlist"
+ #~ msgstr "ධà·à·€à¶± ලà·à¶ºà·’ස්à¶à·”වට එක් කරන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Icon View"
@@@ -28598,11 -28597,11 +29845,19 @@@
#, fuzzy
#~ msgid "Compiler: "
++<<<<<<< HEAD
+#~ msgstr "සම්පà·à¶¯à¶šà¶º: %s\n"
+
+#, fuzzy
+#~ msgid "Copyright (C) "
+#~ msgstr "ප්â€à¶»à¶šà·à·à¶± අයිà¶à·’ය"
++=======
+ #~ msgstr "සම්පà·à¶¯à¶š: %s\n"
+
+ #, fuzzy
+ #~ msgid "Copyright (C) "
+ #~ msgstr "අයිà¶à·’ය"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "&Codec"
@@@ -28662,7 -28661,7 +29917,11 @@@
#, fuzzy
#~ msgid "Automatically add new medias to ML"
++<<<<<<< HEAD
+#~ msgstr "මà·à¶°à·Šâ€à¶º à¶à·œà¶»à¶à·”රු ස්වයංක්â€à¶»à·“යව ලබà·à¶œà¶±à·Šà¶±"
++=======
+ #~ msgstr "පිංà¶à·–රයේ පà·à·„à·à¶º ස්වයංව සීරුමà·à¶»à·” කරන්න."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "OSD configuration importer"
@@@ -28702,7 -28701,7 +29961,11 @@@
#, fuzzy
#~ msgid "Disable ES id"
++<<<<<<< HEAD
+#~ msgstr "අක්â€à¶»à·’ය කරන්න"
++=======
+ #~ msgstr "අක්â€à¶»à·’ය"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Enable ES id"
@@@ -28800,7 -28799,7 +30063,11 @@@
#, fuzzy
#~ msgid "Enable desktop mode "
++<<<<<<< HEAD
+#~ msgstr "මෘදුකà·à¶‚ග ක්â€à¶»à¶¸à¶º සක්â€à¶»à·’ය කරන්න"
++=======
+ #~ msgstr "බිà¶à·”පà¶à·Š ප්â€à¶»à¶šà·à¶»à¶º සබල කරන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Windows GAPI video output"
@@@ -28956,7 -28955,7 +30223,11 @@@
#, fuzzy
#~ msgid "Live Update"
++<<<<<<< HEAD
+#~ msgstr "යà·à·€à¶à·Šà¶šà·à¶½à·“නය"
++=======
+ #~ msgstr "යà·à·€à¶à·Šà¶šà·à¶½à·“න කරන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Display on &Desktop"
@@@ -29004,7 -29003,7 +30275,11 @@@
#, fuzzy
#~ msgid "Seek Time"
++<<<<<<< HEAD
+#~ msgstr "මà·à¶°à·Šâ€à¶ºà¶ºà·š කà·à¶½à¶º"
++=======
+ #~ msgstr "ආරම්භක කà·à¶½à¶º"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Graphical Equalizer"
@@@ -29048,7 -29047,7 +30323,11 @@@
#, fuzzy
#~ msgid "Create New Stream"
++<<<<<<< HEAD
+#~ msgstr "නව පà·à¶à·’කඩක් à¶à¶±à¶±à·Šà¶±"
++=======
+ #~ msgstr "නව පà·à¶à·’කඩක් සකස් කරන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Delete All Streams"
@@@ -29490,7 -29489,7 +30769,11 @@@
#, fuzzy
#~ msgid "Volume: %d%%"
++<<<<<<< HEAD
+#~ msgstr " à·à¶¶à·Šà¶¯à¶º : %3ld%%"
++=======
+ #~ msgstr "à·à¶¶à·Šà¶¯à¶º පහළට"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Keep current Equalizer settings"
@@@ -29518,7 -29517,7 +30801,11 @@@
#, fuzzy
#~ msgid "Add Folder to Playlist"
++<<<<<<< HEAD
+#~ msgstr "à·€à·à¶¯à¶±à¶½à·à¶ºà·’ස්à¶à·”වට එක් කරන්න"
++=======
+ #~ msgstr "ධà·à·€à¶± ලà·à¶ºà·’ස්à¶à·”වට එක් කරන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "1 item"
@@@ -29530,7 -29529,7 +30817,11 @@@
#, fuzzy
#~ msgid "Default Server Port"
++<<<<<<< HEAD
+#~ msgstr "පෙරනිමි ආම්පන්න"
++=======
+ #~ msgstr "පෙරනිමි ආම්පන්නය"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Interface Settings not saved"
@@@ -29606,7 -29605,7 +30897,11 @@@
#, fuzzy
#~ msgid "&Update"
++<<<<<<< HEAD
+#~ msgstr "යà·à·€à¶à·Šà¶šà·à¶½à·“නය"
++=======
+ #~ msgstr "යà·à·€à¶à·Šà¶šà·à¶½à·“න කරන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "XSPF playlist (*.xspf)"
@@@ -29683,7 -29682,7 +30978,11 @@@
#, fuzzy
#~ msgid "HD1000 video output"
++<<<<<<< HEAD
+#~ msgstr "YUV විදෘà·à·Šâ€à¶º ප්â€à¶»à¶à·’දà·à¶±à¶º"
++=======
+ #~ msgstr "විදෘà·à·Šâ€à¶º ප්â€à¶»à¶à·’දà·à¶±à¶º"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "OMAP framebuffer"
@@@ -29711,7 -29710,7 +31010,11 @@@
#, fuzzy
#~ msgid "SVGAlib video output"
++<<<<<<< HEAD
+#~ msgstr "YUV විදෘà·à·Šâ€à¶º ප්â€à¶»à¶à·’දà·à¶±à¶º"
++=======
+ #~ msgstr "විදෘà·à·Šâ€à¶º ප්â€à¶»à¶à·’දà·à¶±à¶º"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "More bands for the spectrum analyzer : 80 if enabled else 20."
@@@ -29783,7 -29782,7 +31086,11 @@@
#, fuzzy
#~ msgid "Random off"
++<<<<<<< HEAD
+#~ msgstr "අහඹු à·€à·à¶¯à¶±à¶º අක්â€à¶»à·’යයි"
++=======
+ #~ msgstr "අහඹු ධà·à·€à¶±à¶º වසන්න"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Advanced open..."
diff --combined po/sk.po
index 4af83c4,cda6785..8a8ecda
--- a/po/sk.po
+++ b/po/sk.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-10-27 13:16+0000\n"
"Last-Translator: mhikanik <mhikanik at users.sourceforge.net>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -140,7 -140,7 +144,11 @@@ msgstr "Rôzne nastavenia zvuku a modul
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -492,10 -492,10 +500,17 @@@ msgid "&About
msgstr "&O programe"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -534,17 -534,17 +549,29 @@@ msgid "Save...
msgstr "Uložiť..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Opakovať všetko"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Opakovať jedenkrát"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -652,7 -652,7 +679,11 @@@ msgstr "Bol dosiahnutý maximálny poÄ
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Zablokovať"
@@@ -1358,22 -1358,22 +1389,38 @@@ msgstr "Frekvencia snÃmok
msgid "Decoded format"
msgstr "Dekódovaný formát"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Zadaný vstup sa nedá otvoriť"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Zadaný vstup sa nedá otvoriť"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"Program VLC nemôže otvoriť adresu MRL '%s'. Podrobnejšie informácie nájdete "
"v súbore so záznamom."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "Program nedokáže rozpoznať vstupný formát"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "Program nedokáže rozpoznať vstupný formát"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1813,7 -1813,7 +1860,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1903,7 -1903,7 +1954,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Žiaden"
@@@ -1934,7 -1934,7 +1989,11 @@@ msgstr "
"Toto je metóda výstupu videa v programe VLC. V predvolenom nastavenà si "
"program vždy automaticky vyberie najlepšiu dostupnú metódu."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Zapnúť video"
@@@ -2143,7 -2143,7 +2202,11 @@@ msgstr "
"tejto voľby v predvolenom nastavenÃ."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Zostať vždy navrchu"
@@@ -2200,7 -2200,7 +2263,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2209,7 -2209,7 +2276,11 @@@ msgstr "Odstrániť prekladanie
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Režim pre odstránenie prekladania (deinterlacing)"
@@@ -2269,7 -2269,7 +2340,11 @@@ msgstr "
"Zablokuje sa spúšťanie schémy napájania poÄas prehrávania, Äo zabráni "
"vypnutiu poÄÃtaÄa z dôvodu neÄinnosti."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Dekorácie okna"
@@@ -2477,7 -2477,7 +2552,11 @@@ msgstr "
"tvare Å¡tvorca (1:1). Ak ale máte naprÃklad monitor so stranovým pomerom "
"16:9, je potrebné zmeniť pomer na hodnotu 4:3, aby boli dodržané proporcie."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "PreskakovaÅ¥ snÃmky"
@@@ -2632,12 -2632,12 +2711,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2645,7 -2645,7 +2733,11 @@@ msgid "Default
msgstr "Predvolený"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -3000,7 -3000,7 +3092,11 @@@ msgid "You can completely disable the s
msgstr "Tu môžete kompletne vypnúť spracovávanie pod-obrázkov."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3967,7 -3967,7 +4063,11 @@@ msgstr "
"V tejto Äasti si môžete nastaviÅ¥ svoje vlastné \"klávesové skratky\" "
"programu VLC."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignorovať"
@@@ -3993,8 -3993,8 +4093,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4081,10 -4081,10 +4186,17 @@@ msgid "Slower (fine)
msgstr "Pomalšie (presnejšie)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4099,10 -4099,10 +4211,17 @@@ msgstr "
"zaradený v playliste"
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Dozadu"
@@@ -4113,9 -4113,9 +4232,15 @@@ msgstr "
"Vyberte si klávesu, ktorú chcete použÃvaÅ¥ pre návrat k predchádzajúcemu "
"súboru v playliste"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4371,9 -4371,9 +4496,15 @@@ msgid "Select the key to decrease audi
msgstr "Vyberte si klávesu pre znÞenie hlasitosti zvuku."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Stlmiť"
@@@ -4804,7 -4804,7 +4935,11 @@@ msgstr "Cyklicky prechádzať po dostup
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "SnÃmka"
@@@ -5013,12 -5013,12 +5148,21 @@@ msgstr "Prebieha sťahovanie ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Zrušiť"
@@@ -5783,7 -5783,7 +5927,11 @@@ msgstr "Orezať
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Stranový pomer"
@@@ -8302,7 -8302,7 +8450,11 @@@ msgstr "Obrazový vstup
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Obrazovka"
@@@ -9058,7 -9058,7 +9210,11 @@@ msgstr "Max. hlasitosť #
msgid "Volume Set"
msgstr "Nastavenie hlasitosti"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10250,7 -10250,7 +10406,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "Zvukový výstup ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Nesprávny výstup zvuku"
@@@ -10283,7 -10283,7 +10443,11 @@@ msgstr "Zvukový výstup AudioQueue (iO
msgid "Android AudioTrack audio output"
msgstr "Zvukový výstup Android AudioTrack"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "Výstup AudioUnit pre iOS"
@@@ -10291,20 -10291,20 +10455,36 @@@
msgid "Last audio device"
msgstr "Posledné zvukové zariadenie"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Výstup HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Výstup HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr "Vybrané zariadenie pre výstup zvuku momentálne použÃva iný program. "
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Zvukové zariadenie nie je nakonfigurované"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Zvukové zariadenie nie je nakonfigurované"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10313,11 -10313,11 +10493,19 @@@ msgstr "
"\"Nastavenia zvukov Midi\" v Äasti /Aplikácie/Pomocné programy. VLC použije "
"iba výstup stereo."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Systémové zariadenie pre výstup zvuku"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Systémové zariadenie pre výstup zvuku"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (kódovaný výstup)"
@@@ -11621,46 -11621,46 +11809,74 @@@ msgstr "Tieň
msgid "Outline"
msgstr "PodÄiarknuté"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "ÄŒierna"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Šedá"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Strieborná"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Biela"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Tmavohnedá"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Červená"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11668,61 -11668,61 +11884,97 @@@ msgid "Fuchsia
msgstr "Staro-ružová"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Žltá"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Olivovo-zelená"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Zelená"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "ÄŒajovnÃková zelená"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Citrusová"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Ružová"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "NámornÃcka modrá"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Modrá"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11877,7 -11877,7 +12129,11 @@@ msgstr "Titulky (pokroÄilé)
msgid "Subtitle renderers using libass"
msgstr "VykresľovaÄe titulkov s použitÃm libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Vytváranie vyrovnávacej pamäti pre pÃsmo"
@@@ -13916,10 -13916,10 +14172,17 @@@ msgid "Fast
msgstr "Rýchlo"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normálne"
@@@ -14030,8 -14030,8 +14293,13 @@@ msgid "D-Bus control interface
msgstr "Ovládacie rozhranie D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14386,9 -14386,9 +14654,15 @@@ msgstr "Inicializácia
msgid "Opening"
msgstr "Otváranie"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pozastaviť"
@@@ -16353,7 -16353,7 +16627,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Demuxér transportných streamov MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -16541,7 -16541,7 +16819,11 @@@ msgid "VLC media player Help
msgstr "PomocnÃk programu VLC media player"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Index"
@@@ -16629,9 -16629,9 +16911,15 @@@ msgstr "Zadajte názov pre nový profil
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Uložiť"
@@@ -16777,7 -16777,7 +17065,11 @@@ msgstr "
"Aby fungovali záložky, musà byÅ¥ spustené alebo doÄasne pozastavené "
"prehrávanie dátového toku."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "PreskoÄiÅ¥ na Äas"
@@@ -16797,7 -16797,7 +17089,11 @@@ msgstr "Na prehrávanie alebo pozastave
msgid "Backward"
msgstr "Dozadu"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16809,7 -16809,7 +17105,11 @@@ msgstr "
msgid "Forward"
msgstr "Dopredu"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16834,23 -16834,15 +17134,35 @@@ msgid "Click to enable fullscreen vide
msgstr ""
"Pre zapnutie prehrávania videa v celoobrazovkovom režime, kliknite sem."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "KliknutÃm a podržanÃm preskoÄÃte v aktuálnom médiu smerom dozadu."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "KliknutÃm a podržanÃm preskoÄÃte v aktuálnom médiu smerom dopredu."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Kliknite pre zastavenie prehrávania"
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Zobraziť/skryť playlist"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Kliknite pre zastavenie prehrávania"
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Zobraziť/skryť playlist"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -16858,12 -16850,12 +17170,20 @@@ msgstr "
"KliknutÃm prepnete medzi výstupom s videom a playlistom. Ak nie je zobrazené "
"žiadne video v hlavnom okne, môžete skryť playlist."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Zopakovať"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -16871,15 -16863,15 +17191,27 @@@ msgstr "
"KliknutÃm môžete zmeniÅ¥ režim opakovania. Sú dostupné 3 režimy: opakovaÅ¥ "
"jednu položku, opakovať všetko a vypnuté."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Náhodne"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "Kliknite pre zapnutie alebo vypnutie náhodného prehraávania."
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Náhodne"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "Kliknite pre zapnutie alebo vypnutie náhodného prehraávania."
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -16887,24 -16879,24 +17219,44 @@@ msgstr "
"KliknutÃm a pohybovanÃm myÅ¡ou so stlaÄeným tlaÄidlom môžete meniÅ¥ hlasitosÅ¥, "
"pomocou posuvnÃka. "
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Kliknite pre stlmenie/spustenie zvuku."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Plná hlasitosť"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "KliknutÃm môžete prehrávaÅ¥ zvuk s použitÃm maximálnej hlasitosti."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Kliknite pre stlmenie/spustenie zvuku."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Plná hlasitosť"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "KliknutÃm môžete prehrávaÅ¥ zvuk s použitÃm maximálnej hlasitosti."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efekty"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -16912,14 -16904,22 +17264,33 @@@ msgstr "
"KliknutÃm zobrazÃte panel pre zvukové efekty s ekvalizérom a ÄalÅ¡Ãmi "
"filtrami."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Kliknite pre prechod na predchádzajúcu položku v playliste."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Kliknite pre prechod na nasledujúcu položku v playliste."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Kliknite pre prechod na predchádzajúcu položku v playliste."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Kliknite pre prechod na nasledujúcu položku v playliste."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "KliknutÃm a podržanÃm preskoÄÃte v aktuálnom médiu smerom dozadu."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "KliknutÃm a podržanÃm preskoÄÃte v aktuálnom médiu smerom dopredu."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Konvertovať & Streamovať"
@@@ -16955,7 -16955,7 +17326,11 @@@ msgstr "Vyberte umiestnenie výstupu
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17144,8 -17144,8 +17519,13 @@@ msgid "A SDP export is requested, but n
msgstr "Je požadovaný SDP export, nie je však poskytnutá žiadna adresa URL."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Prispôsobiť"
@@@ -17249,37 -17249,37 +17629,69 @@@ msgstr "
msgid "Don't ask again"
msgstr "Už sa viac nepýtať"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "Prehrávanie VLC media"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Nenašiel sa žiaden záznam o havárii programu"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "Prehrávanie VLC media"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Nenašiel sa žiaden záznam o havárii programu"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "PokraÄovaÅ¥"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
++=======
+ #: modules/gui/macosx/intf.m:1877
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Couldn't find any trace of a previous crash."
msgstr ""
"Nemožno nájsÅ¥ žiadnu stopu svedÄiacu o predÄasnom ukonÄenà / chybe programu."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Odstrániť staršie nastavenia?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Našla sa staršia verzia nastavenà programu VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Presunúť do koša a reštartovať program VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Odstrániť staršie nastavenia?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Našla sa staršia verzia nastavenà programu VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Presunúť do koša a reštartovať program VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "Záznam pre ladenie VLC (%s).rtf"
@@@ -17461,7 -17461,7 +17873,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr "Táto voľba povolà zmenu kony rozhrania pri rôznych prÃležitostiach."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Uzamknúť stranový pomer"
@@@ -17593,7 -17593,7 +18009,11 @@@ msgstr "Skryť VLC
msgid "Hide Others"
msgstr "Skryť iné"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Zobraziť všetko"
@@@ -17678,15 -17678,15 +18098,27 @@@ msgstr "Synchronizácia stopy
msgid "A→B Loop"
msgstr "SluÄka A→B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "UkonÄiÅ¥ po prehranÃ"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Krok vpred"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "UkonÄiÅ¥ po prehranÃ"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Krok vpred"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Krok dozadu"
@@@ -17702,30 -17702,30 +18134,56 @@@ msgstr "ZnÞiť hlasitosť
msgid "Audio Device"
msgstr "Zvukové zariadenie"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "PoloviÄná veľkosÅ¥"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Normálna veľkosť"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dvojnásobná veľkosť"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Roztiahnuť na veľkosť obrazovky"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "PoloviÄná veľkosÅ¥"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Normálna veľkosť"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dvojnásobná veľkosť"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Roztiahnuť na veľkosť obrazovky"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Plávať navrchu"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Celoobrazovkové video-zariadenie"
@@@ -17734,7 -17734,7 +18192,11 @@@
msgid "Post processing"
msgstr "DodatoÄné spracovávanie"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Pridať súbor s titulkami..."
@@@ -17974,7 -17974,7 +18436,11 @@@ msgid "Play another media synchronously
msgstr "Prehrávať iné médium synchronizovane"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Vybrať..."
@@@ -18162,7 -18162,7 +18628,11 @@@ msgstr "FPS (poÄet snÃmok za sekundu)
msgid "Subtitle encoding"
msgstr "Kódovanie titulkov"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "VeľkosÅ¥ pÃsma"
@@@ -18391,12 -18391,12 +18861,20 @@@ msgstr "Chyba poÄas ukladania metadát
msgid "VLC was unable to save the meta data."
msgstr "Program VLC nemohol uložiť metadáta."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Nastavenia"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Obnoviť všetko"
@@@ -18575,130 -18575,125 +19053,238 @@@ msgstr "Zapnúť notifikácie Growl (pr
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "PozastaviÅ¥ iTunes poÄas prehrávania VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Predvolené kódovanie"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Nastavenia zobrazovania"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Predvolené kódovanie"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Nastavenia zobrazovania"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Farba pÃsma"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "PÃsmo"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Jazyky titulkov"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Jazyky titulkov"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Preferovaný jazyk titulkov"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Aktivovať OSD ovládanie"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Aktivovať OSD ovládanie"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Nepriehľadnosť"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "VynútiÅ¥ si tuÄné"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "VynútiÅ¥ si tuÄné"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Farba kontúr"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Hrúbka kontúry"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Čierne obrazovky pri celoobr. režime"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Čierne obrazovky pri celoobr. režime"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Zobraziť"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Výstupný modul"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "SnÃmky z videa"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "PrieÄinok"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Formát"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Koncovka"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "SekvenÄné ÄÃslovanie"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Posledná kontrola: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Zatiaľ ešte nebola vykonaná žiadna kontrola."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Výstupný modul"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "SnÃmky z videa"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "PrieÄinok"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Formát"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Koncovka"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "SekvenÄné ÄÃslovanie"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Posledná kontrola: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Zatiaľ ešte nebola vykonaná žiadna kontrola."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Najnižšia latencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "NÃzka latencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Vysoká latencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Najvyššia latencia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Obnoviť nastavenia"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18721,20 -18716,20 +19307,37 @@@ msgstr "
"\n"
"Naozaj chcete pokraÄovaÅ¥?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Tu si zvoľte prieÄinok, do ktorého sa uložia snÃmky z videa."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Vybrať"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Vyberte prieÄinok alebo názov súboru, do ktorého sa uložia nahrávky."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Tu si zvoľte prieÄinok, do ktorého sa uložia snÃmky z videa."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Vybrať"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Vyberte prieÄinok alebo názov súboru, do ktorého sa uložia nahrávky."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18742,17 -18737,17 +19345,30 @@@ msgstr "
"StlaÄte novú klávesovú skratku pre\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Neplatná kombinácia"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Neplatná kombinácia"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"PrepáÄte, tieto klávesy nemožno použiÅ¥ na vytvorenie klávesovej skratky."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Takúto kombináciu už použÃva \"%@\"."
@@@ -20865,20 -20860,20 +21481,36 @@@ msgstr "Vymazať vybraný profil
msgid "Create a new profile"
msgstr "Vytvoriť nový profil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Vytvoriť"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "Tento muxér nie je poskytovaný v rámci VLC: možno nie je prÃtomný."
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Chýbajúci názov profilu"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr "Tento muxér nie je poskytovaný v rámci VLC: možno nie je prÃtomný."
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Chýbajúci názov profilu"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "MusÃte zadaÅ¥ názov profilu."
@@@ -24466,23 -24461,23 +25098,43 @@@ msgstr "Prekódovať výstup streamu
msgid "Overlays/Subtitles"
msgstr "Prekrývanie/Titulky"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Font Monospace"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Rodina pÃsiem pre pÃsmo, ktoré chcete použiÅ¥"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Súbor s pÃsmom pre pÃsmo, ktoré chcete použiÅ¥"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "VeľkosÅ¥ pÃsma v pixeloch"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Font Monospace"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Rodina pÃsiem pre pÃsmo, ktoré chcete použiÅ¥"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Súbor s pÃsmom pre pÃsmo, ktoré chcete použiÅ¥"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "VeľkosÅ¥ pÃsma v pixeloch"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24492,11 -24487,11 +25144,19 @@@ msgstr "
"nastavÃte hodnotu inú ako 0, toto nastavenie nebude reÅ¡pektovaÅ¥ relatÃvnu "
"veľkosÅ¥ pÃsma."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Nepriehľadnosť textu"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Nepriehľadnosť textu"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24504,12 -24499,12 +25164,20 @@@ msgstr "
"Nepriehľadnosť (opak efektu priehľadnosti) textu, ktorý sa vykreslà vo "
"vnútri videa. 0 = priehľadný text, 255 = úplne nepriehľadný text."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Predvolená farba textu"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24523,12 -24518,12 +25191,20 @@@ msgstr "
"#FF0000 = Äervená farba, #00FF00 = zelená farba, #FFFF00 = žltá farba "
"(Äervená a zelená), #FFFFFF = biela farba."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "RelatÃvna veľkosÅ¥ pÃsma"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24538,59 -24533,59 +25214,111 @@@ msgstr "
"nastavená absolútna veľkosÅ¥ pÃsma, na relatÃvnu veľkosÅ¥ program neberie "
"ohľad."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Nepriehľadnosť pozadia"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Farba pozadia"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Nepriehľadnosť kontúr"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Nepriehľadnosť tieňa"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Farba tieňa"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Uhol tieňa"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Vzdialenosť tieňa"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Nepriehľadnosť pozadia"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Farba pozadia"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Nepriehľadnosť kontúr"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Nepriehľadnosť tieňa"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Farba tieňa"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Uhol tieňa"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Vzdialenosť tieňa"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Menšie"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Malé"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Veľké"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "VäÄÅ¡ie"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Použiť vykresľovanie YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Použiť vykresľovanie YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24599,23 -24594,23 +25327,43 @@@ msgstr "
"YUV. Takéto vykresľovanie je vÅ¡ak potrebné len v prÃpade, že chcete kódovaÅ¥ "
"aj titulky v DVB-streame."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Tenká"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Hrubá"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "VykresľovaÄ textov"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "VykresľovaÄ pÃsma Freetype 2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Tenká"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Hrubá"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "VykresľovaÄ textov"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "VykresľovaÄ pÃsma Freetype 2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/sl.po
index 874a61f,22bbf30..17d7051
--- a/po/sl.po
+++ b/po/sl.po
@@@ -10,8 -10,8 +10,13 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-12-03 19:50+0000\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-11-09 20:16+0000\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Last-Translator: Martin Srebotnjak <miles at filmsi.net>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/vlc-trans/"
"language/sl/)\n"
@@@ -141,7 -141,7 +146,11 @@@ msgstr "RazliÄne nastavitve zvoka in m
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -490,10 -490,10 +499,17 @@@ msgid "&About
msgstr "&O programu"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -532,17 -532,17 +548,29 @@@ msgid "Save...
msgstr "Shrani ..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Ponovi vse"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Ponovi izbrano"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -648,7 -648,7 +676,11 @@@ msgstr "Doseženo je najveÄje dovoljen
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "OnemogoÄi"
@@@ -1348,21 -1348,21 +1380,37 @@@ msgstr "Hitrost sliÄic
msgid "Decoded format"
msgstr "Odkodiran zapis"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Vnosa ni mogoÄe odpreti"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Vnosa ni mogoÄe odpreti"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"Ni mogoÄe odpreti MRL '%s'. Podrobnosti so zabeležene v dnevniÅ¡ki datoteki."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "Neprepoznavna oblika vnosa"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "Neprepoznavna oblika vnosa"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1793,7 -1793,7 +1841,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1881,7 -1881,7 +1933,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Noben"
@@@ -1911,7 -1911,7 +1967,11 @@@ msgstr "
"Nastavitev predstavlja naÄin slikovnega izhoda, ki ga uporablja VLC. "
"Privzeto delovanje je samodeja izbira najboljÅ¡ega razpoložljivega naÄina."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "OmogoÄi sliko"
@@@ -2117,7 -2117,7 +2177,11 @@@ msgstr "
"privzeto."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Vedno na vrhu"
@@@ -2170,7 -2170,7 +2234,11 @@@ msgstr "Skrij kazalnik in nadzornik zas
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2179,7 -2179,7 +2247,11 @@@ msgstr "Razpletanje
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Razpleteni naÄin"
@@@ -2237,7 -2237,7 +2309,11 @@@ msgstr "
"OnemogoÄi delovanje upravljalnika napajanja med predvajanjem in s tem "
"prepreÄi zaustavitev zaradi nedejavnosti."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Prikazovanje oken"
@@@ -2437,7 -2437,7 +2513,11 @@@ msgstr "
"(1:1). Če imate 16:9 zaslon, morate spremeniti vrednost na 4:3 da obdržite "
"sorazmerje."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "PreskoÄi sliÄice"
@@@ -2580,12 -2580,12 +2660,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2593,7 -2593,7 +2682,11 @@@ msgid "Default
msgstr "Privzeto"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2928,7 -2928,7 +3021,11 @@@ msgid "You can completely disable the s
msgstr "Možnost omogoÄa popolno onemogoÄanje obdelave pod-slik."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3829,7 -3829,7 +3926,11 @@@ msgstr "
"Nastavitve predstavljajo sploÅ¡na doloÄila tipkovnih povezav imenovanih "
"\"hitre tipke\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Prezri"
@@@ -3853,8 -3853,8 +3954,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3936,10 -3936,10 +4042,17 @@@ msgid "Slower (fine)
msgstr "PoÄasneje (postopno)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3952,10 -3952,10 +4065,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Izbor hitre tipke za skok na naslednji predmet na seznamu predvajanja."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Predhodni"
@@@ -3964,9 -3964,9 +4084,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "Izbor hitre tipke za skok na predhodni predmet na seznamu predvajanja."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4201,9 -4201,9 +4327,15 @@@ msgid "Select the key to decrease audi
msgstr "Izbor tipkovne bližnjice za zmanjšanje glasnosti."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Utišaj"
@@@ -4617,7 -4617,7 +4749,11 @@@ msgstr "Kroži med razpoložljivimi zvo
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Zajem slike"
@@@ -4824,12 -4824,12 +4960,21 @@@ msgstr "Prejemanje ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "PrekliÄi"
@@@ -5596,7 -5596,7 +5741,11 @@@ msgstr "Obreži
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Razmerje velikosti"
@@@ -7982,7 -7982,7 +8131,11 @@@ msgstr "Zaslonski dovod
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Zaslon"
@@@ -8722,7 -8722,7 +8875,11 @@@ msgstr "NajveÄja glasnost #
msgid "Volume Set"
msgstr "Nabor glasnosti"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9867,7 -9867,7 +10024,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "ALSA odvod zvoka"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Napaka odvoda zvoka"
@@@ -9898,7 -9898,7 +10059,11 @@@ msgstr "ZvoÄni odvod AudioQueue (iOS
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9906,30 -9906,30 +10071,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit prikaz"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit prikaz"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr "Izbrano z ime zvokovne napraveo napravo uporablja nek drug program."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Zvokovna naprava ni nastavljena"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Zvokovna naprava ni nastavljena"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (kodiran odvod)"
@@@ -11165,46 -11165,46 +11354,74 @@@ msgstr "Senca
msgid "Outline"
msgstr "Oris"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "ÄŒrna"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Siva"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Srebrna"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Bela"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Kostanjeva"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "RdeÄa"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11212,61 -11212,61 +11429,97 @@@ msgid "Fuchsia
msgstr "Fuksija"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Rumena"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Olivna"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Zelena"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Modrozelena"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Rumeno-zelena"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Å krlatna"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Mornarska"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Modra"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11414,7 -11414,7 +11667,11 @@@ msgstr "Podnapisi (napredno)
msgid "Subtitle renderers using libass"
msgstr "Izris podnapisov s knjižnico libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Izgradnja predpomnilnika pisav"
@@@ -11931,7 -11931,7 +12188,11 @@@ msgstr "
#: modules/codec/schroedinger.c:327
msgid "Force Profile"
++<<<<<<< HEAD
+msgstr "Vsili profil"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:339
msgid "VC2 Low Delay Profile"
@@@ -13324,10 -13324,10 +13585,17 @@@ msgid "Fast
msgstr "Hitro"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "ObiÄajno"
@@@ -13435,8 -13435,8 +13703,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus nadzorni vmesnik"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13785,9 -13785,9 +14058,15 @@@ msgstr "ZaÄenjanje
msgid "Opening"
msgstr "Odpiranje"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Premor"
@@@ -15704,7 -15704,7 +15983,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG Transport Stream odvijalnik"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletekst"
@@@ -15883,7 -15883,7 +16166,11 @@@ msgid "VLC media player Help
msgstr "PomoÄ za predvajalnik VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Kazalo"
@@@ -15971,9 -15971,9 +16258,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Shrani"
@@@ -16118,7 -16118,7 +16411,11 @@@ msgstr "
"Pretok mora biti v predvajanju ali pa mora biti v premoru za delovanje "
"zaznamkov."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "SkoÄi na Äas"
@@@ -16138,7 -16138,7 +16435,11 @@@ msgstr "
msgid "Backward"
msgstr "Nazaj"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16148,7 -16148,7 +16449,11 @@@ msgstr "
msgid "Forward"
msgstr "Naprej"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16168,84 -16168,84 +16473,155 @@@ msgstr "Preklopi celozaslonski naÄin
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Skrij/Pokaži seznam predvajanja"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Skrij/Pokaži seznam predvajanja"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Ponavljanje"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Premešaj"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Premešaj"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Polna glasnost"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Polna glasnost"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "UÄinki"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -16281,7 -16281,7 +16657,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16466,8 -16466,8 +16846,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Po meri"
@@@ -16568,36 -16568,36 +16953,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "Ne vpraÅ¡aj veÄ"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Ni mogoÄe najti dnevnika napak."
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Ni mogoÄe najti dnevnika napak."
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Nadaljuj"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Ni mogoÄe najti znakov predhodnega sesutja programa."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Ali naj se poÄistijo stare možnosti?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Zaznana je starejÅ¡a razliÄica nastavitvenih datotek predvajalnika VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Premakni v smeti in ponovno zaženi VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Ni mogoÄe najti znakov predhodnega sesutja programa."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Ali naj se poÄistijo stare možnosti?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Zaznana je starejÅ¡a razliÄica nastavitvenih datotek predvajalnika VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Premakni v smeti in ponovno zaženi VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16760,7 -16760,7 +17177,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Ohrani razmerje velikosti"
@@@ -16889,7 -16889,7 +17310,11 @@@ msgstr "Skrij VLC
msgid "Hide Others"
msgstr "Skrij ostalo"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Prikaz vsega"
@@@ -16974,15 -16974,15 +17399,27 @@@ msgstr "Sinhronost sledi
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "KonÄaj po predvajanju"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Korak naprej"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "KonÄaj po predvajanju"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Korak naprej"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Korak nazaj"
@@@ -16998,30 -16998,30 +17435,56 @@@ msgstr "Zmanjšaj glasnost
msgid "Audio Device"
msgstr "Zvokovna naprava"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "PoloviÄna velikost"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "ObiÄajna velikost"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dvojna velikost"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Prilagodi zaslonu"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "PoloviÄna velikost"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "ObiÄajna velikost"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dvojna velikost"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Prilagodi zaslonu"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Plavaj v ospredju"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Slikovna celozaslonska naprava"
@@@ -17030,7 -17030,7 +17493,11 @@@
msgid "Post processing"
msgstr "Post obdelava"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Dodaj datoteko s podnapisi..."
@@@ -17258,7 -17258,7 +17725,11 @@@ msgid "Play another media synchronously
msgstr "Dodatno predstavno datoteko predvajaj usklajeno"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Izberite ..."
@@@ -17440,7 -17440,7 +17911,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Velikost pisave"
@@@ -17669,12 -17669,12 +18144,20 @@@ msgstr "Napaka med shranjevanjem metapo
msgid "VLC was unable to save the meta data."
msgstr "Ni mogoÄe shraniti metapodatkov."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Možnosti"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "PoÄisti vse"
@@@ -17853,129 -17853,125 +18336,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Privzet nabor znakov"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Nastavitve zaslona"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Privzet nabor znakov"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Nastavitve zaslona"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Barva pisave"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Pisava"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Jeziki podnapisov"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Jeziki podnapisov"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Prednostni jezik podnapisov"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OmogoÄi OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OmogoÄi OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Raven prekrivnosti"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Barva obrisa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Debelina orisa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "ÄŒrno celozaslonsko ozadje"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "ÄŒrno celozaslonsko ozadje"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Zaslon"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Odvodne enote"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Slikovni zajem"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Mapa"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Zapis"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Predpona"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Zaporedno oÅ¡tevilÄenje"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Preverjanje Å¡e ni bilo izvedeno."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Odvodne enote"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Slikovni zajem"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Mapa"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Zapis"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Predpona"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Zaporedno oÅ¡tevilÄenje"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Preverjanje Å¡e ni bilo izvedeno."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Najnižja prikritost"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Nizka prikritost"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Visoka prikritost"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Višja prikritost"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "PoÄisti možnosti"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17988,20 -17984,20 +18579,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Izberite mapo za shranjevanje zajetih posnetkov."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Izbor"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Izberite mapo za shranjevanje zajetih posnetkov."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Izbor"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18009,16 -18005,16 +18617,29 @@@ msgstr "
"Pritisnite novo tipko za\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Neveljaven izbor"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Na žalost teh tipk ni mogoÄe prilagoditi v tipkovne bližnjice."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Neveljaven izbor"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Na žalost teh tipk ni mogoÄe prilagoditi v tipkovne bližnjice."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Ta par je že izbran za \"%@\"."
@@@ -20028,20 -20024,20 +20649,36 @@@ msgstr "Izbriši izbrani profil
msgid "Create a new profile"
msgstr "Ustvari nov profil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Ustvari"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "ManjkajoÄe ime profila."
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "ManjkajoÄe ime profila."
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "DoloÄiti je treba ime profila."
@@@ -23491,23 -23487,23 +24128,43 @@@ msgstr "Prekodiranje odvoda pretoka
msgid "Overlays/Subtitles"
msgstr "Prekrivanje/Podnapisi"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Družina želeno pisave."
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Velikost pisave v toÄkah"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Družina želeno pisave."
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Velikost pisave v toÄkah"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23516,11 -23512,11 +24173,19 @@@ msgstr "
"Možnost omogoÄa doloÄevanje velikosti pisave izrisane na sliki. Nastavitve "
"(razen 0) doloÄajo velikost prikazano na zaslonu."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Prekrivnost besedila"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Prekrivnost besedila"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -23528,12 -23524,12 +24193,20 @@@ msgstr "
"Raven prekrivnosti besedila, ki bo izrisano na sliki (od vrednosti 0 za "
"prozorno do 255 popolno prekrito)."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Privzeta barva besedila"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23546,71 -23542,71 +24219,131 @@@ msgstr "
"za modro. (#000000 = Ärna, #FF0000 = rdeÄa, #00FF00 = zelena, #FFFF00 = "
"rumena (rdeÄa in zelena), #FFFFFF = bela)"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Relativna velikost pisave"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Barva ozadja"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Prekrivnost sence"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Barva sence"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Kot sence"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Razdalja sence"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Barva ozadja"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Prekrivnost sence"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Barva sence"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Kot sence"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Razdalja sence"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Manjša"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Majhna"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Velika"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "VeÄje"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Uporabi YUVP izrisovanje"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Uporabi YUVP izrisovanje"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -23618,23 -23614,23 +24351,43 @@@ msgstr "
"Nastavitev izrisovanja pisave z \"paletiziran YUV\". Možnost je zahtevana le "
"v primeru, da želite kodirati besedilo v DVB podnapise."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Ozka"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Debela"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Izrisovalnik besedila"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Izrisovalnik pisave Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Ozka"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Debela"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Izrisovalnik besedila"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Izrisovalnik pisave Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -31851,6 -31847,12 +32604,15 @@@ msgstr "Seznam upravljalnika predstavni
#~ "Naslov: 1; Trajanje: 2; Izvajalec: 4; Zvrst: 8; Avtorstvo: 16; Zbirka/"
#~ "album: 32; Ocena: 256."
++<<<<<<< HEAD
++=======
+ #~ msgid "Force IPv6"
+ #~ msgstr "Zahtevaj IPv6"
+
+ #~ msgid "Force IPv4"
+ #~ msgstr "Zahtevaj IPv4"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Channel of the card to use (Usually, 0 = tuner, 1 = composite, 2 = "
#~ "svideo)."
@@@ -31926,14 -31928,6 +32688,17 @@@
#~ msgstr "Preostali Äas: %i sekund"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Force IPv6"
+#~ msgstr "Vsili profil"
+
+#, fuzzy
+#~ msgid "Force IPv4"
+#~ msgstr "Vsili profil"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Show Details"
#~ msgstr "Podrobnosti kodeka"
@@@ -32798,7 -32792,7 +33563,11 @@@
#, fuzzy
#~ msgid "Force Bold"
++<<<<<<< HEAD
+#~ msgstr "Vsili profil"
++=======
+ #~ msgstr "Vsiljena barva"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Enable Video"
diff --combined po/sq.po
index f0a7aa2,af09f94..8cab69b
--- a/po/sq.po
+++ b/po/sq.po
@@@ -7,7 -7,7 +7,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2005-12-12 16:05+0000\n"
"Last-Translator: Kola <eltonkola at gmail.com>\n"
"Language-Team: Albanian <sq at li.org>\n"
@@@ -132,7 -132,7 +136,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -452,10 -452,10 +460,17 @@@ msgid "&About
msgstr ""
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -498,17 -498,17 +513,29 @@@ msgid "Save...
msgstr ""
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr ""
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr ""
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -593,7 -593,7 +620,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr ""
@@@ -1283,20 -1283,20 +1314,36 @@@ msgstr "
msgid "Decoded format"
msgstr "Pamja grafike"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1693,7 -1693,7 +1740,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1777,7 -1777,7 +1828,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr ""
@@@ -1801,7 -1801,7 +1856,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -1991,7 -1991,7 +2050,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr ""
@@@ -2043,7 -2043,7 +2106,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2052,7 -2052,7 +2119,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
#, fuzzy
msgid "Deinterlace mode"
@@@ -2110,7 -2110,7 +2181,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2284,7 -2284,7 +2359,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2414,12 -2414,12 +2493,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2427,7 -2427,7 +2515,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2736,7 -2736,7 +2828,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3554,7 -3554,7 +3650,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3581,8 -3581,8 +3681,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3664,10 -3664,10 +3769,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3680,10 -3680,10 +3792,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr ""
@@@ -3692,9 -3692,9 +3811,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3930,9 -3930,9 +4055,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4362,7 -4362,7 +4493,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4560,12 -4560,12 +4695,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr ""
@@@ -5330,7 -5330,7 +5474,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "Audio"
@@@ -7718,7 -7718,7 +7866,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8500,7 -8500,7 +8652,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9647,7 -9647,7 +9803,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "Fitltri i treguesit"
@@@ -9683,7 -9683,7 +9843,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "Krijim i tekstit"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "Opcionet audio"
@@@ -9693,31 -9693,31 +9857,55 @@@
msgid "Last audio device"
msgstr "Fitltri i treguesit"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Fitltri i treguesit"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10934,47 -10934,47 +11122,75 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
#, fuzzy
msgid "Silver"
msgstr "Filtrat"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10982,61 -10982,61 +11198,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11177,7 -11177,7 +11429,11 @@@ msgstr "Nentitujt / Titrat
msgid "Subtitle renderers using libass"
msgstr "Nentitujt / Titrat"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13032,10 -13032,10 +13288,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -13150,8 -13150,8 +13413,13 @@@ msgid "D-Bus control interface
msgstr "Kontrolli i pamjes"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13506,9 -13506,9 +13774,15 @@@ msgstr "
msgid "Opening"
msgstr "Fitltri i treguesit"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -15458,7 -15458,7 +15732,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Teletext"
msgstr "Nentitujt / Titrat"
@@@ -15652,7 -15652,7 +15930,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15750,9 -15750,9 +16032,15 @@@ msgstr "Nentitujt / Titrat
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
#, fuzzy
msgid "Save"
@@@ -15897,7 -15897,7 +16185,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15917,7 -15917,7 +16209,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15927,7 -15927,7 +16223,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15948,89 -15948,89 +16248,160 @@@ msgstr "Pamja grafike
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "Filtrat"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "Opcionet video"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "Pamja grafike"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
#, fuzzy
msgid "Effects"
msgstr "Opcionet video"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr "Filtrat"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -16071,7 -16071,7 +16442,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16269,8 -16269,8 +16644,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -16367,37 -16367,37 +16747,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Remove old preferences?"
msgstr "Preferencat"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16552,7 -16552,7 +16964,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Lock Aspect Ratio"
msgstr "Audio"
@@@ -16688,7 -16688,7 +17104,11 @@@ msgstr "
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show All"
msgstr "Filtrat"
@@@ -16785,15 -16785,15 +17205,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16812,30 -16812,30 +17244,56 @@@ msgstr "Pamja grafike
msgid "Audio Device"
msgstr "Fitltri i treguesit"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Fullscreen Video Device"
msgstr "Opcionet video"
@@@ -16845,7 -16845,7 +17303,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Nentitujt / Titrat"
@@@ -17091,7 -17091,7 +17553,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -17275,7 -17275,7 +17741,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr "Nentitujt / Titrat"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -17524,13 -17524,13 +17994,21 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
#, fuzzy
msgid "Preferences"
msgstr "Preferencat"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17725,140 -17725,136 +18203,248 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Default Encoding"
msgstr "Pamja grafike"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:378
++=======
+ #: modules/gui/macosx/simple_prefs.m:377
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Display Settings"
msgstr "Opcionet video"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
#, fuzzy
msgid "Font color"
msgstr "Kontrolli i pamjes"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Nentitujt / Titrat"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Nentitujt / Titrat"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "Kontrolli i pamjes"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
#, fuzzy
msgid "Display"
msgstr "Opcionet video"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Output module"
msgstr "Fitltri i treguesit"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
++=======
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Video snapshots"
msgstr "Opcionet video"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
++=======
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Folder"
msgstr "Filtrat"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
#, fuzzy
msgid "Reset Preferences"
msgstr "Preferencat"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17871,36 -17867,36 +18457,66 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Invalid combination"
msgstr "Preferenca te pergjithsme mbi pamjen"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19954,21 -19950,21 +20570,37 @@@ msgstr "Nentitujt / Titrat
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
#, fuzzy
msgid "Create"
msgstr "Opcionet video"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "You must set a name for the profile."
msgstr "Nentitujt / Titrat"
@@@ -23463,45 -23459,45 +24095,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr "Nentitujt / Titrat"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23510,96 -23506,96 +24178,176 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "Kontrolli i pamjes"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "Kontrolli i pamjes"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text renderer"
msgstr "Krijim i tekstit"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/sr.po
index 6695b40,bd5b617..ac6e4ab
--- a/po/sr.po
+++ b/po/sr.po
@@@ -16,7 -16,7 +16,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-09 08:20+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -146,7 -146,7 +150,11 @@@ msgstr "Разне поÑтавке и
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -475,10 -475,10 +483,17 @@@ msgid "&About
msgstr "&О програму"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -517,17 -517,17 +532,29 @@@ msgid "Save...
msgstr "Сачувај…"
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Понављај Ñве"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Понављај једно"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -632,7 -632,7 +659,11 @@@ msgstr "ДоÑтигнут је најÐ
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Онемогући"
@@@ -1295,21 -1295,21 +1326,37 @@@ msgstr "Брзина кадрова
msgid "Decoded format"
msgstr "Декодирани формат"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Ваш улаз не може бити отворен"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Ваш улаз не може бити отворен"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC не може да отвори MRL „%s“. Погледајте дневник за више информација."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC не може да препозна формат улаза"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC не може да препозна формат улаза"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1742,7 -1742,7 +1789,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1827,7 -1827,7 +1878,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Ðишта"
@@@ -1857,7 -1857,7 +1912,11 @@@ msgstr "
"Ово је метод видео излаза који VLC кориÑти. Подразумевано понашање је да Ñе "
"аутоматÑки одабере најбољи метод који је доÑтупан."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Укључи видео"
@@@ -2064,7 -2064,7 +2123,11 @@@ msgstr "
"директно иÑцртава видео). VLC ће покушати да ово кориÑти као подразумевано."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Увек на врху"
@@@ -2115,7 -2115,7 +2178,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2124,7 -2124,7 +2191,11 @@@ msgstr "РаÑплитање
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "РаÑплитање режим рада"
@@@ -2180,7 -2180,7 +2251,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "УкрааÑи прозора"
@@@ -2367,7 -2367,7 +2442,11 @@@ msgstr "
"четвртаÑте пикÑеле (1:1). Ðко имате 16:9 екран, можда би требало да "
"промените вредноÑÑ‚ у 4:3 како би задржали пропорције."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "ПреÑкочи фрејмове"
@@@ -2508,12 -2508,12 +2587,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2521,7 -2521,7 +2609,11 @@@ msgid "Default
msgstr "Подразумевано"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2842,7 -2842,7 +2934,11 @@@ msgid "You can completely disable the s
msgstr "Можете потпуно да онемогућите обраду под-Ñлика."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3739,7 -3739,7 +3835,11 @@@ msgstr "
"Ова подешавања Ñу опште VLC везе кључева, познате као \"hotkeys\" тј. "
"пречице."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Игнориши"
@@@ -3763,8 -3763,8 +3863,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3844,10 -3844,10 +3949,17 @@@ msgid "Slower (fine)
msgstr "Спорије (фино)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3860,10 -3860,10 +3972,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Изаберите дугме за преÑкакање Ñледеће Ñтвари у лиÑти за репродукцију."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Претходно"
@@@ -3873,9 -3873,9 +3992,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"Изаберите дугме за преÑкакање претходне Ñтвари у лиÑти за репродукцију."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4110,9 -4110,9 +4235,15 @@@ msgid "Select the key to decrease audi
msgstr "Изабери таÑтер за Ñмањивање јачине аудио звука."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "ИÑкључи звук"
@@@ -4526,7 -4526,7 +4657,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Снимак Ñлике"
@@@ -4725,12 -4725,12 +4860,21 @@@ msgstr "Преузимање ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "ОбуÑтави"
@@@ -5490,7 -5490,7 +5634,11 @@@ msgstr "ОпÑеци
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Пропорције"
@@@ -7809,7 -7809,7 +7957,11 @@@ msgstr "Улазни Екран
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Екран"
@@@ -8541,7 -8541,7 +8693,11 @@@ msgstr "МакÑимална јачин
msgid "Volume Set"
msgstr "ПодеÑи јачину Звука"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9673,7 -9673,7 +9829,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "ALSA аудио излаз"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9704,7 -9704,7 +9864,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9712,30 -9712,30 +9876,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL излазна аудио јединица"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL излазна аудио јединица"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Енкодиран излаз)"
@@@ -10952,46 -10952,46 +11140,74 @@@ msgstr "
msgid "Outline"
msgstr "Ивица"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Црна"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Сива"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Сребрна"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Бела"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "КеÑтењаÑто Браон"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Црвена"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10999,61 -10999,61 +11215,97 @@@ msgid "Fuchsia
msgstr "Тамно љубичаÑта"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Жута"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "МаÑлинаÑто зелена"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Зелена "
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Тегет"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Лимун жута"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "ЉубичаÑта"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Тамно Плава"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Плава"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11183,7 -11183,7 +11435,11 @@@ msgstr "Титлови (напреднÐ
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Кеширање фонтова"
@@@ -13049,10 -13049,10 +13305,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Ðормално"
@@@ -13157,8 -13157,8 +13420,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13499,9 -13499,9 +13767,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Пауза"
@@@ -15412,7 -15412,7 +15686,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG Transport Stream демултиплекÑер"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "ТелетекÑÑ‚"
@@@ -15599,7 -15599,7 +15877,11 @@@ msgid "VLC media player Help
msgstr "VLC медија плејер помоћ"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Ð˜Ð½Ð´ÐµÐºÑ "
@@@ -15687,9 -15687,9 +15969,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Сачувај"
@@@ -15832,7 -15832,7 +16120,11 @@@ msgstr "Ðије пронађен улÐ
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Ток мора да Ñе преÑлушава или паузира да би маркери радили."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Скочи Ðа Време"
@@@ -15852,7 -15852,7 +16144,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15862,7 -15862,7 +16158,11 @@@ msgstr "
msgid "Forward"
msgstr "Ðапред"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15882,84 -15882,84 +16182,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Прикажи/Сакриј лиÑту за пуштање"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Прикажи/Сакриј лиÑту за пуштање"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Понови"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Промешај"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Промешај"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Ефекти"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15995,7 -15995,7 +16366,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16178,8 -16178,8 +16553,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -16277,36 -16277,36 +16657,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "ÐаÑтави"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Ðе могу да пронађем никакав траг претходног пада програма."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Ðе могу да пронађем никакав траг претходног пада програма."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16464,7 -16464,7 +16876,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16593,7 -16593,7 +17009,11 @@@ msgstr "Сакриј VLC
msgid "Hide Others"
msgstr "Сакриј ОÑтале"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Прикажи Све"
@@@ -16678,15 -16678,15 +17098,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "ИÑкључи поÑле репродукције"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Корак унапред"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "ИÑкључи поÑле репродукције"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Корак унапред"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Корак уназад"
@@@ -16702,30 -16702,30 +17134,56 @@@ msgstr "Утишај звук
msgid "Audio Device"
msgstr "Ðудио Уређај"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Половина Величине"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Ðормална Величина"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Дупла Величина"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Величина Екрана"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Половина Величине"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Ðормална Величина"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Дупла Величина"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Величина Екрана"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Плутај на Врху"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16734,7 -16734,7 +17192,11 @@@
msgid "Post processing"
msgstr "ПоÑÑ‚-процеÑирање"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Додај титл..."
@@@ -16962,7 -16962,7 +17424,11 @@@ msgid "Play another media synchronously
msgstr "ПуÑти другу датотеку паралелно"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Изаберите..."
@@@ -17133,7 -17133,7 +17599,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Величина фонта"
@@@ -17362,12 -17362,12 +17832,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Подешавање"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17544,129 -17544,125 +18022,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Подразумевано енкодовање"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Подешавање приказа"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Подразумевано енкодовање"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Подешавање приказа"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Боја фонта"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Фонт"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Подразумевани језик титла"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Укључи OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Укључи OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "ПровидноÑÑ‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Боја ивице"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Дебљина ивице"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Прикажи"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Снимак екрана"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "ФаÑцикла"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Формат"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Снимак екрана"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "ФаÑцикла"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Формат"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "КарактериÑтике врати на подразумеване вредноÑти"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17679,35 -17675,35 +18265,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Изабери"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Изабери"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "ÐеиÑправна комбинација"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "ÐеиÑправна комбинација"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19734,20 -19730,20 +20350,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Ðаправи"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -23112,23 -23108,23 +23744,43 @@@ msgstr "ТранÑкодовање из
msgid "Overlays/Subtitles"
msgstr "Преклопи/Титлови"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Величина фонта у пикÑелима"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Величина фонта у пикÑелима"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23138,11 -23134,11 +23790,19 @@@ msgstr "
"је подешено на вредноÑÑ‚ различиту од 0 ова опција ће преклопити релативну "
"величину фонта."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -23150,12 -23146,12 +23810,20 @@@ msgstr "
"ÐепровидноÑÑ‚ (инверзно од провидноÑти) текÑта који ће бити рендерован на "
"видеу. 0 = провидно, 255 = тотално непровидно."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Подразумевана боја текÑта"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23168,12 -23164,12 +23836,20 @@@ msgstr "
"#000000 = црна, #FF0000 = црвена, #00FF00 = зелена, #FFFF00 = жута (црвена + "
"зелена), #FFFFFF = бела"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Релативна величина текÑта"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -23182,59 -23178,59 +23858,111 @@@ msgstr "
"Ово је релативна подразумевана величина фонта који ће бити приказан. Ðко је "
"подешена апÑолутна величина фонта, релативна величина ће бити занемарена."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Боја позадине"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "ПровидноÑÑ‚ ивице"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Боја позадине"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "ПровидноÑÑ‚ ивице"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Мања"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Мала"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Велика"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Већа"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "КориÑти YUVP рендер"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "КориÑти YUVP рендер"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -23242,23 -23238,23 +23970,43 @@@ msgstr "
"Ово рендерује фонт коришћењем опције \"paletized YUV\". Ова опција је "
"потребна Ñамо у Ñлучају ако желите да енкодирате у DVB титлове"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Танка"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Дебела"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Рендерер текÑта"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 рендерер фонта"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Танка"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Дебела"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Рендерер текÑта"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 рендерер фонта"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/sv.po
index 3666159,d3ae366..a94f0fe
--- a/po/sv.po
+++ b/po/sv.po
@@@ -9,13 -9,12 +9,21 @@@
# Joel Arvidsson <dogai at privat.utfors.se>, 2002
# Niklas 'Nille' Åkerström <nille.kungen at gmail.com>, 2009
# MightyNerd <staszw at live.se>, 2013
++<<<<<<< HEAD
+# leveebreaks <when.the.levee.breaks.89 at gmail.com>, 2013
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-12-01 22:33+0000\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-10-22 14:11+0000\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Last-Translator: DolphinPhoenix <anton_r_3 at hotmail.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/vlc-trans/"
"language/sv/)\n"
@@@ -143,7 -142,7 +151,11 @@@ msgstr "Diverse ljudinställningar och
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -420,8 -419,6 +432,11 @@@ msgid "
"In this section you can force the behavior of the subtitle demuxer, for "
"example by setting the subtitle type or file name."
msgstr ""
++<<<<<<< HEAD
+"I den här sektionen kan du tvinga fram beteendet för undertextdemuxern, till "
+"exempel genom att ställa in undertexttypen eller filnamnet."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_interface.h:134
msgid ""
@@@ -491,10 -488,10 +506,17 @@@ msgid "&About
msgstr "&Om"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -533,17 -530,17 +555,29 @@@ msgid "Save...
msgstr "Spara..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Upprepa alla"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Repetera en gång"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -650,7 -647,7 +684,11 @@@ msgstr "Det maximala antalet filter (%u
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Inaktivera"
@@@ -1017,39 -1014,39 +1055,75 @@@ msgstr "Insert
#: src/config/keys.c:86
msgid "Media Angle"
++<<<<<<< HEAD
+msgstr "Media Vinkel"
+
+#: src/config/keys.c:87
+msgid "Media Audio Track"
+msgstr "Media Ljudspår"
+
+#: src/config/keys.c:88
+msgid "Media Forward"
+msgstr "Media Framåt"
+
+#: src/config/keys.c:89
+msgid "Media Menu"
+msgstr "Media Meny"
+
+#: src/config/keys.c:90
+msgid "Media Next Frame"
+msgstr "Media Nästa bildruta"
+
+#: src/config/keys.c:91
+msgid "Media Next Track"
+msgstr "Media Nästa spår"
+
+#: src/config/keys.c:92
+msgid "Media Play Pause"
+msgstr "Media Spela/pausa"
+
+#: src/config/keys.c:93
+msgid "Media Prev Frame"
+msgstr "Media Föreg bildruta"
+
+#: src/config/keys.c:94
+msgid "Media Prev Track"
+msgstr "Media Föreg spår"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:87
+ msgid "Media Audio Track"
+ msgstr ""
+
+ #: src/config/keys.c:88
+ msgid "Media Forward"
+ msgstr ""
+
+ #: src/config/keys.c:89
+ msgid "Media Menu"
+ msgstr ""
+
+ #: src/config/keys.c:90
+ msgid "Media Next Frame"
+ msgstr ""
+
+ #: src/config/keys.c:91
+ msgid "Media Next Track"
+ msgstr ""
+
+ #: src/config/keys.c:92
+ msgid "Media Play Pause"
+ msgstr ""
+
+ #: src/config/keys.c:93
+ msgid "Media Prev Frame"
+ msgstr ""
+
+ #: src/config/keys.c:94
+ msgid "Media Prev Track"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:95
msgid "Media Record"
@@@ -1351,21 -1348,21 +1425,37 @@@ msgstr "Bildfrekvens
msgid "Decoded format"
msgstr "Avkodat format"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Din inmatning kunde inte öppnas"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Din inmatning kunde inte öppnas"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC kunde inte öppna MRL:en \"%s\". Kontrollera loggen för mer detaljer."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC känner inte igen formatet på inmatningen"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC känner inte igen formatet på inmatningen"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1725,7 -1722,7 +1815,11 @@@ msgstr "Volymsteg för ljudutmatning
#: src/libvlc-module.c:144
msgid "The step size of the volume is adjustable using this option."
++<<<<<<< HEAD
+msgstr "Steglängden för volymen kan justeras med detta alternativ."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:147
msgid "Remember the audio volume"
@@@ -1748,7 -1745,7 +1842,11 @@@ msgstr "
#: src/libvlc-module.c:157
msgid "Audio resampler"
++<<<<<<< HEAD
+msgstr "Ljudåtersamplare"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:159
msgid "This selects which plugin to use for audio resampling."
@@@ -1796,7 -1793,7 +1894,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1861,7 -1858,7 +1963,11 @@@ msgstr "
#: src/libvlc-module.c:218
msgid "Protect against sound clipping"
++<<<<<<< HEAD
+msgstr "Skydda mot ljudklippning"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:221
msgid "Enable time stretching audio"
@@@ -1883,7 -1880,7 +1989,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Ingen"
@@@ -1909,7 -1906,7 +2019,11 @@@ msgstr "
"Detta är videoutmatningsdmetoden som används av VLC. Standardbeteendet är "
"att automatiskt välja den bästa tillgängliga metoden."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Aktivera video"
@@@ -2114,7 -2111,7 +2228,11 @@@ msgstr "
"rendera video direkt). VLC kommer att försöka använda det som standard."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Alltid överst"
@@@ -2166,7 -2163,7 +2284,11 @@@ msgstr "Dölj muspekare och helskärmsk
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2175,7 -2172,7 +2297,11 @@@ msgstr "Avfläta
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Avflätningsläge"
@@@ -2233,7 -2230,7 +2359,11 @@@ msgstr "
"Förhindrar strömhanteringsdemonen under alla former av uppspelning för att "
"undvika att datorn försätts i vänteläge på grund av inaktivitet."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Fönsterdekorationer"
@@@ -2261,8 -2258,6 +2391,11 @@@ msgid "
"This adds post-processing filters to enhance the picture quality, for "
"instance deinterlacing, or distort the video."
msgstr ""
++<<<<<<< HEAD
+"Detta lägger till efterbehandlingsfilter för att förbättra bildkvaliteten, t."
+"ex. avflätning, eller videoförvrängning."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:389
msgid "Video snapshot directory (or filename)"
@@@ -2415,7 -2410,7 +2548,11 @@@ msgstr "
"fyrkantiga bildpunkter (1:1). Om du har en bredbildsskärm (16:9) kanske du "
"behöver ändra det här till 4:3 för att behålla proportionerna."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Hoppa över bildrutor"
@@@ -2475,11 -2470,11 +2612,19 @@@ msgstr "
#: src/libvlc-module.c:501
msgid "File caching (ms)"
++<<<<<<< HEAD
+msgstr "Filcaching (ms)"
+
+#: src/libvlc-module.c:503
+msgid "Caching value for local files, in milliseconds."
+msgstr "Cachningsvärde för lokala filer i millisekunder."
++=======
+ msgstr ""
+
+ #: src/libvlc-module.c:503
+ msgid "Caching value for local files, in milliseconds."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:505
msgid "Live capture caching (ms)"
@@@ -2487,23 -2482,23 +2632,43 @@@ msgstr "
#: src/libvlc-module.c:507
msgid "Caching value for cameras and microphones, in milliseconds."
++<<<<<<< HEAD
+msgstr "Cachningsvärde för kameror och mikrofoner i millisekunder."
+
+#: src/libvlc-module.c:509
+msgid "Disc caching (ms)"
+msgstr "Diskcachning (ms)"
+
+#: src/libvlc-module.c:511
+msgid "Caching value for optical media, in milliseconds."
+msgstr "Cachningsvärde för optisk media i millisekunder."
+
+#: src/libvlc-module.c:513
+msgid "Network caching (ms)"
+msgstr "Nätverkscachning (ms)"
+
+#: src/libvlc-module.c:515
+msgid "Caching value for network resources, in milliseconds."
+msgstr "Cachningsvärde för nätverksresurser i millisekunder."
++=======
+ msgstr ""
+
+ #: src/libvlc-module.c:509
+ msgid "Disc caching (ms)"
+ msgstr ""
+
+ #: src/libvlc-module.c:511
+ msgid "Caching value for optical media, in milliseconds."
+ msgstr ""
+
+ #: src/libvlc-module.c:513
+ msgid "Network caching (ms)"
+ msgstr ""
+
+ #: src/libvlc-module.c:515
+ msgid "Caching value for network resources, in milliseconds."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:517
msgid "Clock reference average counter"
@@@ -2529,7 -2524,7 +2694,11 @@@ msgstr "
#: src/libvlc-module.c:528
msgid "Clock jitter"
++<<<<<<< HEAD
+msgstr "Klockjitter"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:530
msgid ""
@@@ -2553,12 -2548,12 +2722,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2566,7 -2561,7 +2744,11 @@@ msgid "Default
msgstr "Standard"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2895,7 -2890,7 +3077,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3757,7 -3752,7 +3943,11 @@@ msgstr "
"Dessa inställningar är de globala VLC-tangentbindningarna, kända som "
"\"snabbtangenter\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ignorera"
@@@ -3783,8 -3778,8 +3973,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3864,10 -3859,10 +4059,17 @@@ msgid "Slower (fine)
msgstr "LÃ¥ngsammare (fin)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3881,10 -3876,10 +4083,17 @@@ msgstr "
"Välj snabbtangent att använda för att hoppa till nästa objekt i spellistan."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Föregående"
@@@ -3895,9 -3890,9 +4104,15 @@@ msgstr "
"Välj snabbtangent att använda för att hoppa till föregående objekt i "
"spellistan."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4133,9 -4128,9 +4348,15 @@@ msgid "Select the key to decrease audi
msgstr "Välj tangent för att sänka ljudvolymen."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Tyst"
@@@ -4549,7 -4544,7 +4770,11 @@@ msgstr "Växla mellan tillgängliga lju
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Skärmbild"
@@@ -4627,7 -4622,7 +4852,11 @@@ msgstr "Prestandainställningar
#: src/libvlc-module.c:1993
msgid "Clock source"
++<<<<<<< HEAD
+msgstr "Klockningskälla"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:2103
msgid "Hot keys"
@@@ -4753,12 -4748,12 +4982,21 @@@ msgstr "Hämtar ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Avbryt"
@@@ -5523,7 -5518,7 +5761,11 @@@ msgstr "Beskär
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Bildförhållande"
@@@ -5912,7 -5907,7 +6154,11 @@@ msgstr "
#: modules/access/dshow/dshow.cpp:145 modules/access/v4l2/v4l2.c:196
msgid "Picture aspect-ratio n:m"
++<<<<<<< HEAD
+msgstr "Bildens bildformat n:m"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:146 modules/access/v4l2/v4l2.c:197
msgid "Define input picture aspect-ratio to use. Default is 4:3"
@@@ -5928,8 -5923,6 +6174,11 @@@ msgid "
"Force the DirectShow video input to use a specific chroma format (eg. I420 "
"(default), RV24, etc.)"
msgstr ""
++<<<<<<< HEAD
+"Tvinga videoinmatningen DirectShow att använda ett specifikt "
+"färgstyrkeformat (t.ex. I420 (standard), RV24, etc.)"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:151
msgid "Video input frame rate"
@@@ -6097,12 -6090,12 +6346,20 @@@ msgstr "Ingen video- eller ljudenhet ha
#: modules/access/dshow/dshow.cpp:602
msgid "VLC cannot open ANY capture device. Check the error log for details."
++<<<<<<< HEAD
+msgstr "VLC kan inte öppna ALLA fångstenheter. Kolla felloggen för detaljer."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:1049
msgid ""
"The device you selected cannot be used, because its type is not supported."
++<<<<<<< HEAD
+msgstr "Enheten du valde kan inte användas, eftersom dess typ inte stöds."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:1102
#, c-format
@@@ -6239,7 -6232,7 +6496,11 @@@ msgstr "
#: modules/access/dtv/access.c:111
msgid "Transmission mode"
++<<<<<<< HEAD
+msgstr "Överföringsläge"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:119
msgid "Bandwidth (MHz)"
@@@ -6327,11 -6320,11 +6588,19 @@@ msgstr "0.25
#: modules/access/dtv/access.c:164
msgid "Transport stream ID"
++<<<<<<< HEAD
+msgstr "Transportströms-ID"
+
+#: modules/access/dtv/access.c:166
+msgid "Polarization (Voltage)"
+msgstr "Polarisering (spänning)"
++=======
+ msgstr ""
+
+ #: modules/access/dtv/access.c:166
+ msgid "Polarization (Voltage)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:168
msgid ""
@@@ -6341,7 -6334,7 +6610,11 @@@ msgstr "
#: modules/access/dtv/access.c:171
msgid "Unspecified (0V)"
++<<<<<<< HEAD
+msgstr "Ospecificerad (0V)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:172
msgid "Vertical (13V)"
@@@ -6398,7 -6391,7 +6671,11 @@@ msgstr "
#: modules/access/dtv/access.c:192
msgid "Continuous 22kHz tone"
++<<<<<<< HEAD
+msgstr "Konstant ton i 22kHz"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:194
msgid ""
@@@ -6489,7 -6482,7 +6766,11 @@@ msgstr "DTV
#: modules/access/dtv/access.c:241
msgid "Digital Television and Radio"
++<<<<<<< HEAD
+msgstr "Digital-TV och radio"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:279
msgid "Terrestrial reception parameters"
@@@ -6535,7 -6528,7 +6816,11 @@@ msgstr "
#: modules/access/dv.c:60
msgid "Digital Video (Firewire/ieee1394) input"
++<<<<<<< HEAD
+msgstr "Inmatning för digital video (Firewire/ieee1394)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dv.c:61
msgid "DV"
@@@ -7489,7 -7482,7 +7774,11 @@@ msgstr "Strömnamn
#: modules/access_output/shout.c:65
msgid "Name to give to this stream/channel on the shoutcast/icecast server."
++<<<<<<< HEAD
+msgstr "Namnet att ge till denna ström/kanal på Shoutcast/Icecast-servern."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/shout.c:68
msgid "Stream description"
@@@ -7509,9 -7502,6 +7798,12 @@@ msgid "
"possible to stream MP3 instead, so you can forward MP3 streams to the "
"shoutcast/icecast server."
msgstr ""
++<<<<<<< HEAD
+"Du behöver i regel förse Shoutcast-modulen med Ogg-strömmar. Det är också "
+"möjligt att strömma MP3 istället, så du kan vidaresända MP3-strömmar till "
+"Shoutcast/Icecast-servern."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/shout.c:82
msgid "Genre description"
@@@ -7868,7 -7858,7 +8160,11 @@@ msgstr "Skärminmatning
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Skärm"
@@@ -8168,7 -8158,7 +8464,11 @@@ msgstr "Ljusstyrka
#: modules/access/v4l2/v4l2.c:85
msgid "Picture brightness or black level."
++<<<<<<< HEAD
+msgstr "Bildens ljusstyrka eller svartnivå."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:86
msgid "Automatic brightness"
@@@ -8217,7 -8207,7 +8517,11 @@@ msgstr "Justerar bildens färgton autom
#: modules/access/v4l2/v4l2.c:98
msgid "White balance temperature (K)"
++<<<<<<< HEAD
+msgstr "Temperatur för vitbalans (K)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:100
msgid ""
@@@ -8239,7 -8229,7 +8543,11 @@@ msgstr "Rödbalans
#: modules/access/v4l2/v4l2.c:107
msgid "Red chroma balance."
++<<<<<<< HEAD
+msgstr "Balans för röd färgstyrka."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:108
msgid "Blue balance"
@@@ -8247,7 -8237,7 +8555,11 @@@ msgstr "Blåbalans
#: modules/access/v4l2/v4l2.c:110
msgid "Blue chroma balance."
++<<<<<<< HEAD
+msgstr "Balans för blå färgstyrka."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:111 modules/gui/macosx/VideoEffects.m:95
#: modules/gui/qt4/ui/video_effects.h:1308
@@@ -8280,7 -8270,7 +8592,11 @@@ msgstr "Skärpa
#: modules/access/v4l2/v4l2.c:121
msgid "Sharpness filter adjust."
++<<<<<<< HEAD
+msgstr "Justering för skärpafilter."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:122
msgid "Chroma gain"
@@@ -8384,11 -8374,11 +8700,19 @@@ msgstr "Negativ
#: modules/access/v4l2/v4l2.c:165
msgid "Emboss"
++<<<<<<< HEAD
+msgstr "Relief"
+
+#: modules/access/v4l2/v4l2.c:165
+msgid "Sketch"
+msgstr "Skiss"
++=======
+ msgstr ""
+
+ #: modules/access/v4l2/v4l2.c:165
+ msgid "Sketch"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:165
msgid "Sky blue"
@@@ -8449,7 -8439,7 +8773,11 @@@ msgstr "Loudness-läge
#: modules/access/v4l2/v4l2.c:186
msgid "Loudness mode a.k.a. bass boost."
++<<<<<<< HEAD
+msgstr "Högljutt läge, även känt som basförstärkning."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:188
msgid "v4l2 driver controls"
@@@ -8531,7 -8521,7 +8859,11 @@@ msgstr "Kontroller
#: modules/access/v4l2/v4l2.c:334
msgid "Video capture controls (if supported by the device)"
++<<<<<<< HEAD
+msgstr "Kontroller för videofångst (om det stöds av enheten)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:425
msgid "Video4Linux compressed A/V input"
@@@ -8539,7 -8529,7 +8871,11 @@@ msgstr "
#: modules/access/v4l2/v4l2.c:432
msgid "Video4Linux radio tuner"
++<<<<<<< HEAD
+msgstr "Radiomottagare för Video4Linux "
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vcd/vcd.c:47
msgid "VCD"
@@@ -8601,7 -8591,7 +8937,11 @@@ msgstr "Vol max #
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -8696,7 -8686,7 +9036,11 @@@ msgstr "
#: modules/access/vcdx/vcd.c:111
msgid "Use track length as maximum unit in seek?"
++<<<<<<< HEAD
+msgstr "Använd spårets längd som maximal enhet i sökning?"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vcdx/vcd.c:112
msgid ""
@@@ -8788,7 -8778,7 +9132,11 @@@ msgstr "Privat nyckel för autentiserin
#: modules/access/vnc.c:58
msgid "RGB chroma (RV32, RV24, RV16, RGB2)"
++<<<<<<< HEAD
+msgstr "RGB-färgstyrka (RV32, RV24, RV16, RGB2)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:61
msgid "Compression level"
@@@ -9126,7 -9116,7 +9474,11 @@@ msgstr "
#: modules/audio_filter/chorus_flanger.c:91
msgid "Level of delayed signal"
++<<<<<<< HEAD
+msgstr "Nivå för fördröjd signal"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/chorus_flanger.c:93
msgid "Dry Mix"
@@@ -9273,7 -9263,7 +9625,11 @@@ msgstr "
#: modules/audio_filter/equalizer.c:67
msgid "Use VLC frequency bands"
++<<<<<<< HEAD
+msgstr "Använd VLC:s frekvensband"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/equalizer.c:69
msgid ""
@@@ -9489,12 -9479,11 +9845,19 @@@ msgstr "
#: modules/audio_filter/resampler/speex.c:32
msgid "Resampling quality"
++<<<<<<< HEAD
+msgstr "Omsamplingskvalitet"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/resampler/speex.c:34
msgid "Resampling quality (0 = worst and fastest, 10 = best and slowest)."
msgstr ""
++<<<<<<< HEAD
+"Omsamplingskvalitet (0 = sämst och snabbast, 10 = bäst och långsammast)."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/resampler/speex.c:41
#: modules/audio_filter/resampler/speex.c:42
@@@ -9529,7 -9518,7 +9892,11 @@@ msgstr "
#: modules/audio_filter/resampler/src.c:50
msgid "Linear (fastest)"
++<<<<<<< HEAD
+msgstr "Linjär (snabbast)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/resampler/src.c:58
msgid "SRC resampler"
@@@ -9719,7 -9708,7 +10086,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "ALSA-ljudutmatning"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Ljudutmatning misslyckades"
@@@ -9752,7 -9741,7 +10123,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9760,30 -9749,30 +10135,54 @@@
msgid "Last audio device"
msgstr "Senaste ljudenhet"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Ljudenheten är inte konfigurerad"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Ljudenheten är inte konfigurerad"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (kodad utmatning)"
@@@ -9808,7 -9797,7 +10207,11 @@@ msgstr "
#: modules/audio_output/directx.c:116
msgid "Audio volume in hundredths of decibels (dB)."
++<<<<<<< HEAD
+msgstr "Ljudvolym i hundradels decibel (dB)."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/directx.c:119
msgid "DirectX audio output"
@@@ -9827,8 -9816,6 +10230,11 @@@ msgid "
"By default (0), all the channels of the incoming will be saved but you can "
"restrict the number of channels here."
msgstr ""
++<<<<<<< HEAD
+"Som standard (0) kommer alla inkommande kanaler att sparas, men du kan "
+"begränsa antalet kanaler här."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/file.c:86
msgid "Add WAVE header"
@@@ -9894,12 -9881,10 +10300,19 @@@ msgid "
"Enable this option if you want your audio not to be interrupted by the other "
"audio."
msgstr ""
++<<<<<<< HEAD
+"Aktivera detta alternativ om du vill att ditt ljud inte ska avbrytas av "
+"annat ljud."
+
+#: modules/audio_output/kai.c:110
+msgid "K Audio Interface audio output"
+msgstr "K Ljudgränssnitt för ljudutmatning"
++=======
+
+ #: modules/audio_output/kai.c:110
+ msgid "K Audio Interface audio output"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/opensles_android.c:131
msgid "OpenSLES audio output"
@@@ -10146,7 -10131,7 +10559,11 @@@ msgstr "Kodeknamn
#: modules/codec/avcodec/avcodec.h:119
msgid "Internal libavcodec codec name"
++<<<<<<< HEAD
+msgstr "Kodeknamn för intern libavcodec"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:122
msgid "Visualize motion vectors"
@@@ -10178,7 -10163,7 +10595,11 @@@ msgstr "HÃ¥rdvaruavkodning
#: modules/codec/avcodec/avcodec.h:137
msgid "This allows hardware decoding when available."
++<<<<<<< HEAD
+msgstr "Detta tillåter hårdvaruavkodning om den finns tillgänglig."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:139
msgid "VDA output pixel format"
@@@ -10531,11 -10516,11 +10952,19 @@@ msgstr "
#: modules/codec/dirac.c:61 modules/codec/schroedinger.c:109
msgid "Constant quality factor"
++<<<<<<< HEAD
+msgstr "Konstant kvalitetsfaktor"
+
+#: modules/codec/dirac.c:62
+msgid "If bitrate=0, use this value for constant quality"
+msgstr "Om bitfrekvensen är 0, använd detta värde för konstant kvalitet"
++=======
+ msgstr ""
+
+ #: modules/codec/dirac.c:62
+ msgid "If bitrate=0, use this value for constant quality"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/dirac.c:65 modules/codec/schroedinger.c:117
msgid "CBR bitrate (kbps)"
@@@ -10543,7 -10528,7 +10972,11 @@@ msgstr "CBR-bitfrekvens (kbps)
#: modules/codec/dirac.c:66
msgid "A value > 0 enables constant bitrate mode"
++<<<<<<< HEAD
+msgstr "Ett värde mer än 0 aktiverar konstant bitfrekvensläge"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/dirac.c:69
msgid "Enable lossless coding"
@@@ -10554,8 -10539,6 +10987,11 @@@ msgid "
"Lossless coding ignores bitrate and quality settings, allowing for perfect "
"reproduction of the original"
msgstr ""
++<<<<<<< HEAD
+"Förlustfri kodning ignorerar bitfrekvens- och kvalitetsinställningar, vilket "
+"möjliggör perfekt återgivning av originalet"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/dirac.c:74 modules/codec/schroedinger.c:134
msgid "Prefilter"
@@@ -10989,46 -10972,46 +11425,74 @@@ msgstr "Skugga
msgid "Outline"
msgstr "Konturer"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Svart"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Grå"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Silver"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Vit"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Röd"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11036,61 -11019,61 +11500,97 @@@ msgid "Fuchsia
msgstr "Fuchsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Gul"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Oliv"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Grön"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Lime"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Lila"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Marin"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Blå"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11220,7 -11203,7 +11720,11 @@@ msgstr "Undertexter (avancerat)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Bygger cache för typsnitt"
@@@ -11842,15 -11825,15 +12346,27 @@@ msgstr "
#: modules/codec/speex.c:91
msgid "Narrow-band (8kHz)"
++<<<<<<< HEAD
+msgstr "Smalband (8kHz)"
+
+#: modules/codec/speex.c:91
+msgid "Wide-band (16kHz)"
+msgstr "Bredband (16kHz)"
+
+#: modules/codec/speex.c:91
+msgid "Ultra-wideband (32kHz)"
+msgstr "Ultrabredband (32kHz)"
++=======
+ msgstr ""
+
+ #: modules/codec/speex.c:91
+ msgid "Wide-band (16kHz)"
+ msgstr ""
+
+ #: modules/codec/speex.c:91
+ msgid "Ultra-wideband (32kHz)"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/speex.c:98
msgid "Speex audio decoder"
@@@ -11874,7 -11857,7 +12390,11 @@@ msgstr "Inaktivera genomskinlighet fö
#: modules/codec/spudec/spudec.c:46
msgid "Removes all transparency effects used in DVD subtitles."
++<<<<<<< HEAD
+msgstr "Tar bort alla genomskinlighetseffekter som används i DVD-undertexter."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/spudec/spudec.c:50
msgid "DVD subtitles decoder"
@@@ -13027,10 -13010,10 +13547,17 @@@ msgid "Fast
msgstr "Spola framåt"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -13109,9 -13092,6 +13636,12 @@@ msgid "
"2=right, 4=top, 8=bottom, you can also use combinations of these values, eg. "
"6 = top-right)."
msgstr ""
++<<<<<<< HEAD
+"Du kan upprätthålla positionen för text-tv på videon (0=centrerad, "
+"1=vänster, 2=höger, 4=överkant, 8=nederkant; du kan även använda "
+"kombinationer av dessa värden, exempelvis 6=höger överkant)."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/zvbi.c:72
msgid "Teletext text subtitles"
@@@ -13138,8 -13118,8 +13668,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13480,9 -13460,9 +14015,15 @@@ msgstr "Initierar
msgid "Opening"
msgstr "Öppnar"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Pausa"
@@@ -13633,7 -13613,7 +14174,11 @@@ msgstr "| chapter_p . . . . föregåe
#: modules/control/rc.c:805
msgid "| seek X . . . seek in seconds, for instance `seek 12'"
++<<<<<<< HEAD
+msgstr "| seek X . . . spola i sekunder, till exempel \"seek 12\""
++=======
+ msgstr "| sök X . . . spola i sekunder, till exempel \"seek 12\""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:806
msgid "| pause . . . . . . . . . . . . . . . . toggle pause"
@@@ -13705,7 -13685,7 +14250,11 @@@ msgstr "| voldown [X] . . . . . . sä
#: modules/control/rc.c:824
msgid "| adev [device] . . . . . . . . set/get audio device"
++<<<<<<< HEAD
+msgstr "| adev [device] . . . . . . . . ange/hämta ljudenhet"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:825
msgid "| achan [X]. . . . . . . . . . set/get audio channels"
@@@ -13737,7 -13717,7 +14286,11 @@@ msgstr "| snapshot . . . . . . . . . .
#: modules/control/rc.c:832
msgid "| strack [X] . . . . . . . . . set/get subtitle track"
++<<<<<<< HEAD
+msgstr "| strack [X] . . . . . . . . . ange/hämta undertextspår"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:833
msgid "| key [hotkey name] . . . . . . simulate hotkey press"
@@@ -13749,7 -13729,7 +14302,11 @@@ msgstr "| menu . . [on|off|up|down|left
#: modules/control/rc.c:836
msgid "| help . . . . . . . . . . . . . . . this help message"
++<<<<<<< HEAD
+msgstr "| help . . . . . . . . . . . . . . . detta hjälpmeddelande"
++=======
+ msgstr "| help . . . . . . . . . . . . . . . det här hjälpmeddelandet"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:837
msgid "| logout . . . . . . . exit (if in socket connection)"
@@@ -13761,7 -13741,7 +14318,11 @@@ msgstr "| quit . . . . . . . . . . . .
#: modules/control/rc.c:840
msgid "+----[ end of help ]"
++<<<<<<< HEAD
+msgstr "+----[ slutet på hjälpavsnittet ]"
++=======
+ msgstr "+----[ sluta på hjälpen ]"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:967
msgid "Press menu select or pause to continue."
@@@ -13848,12 -13828,12 +14409,20 @@@ msgstr "| ljud avkodad: %5<PRIi64>
#: modules/control/rc.c:1774 modules/gui/ncurses.c:835
#, c-format
msgid "| buffers played : %5<PRIi64>"
++<<<<<<< HEAD
+msgstr "| buffertar spelade : %5<PRIi64>"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:1776 modules/gui/ncurses.c:837
#, c-format
msgid "| buffers lost : %5<PRIi64>"
++<<<<<<< HEAD
+msgstr "| buffertar förlorade : %5<PRIi64>"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/rc.c:1780 modules/gui/ncurses.c:842
msgid "+-[Streaming]"
@@@ -14046,7 -14026,7 +14615,11 @@@ msgstr "
#: modules/demux/image.c:56
msgid "Forced chroma"
++<<<<<<< HEAD
+msgstr "Tvingad färgstyrka"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/image.c:58
msgid ""
@@@ -14456,7 -14436,7 +15029,11 @@@ msgstr "Topp 40
#: modules/demux/mp4/id3genres.h:93
msgid "Christian Rap"
++<<<<<<< HEAD
+msgstr "Kristen rapp"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:94
msgid "Pop/Funk"
@@@ -14476,7 -14456,7 +15053,11 @@@ msgstr "Cabaret
#: modules/demux/mp4/id3genres.h:98
msgid "New Wave"
++<<<<<<< HEAD
+msgstr "New wave"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:99 modules/gui/macosx/VideoEffects.m:160
#: modules/video_filter/psychedelic.c:55
@@@ -14554,7 -14534,7 +15135,11 @@@ msgstr "
#: modules/demux/mp4/id3genres.h:117
msgid "Bebob"
++<<<<<<< HEAD
+msgstr "Bebob"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:119
msgid "Revival"
@@@ -14562,7 -14542,7 +15147,11 @@@ msgstr "
#: modules/demux/mp4/id3genres.h:120
msgid "Celtic"
++<<<<<<< HEAD
+msgstr "Keltiskt"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:121
msgid "Bluegrass"
@@@ -14578,7 -14558,7 +15167,11 @@@ msgstr "Gothic rock
#: modules/demux/mp4/id3genres.h:124
msgid "Progressive Rock"
++<<<<<<< HEAD
+msgstr "Progressiv rock"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:125
msgid "Psychedelic Rock"
@@@ -14606,7 -14586,7 +15199,11 @@@ msgstr "Akustisk
#: modules/demux/mp4/id3genres.h:132
msgid "Humour"
++<<<<<<< HEAD
+msgstr "Humor"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:133
msgid "Speech"
@@@ -14662,7 -14642,7 +15259,11 @@@ msgstr "Samba
#: modules/demux/mp4/id3genres.h:147
msgid "Folklore"
++<<<<<<< HEAD
+msgstr "Folklore"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:148
msgid "Ballad"
@@@ -14710,7 -14690,7 +15311,11 @@@ msgstr "
#: modules/demux/mp4/id3genres.h:159
msgid "Drum & Bass"
++<<<<<<< HEAD
+msgstr "Drum and bass"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:160
msgid "Club - House"
@@@ -14766,7 -14746,7 +15371,11 @@@ msgstr "
#: modules/demux/mp4/id3genres.h:173
msgid "Christian Rock"
++<<<<<<< HEAD
+msgstr "Kristen rock"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:174
msgid "Merengue"
@@@ -14852,7 -14832,7 +15461,11 @@@ msgstr "Ursprunglig artist
#: modules/demux/mp4/mp4.c:1071
msgid "Providers Source Content"
++<<<<<<< HEAD
+msgstr "Leverantörer av källinnehåll"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1072
msgid "Warning"
@@@ -14992,8 -14972,6 +15605,11 @@@ msgstr "Visa barnförbjudet material vi
#: modules/demux/playlist/playlist.c:47
msgid "Show NC17 rated video streams when using shoutcast video playlists."
msgstr ""
++<<<<<<< HEAD
+"Visa videoströmmar med klassificeringen NC-17 i videospellistor från "
+"Shoutcast."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/playlist/playlist.c:50
msgid "Skip ads"
@@@ -15035,7 -15013,7 +15651,11 @@@ msgstr "Import av XSPF-spellista
#: modules/demux/playlist/playlist.c:102
msgid "New winamp 5.2 shoutcast import"
++<<<<<<< HEAD
+msgstr "Ny Shoutcast-importering för Winamp 5.2"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/playlist/playlist.c:109
msgid "ASX playlist import"
@@@ -15149,9 -15127,6 +15769,12 @@@ msgid "
"duration. However sometimes this might not be usable. Disable this option to "
"calculate from the bitrate instead."
msgstr ""
++<<<<<<< HEAD
+"Vanligtvis använder vi tidsstämplarna för att beräkna positionen och "
+"varaktigheten för MPEG-filer. Men ibland kanske detta inte är användbart. "
+"Inaktivera detta alternativ för att beräkna från bithastigheten istället."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/ps.c:56 modules/demux/ps.c:69
msgid "MPEG-PS demuxer"
@@@ -15188,7 -15163,7 +15811,11 @@@ msgstr "
#: modules/demux/rawaud.c:53
msgid "Forces the audio language"
++<<<<<<< HEAD
+msgstr "Tvinga ljudspråk"
++=======
+ msgstr "Tvingar ljudspråket"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/rawaud.c:54
msgid ""
@@@ -15376,7 -15351,7 +16003,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Demuxer för MPEG Transport Stream"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -15563,7 -15538,7 +16194,11 @@@ msgid "VLC media player Help
msgstr "Hjälp för VLC media player"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Index"
@@@ -15651,9 -15626,9 +16286,15 @@@ msgstr "Ange ett namn för den nya prof
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Spara"
@@@ -15794,7 -15769,7 +16435,11 @@@ msgstr "Ingen inmatning hittad
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "Strömmen måste spelas upp eller pausas för att bokmärken ska fungera."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Hoppa till tid"
@@@ -15814,7 -15789,7 +16459,11 @@@ msgstr "Klicka för att spela upp elle
msgid "Backward"
msgstr "Bakåt"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15826,7 -15801,7 +16475,11 @@@ msgstr "
msgid "Forward"
msgstr "Framåt"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15850,23 -15825,15 +16503,35 @@@ msgstr "Växla helskärmsläge
msgid "Click to enable fullscreen video playback."
msgstr "Klicka för att aktivera helskärm under uppspelning av video."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "Klicka och håll ned för att hoppa bakåt i aktuell media."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "Klicka och håll ned för att hoppa framåt i aktuell media."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Klicka för att stoppa uppspelning."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Visa/Dölj spellista"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Klicka för att stoppa uppspelning."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Visa/Dölj spellista"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -15874,12 -15841,12 +16539,20 @@@ msgstr "
"Klicka för att växla mellan videoutdata och spellistan. Om ingen video visas "
"i huvudfönstret kommer detta låta dig dölja spellistan."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Upprepa"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -15887,15 -15854,15 +16560,27 @@@ msgstr "
"Klicka för att ändra upprepningsläge. Det finns 3 lägen: upprepa en, upprepa "
"alla och av."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Blanda"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "Klicka för att aktivera eller inaktivera slumpad uppspelning."
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Blanda"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "Klicka för att aktivera eller inaktivera slumpad uppspelning."
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -15903,24 -15870,24 +16588,44 @@@ msgstr "
"Klicka och håll ned musknappen medan du flyttar musen för att använda detta "
"reglage för att justera volymen."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Klicka för att stänga av eller starta ljudet."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Full volym"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Klicka för att spela upp ljudet i maximal volym."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Klicka för att stänga av eller starta ljudet."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Full volym"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Klicka för att spela upp ljudet i maximal volym."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Effekter"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -15928,14 -15895,22 +16633,33 @@@ msgstr "
"Klicka för att visa en panel för ljudeffekter med en equalizer och "
"ytterligare filter."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Klicka för att gå till föregående objekt i spellistan."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Klicka för att gå till nästa objekt i spellistan"
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Klicka för att gå till föregående objekt i spellistan."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Klicka för att gå till nästa objekt i spellistan"
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "Klicka och håll ned för att hoppa bakåt i aktuell media."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "Klicka och håll ned för att hoppa framåt i aktuell media."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Konvertera och strömma"
@@@ -15971,7 -15946,7 +16695,11 @@@ msgstr "Välj en utmatningsplats
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16055,7 -16030,7 +16783,11 @@@ msgstr "Strömplats
#: modules/gui/macosx/ConvertAndSave.m:196
msgid "Stream Announcement"
++<<<<<<< HEAD
+msgstr "Strömmeddelande"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:198 modules/gui/macosx/open.m:195
#: modules/gui/macosx/output.m:137
@@@ -16087,17 -16062,17 +16819,29 @@@ msgstr "Port
#: modules/gui/macosx/wizard.m:400 modules/gui/macosx/wizard.m:432
#: modules/gui/macosx/wizard.m:1798
msgid "SAP Announcement"
++<<<<<<< HEAD
+msgstr "SAP-meddelande"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:205 modules/gui/macosx/output.m:174
#: modules/gui/macosx/output.m:550
msgid "HTTP Announcement"
++<<<<<<< HEAD
+msgstr "HTTP-meddelande"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:206 modules/gui/macosx/output.m:173
#: modules/gui/macosx/output.m:546
msgid "RTSP Announcement"
++<<<<<<< HEAD
+msgstr "RTSP-meddelande"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:207 modules/gui/macosx/output.m:175
#: modules/gui/macosx/output.m:554
@@@ -16136,7 -16111,7 +16880,11 @@@ msgstr "Ingen adress angiven
#: modules/gui/macosx/ConvertAndSave.m:480
msgid "In order to stream, a valid destination address is required."
++<<<<<<< HEAD
+msgstr "För att kunna strömma krävs en giltig destinationsadress."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:485
msgid "No Channel Name given"
@@@ -16156,8 -16131,8 +16904,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Anpassad"
@@@ -16256,36 -16231,36 +17009,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "Fråga inte igen"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "VLC mediauppspelning"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Ingen kraschlogg hittad"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "VLC mediauppspelning"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Ingen kraschlogg hittad"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Fortsätt"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Kunde inte hitta några spår efter en tidigare krasch."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Ta bort gamla inställningar?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Vi hittade just en äldre version av VLC:s inställningsfiler."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Flytta till papperskorgen och starta om VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Kunde inte hitta några spår efter en tidigare krasch."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Ta bort gamla inställningar?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Vi hittade just en äldre version av VLC:s inställningsfiler."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Flytta till papperskorgen och starta om VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC-felsökningslogg (%s).rtf"
@@@ -16334,11 -16309,11 +17119,19 @@@ msgstr "
#: modules/gui/macosx/macosx.m:70
msgid "Auto-playback of new items"
++<<<<<<< HEAD
+msgstr "Spela automatiskt upp nya objekt"
+
+#: modules/gui/macosx/macosx.m:71
+msgid "Start playback of new items immediately once they were added."
+msgstr "Starta uppspelning av nya objekt direkt när de läggs till."
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:71
+ msgid "Start playback of new items immediately once they were added."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:74
msgid "Keep Recent Items"
@@@ -16349,8 -16324,6 +17142,11 @@@ msgid "
"By default, VLC keeps a list of the last 10 items. This feature can be "
"disabled here."
msgstr ""
++<<<<<<< HEAD
+"Som standard har VLC en lista över de 10 senaste objekten. Denna funktion "
+"kan inaktiveras här."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:78 modules/gui/macosx/simple_prefs.m:364
msgid "Control playback with the Apple Remote"
@@@ -16358,31 -16331,27 +17154,49 @@@ msgstr "Styr uppspelning med Apple Remo
#: modules/gui/macosx/macosx.m:79
msgid "By default, VLC can be remotely controlled with the Apple Remote."
++<<<<<<< HEAD
+msgstr "Som standard kan VLC fjärrstyras med Apple Remote."
+
+#: modules/gui/macosx/macosx.m:81 modules/gui/macosx/simple_prefs.m:365
+msgid "Control system volume with the Apple Remote"
+msgstr "Kontrollera systemvolymen med Apple Remote"
++=======
+ msgstr ""
+
+ #: modules/gui/macosx/macosx.m:81 modules/gui/macosx/simple_prefs.m:365
+ msgid "Control system volume with the Apple Remote"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:82
msgid ""
"By default, VLC will control its own volume with the Apple Remote. However, "
"you can choose to control the global system volume instead."
msgstr ""
++<<<<<<< HEAD
+"Som standard kommer VLC kontrollera sin egen volym med Apple Remote. Men du "
+"kan välja att kontrollera den globala systemvolymen istället."
+
+#: modules/gui/macosx/macosx.m:84
+msgid "Control playlist items with the Apple Remote"
+msgstr "Kontrollera objekt i spellistan med Apple Remote"
++=======
+
+ #: modules/gui/macosx/macosx.m:84
+ msgid "Control playlist items with the Apple Remote"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:85
msgid ""
"By default, VLC will allow you to switch to the next or previous item with "
"the Apple Remote. You can disable this behavior with this option."
msgstr ""
++<<<<<<< HEAD
+"Som standard kommer VLC låta dig byta till nästa eller föregående objekt med "
+"Apple Remote. Du kan inaktivera denna funktion med detta alternativ."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:87 modules/gui/macosx/simple_prefs.m:366
msgid "Control playback with media keys"
@@@ -16406,7 -16375,7 +17220,11 @@@ msgstr "
#: modules/gui/macosx/macosx.m:94 modules/gui/macosx/simple_prefs.m:361
msgid "Use the native fullscreen mode"
++<<<<<<< HEAD
+msgstr "Använd det ursprungliga helskärmsläget"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:95
msgid ""
@@@ -16414,13 -16383,11 +17232,20 @@@
"releases. It can also use the native fullscreen mode on Mac OS X 10.7 and "
"later."
msgstr ""
++<<<<<<< HEAD
+"Som standard använder VLC helskärmsläget från tidigare utgåvor av Mac OS X. "
+"Den kan också använda det inbyggda helskärmsläget i Mac OS X 10.7 och senare."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:97 modules/gui/macosx/simple_prefs.m:370
#: modules/gui/qt4/qt4.cpp:86
msgid "Resize interface to the native video size"
++<<<<<<< HEAD
+msgstr "Ändra gränssnittets storlek till videons ursprungliga storlek"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:98 modules/gui/qt4/qt4.cpp:87
msgid ""
@@@ -16429,11 -16396,6 +17254,14 @@@
" - The video will fit to the interface size\n"
" By default, interface resize to the native video size."
msgstr ""
++<<<<<<< HEAD
+"Du har två alternativ:\n"
+" - Gränssnittets storlek ändrar sig efter videons ursprungliga storlek\n"
+" - Videon anpassar sig efter gränssnittets storlek\n"
+" Som standard kommer gränssnittets storlek ändrar sig efter videons "
+"ursprungliga storlek."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:103 modules/gui/macosx/simple_prefs.m:371
#: modules/gui/qt4/qt4.cpp:170
@@@ -16445,8 -16407,6 +17273,11 @@@ msgid "
"With this option enabled, the playback will be automatically paused when "
"minimizing the window."
msgstr ""
++<<<<<<< HEAD
+"Med detta alternativ aktiverat kommer uppspelningen automatiskt pausas när "
+"fönstret minimeras."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:107 modules/gui/qt4/qt4.cpp:174
msgid "Allow automatic icon changes"
@@@ -16458,7 -16418,7 +17289,11 @@@ msgid "
msgstr ""
"Detta alternativ låter gränssnittet ändra sin ikon vid olika tillfällen."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Lås bildförhållande"
@@@ -16476,7 -16436,7 +17311,11 @@@ msgstr "Visa knapparna Blanda och Uppre
#: modules/gui/macosx/macosx.m:116
msgid "Shows the shuffle and repeat buttons in the main window."
++<<<<<<< HEAD
+msgstr "Visar knapparna för att blanda och slinga i huvudfönstret."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:118 modules/gui/macosx/MainMenu.m:342
msgid "Show Audio Effects Button"
@@@ -16492,7 -16452,7 +17331,11 @@@ msgstr "Visa sidofältet
#: modules/gui/macosx/macosx.m:122
msgid "Shows a sidebar in the main window listing media sources."
++<<<<<<< HEAD
+msgstr "Visar ett sidofält i huvudfönstret som listar upp mediakällor."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:124
msgid "Pause iTunes during VLC playback"
@@@ -16537,7 -16497,7 +17380,11 @@@ msgstr "Beteende
#: modules/gui/macosx/macosx.m:166
msgid "Apple Remote and media keys"
++<<<<<<< HEAD
+msgstr "Apple Remote och mediatangenter"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:181
msgid "Video output"
@@@ -16584,13 -16544,13 +17431,23 @@@ msgstr "Tjänster
#: modules/gui/macosx/MainMenu.m:315
msgid "Hide VLC"
++<<<<<<< HEAD
+msgstr "Göm VLC"
+
+#: modules/gui/macosx/MainMenu.m:316
+msgid "Hide Others"
+msgstr "Göm övriga"
+
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ msgstr "Dölj VLC"
+
+ #: modules/gui/macosx/MainMenu.m:316
+ msgid "Hide Others"
+ msgstr "Dölj andra"
+
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Visa alla"
@@@ -16624,7 -16584,7 +17481,11 @@@ msgstr "Öppna fångstenhet...
#: modules/gui/macosx/MainMenu.m:326
msgid "Open Recent"
++<<<<<<< HEAD
+msgstr "Öppna senaste"
++=======
+ msgstr "Öppna tidigare"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:327
msgid "Streaming/Exporting Wizard..."
@@@ -16675,15 -16635,15 +17536,27 @@@ msgstr "Spårsynkronisering
msgid "A→B Loop"
msgstr "A→B-slinga"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Avsluta efter uppspelning"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Stega framåt"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Avsluta efter uppspelning"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Stega framåt"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Stega bakåt"
@@@ -16699,30 -16659,30 +17572,56 @@@ msgstr "Sänk volymen
msgid "Audio Device"
msgstr "Ljudenhet"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Halv storlek"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Normal storlek"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dubbel storlek"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Anpassa till skärm"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Halv storlek"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Normal storlek"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dubbel storlek"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Anpassa till skärm"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Flyt överst"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Enhet för helskärmsvideo"
@@@ -16731,7 -16691,7 +17630,11 @@@
msgid "Post processing"
msgstr "Efterbehandling"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Lägg till undertextfil..."
@@@ -16813,7 -16773,7 +17716,11 @@@ msgstr "Fel och varningar...
#: modules/gui/macosx/MainMenu.m:445
msgid "Bring All to Front"
++<<<<<<< HEAD
+msgstr "Lägg alla överst"
++=======
+ msgstr "Ta fram alla"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:447 modules/gui/qt4/dialogs/help.cpp:54
#: modules/gui/qt4/menus.cpp:931
@@@ -16848,16 -16808,12 +17755,22 @@@ msgstr "Onlineforum...
msgid ""
"Enter a term to search the playlist. Results will be selected in the table."
msgstr ""
++<<<<<<< HEAD
+"Ange en term för att söka i spellistan. Resultaten kommer att visas i "
+"tabellen."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainWindow.m:172
msgid ""
"Click to open an advanced dialog to select the media to play. You can also "
"drop files here to play."
msgstr ""
++<<<<<<< HEAD
+"Klicka för att öppna en avancerad dialogruta för att välja media för "
+"uppspelning. Du kan också släppa filer här för uppspelning."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainWindow.m:175 modules/gui/macosx/MainWindow.m:180
#: modules/gui/qt4/components/playlist/selector.cpp:591
@@@ -16877,7 -16833,7 +17790,11 @@@ msgstr "Prenumerera på en poddsändnin
#: modules/gui/macosx/MainWindow.m:178
#: modules/gui/qt4/components/playlist/selector.cpp:592
msgid "Enter URL of the podcast to subscribe to:"
++<<<<<<< HEAD
+msgstr "Ange URL:en till poddsändningen att prenumerera på:"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainWindow.m:181
msgid "Unsubscribe from a podcast"
@@@ -16966,7 -16922,7 +17883,11 @@@ msgid "Play another media synchronously
msgstr "Spela upp ett annat media synkront"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Välj..."
@@@ -17141,14 -17097,14 +18062,22 @@@ msgstr "Bildrutor/s
msgid "Subtitle encoding"
msgstr "Undertextavkodning"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Typsnittsstorlek"
#: modules/gui/macosx/open.m:378
msgid "Subtitle alignment"
++<<<<<<< HEAD
+msgstr "Undertextjustering"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:381
msgid "Click to dismiss the subtitle setup dialog."
@@@ -17370,12 -17326,12 +18299,20 @@@ msgstr "Fel vid sparning av meta
msgid "VLC was unable to save the meta data."
msgstr "VLC kunde inte spara metadata."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Inställningar"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Återställ alla"
@@@ -17510,7 -17466,7 +18447,11 @@@ msgstr "
#: modules/gui/macosx/simple_prefs.m:350
msgid "Note that these are system-wide settings."
++<<<<<<< HEAD
+msgstr "Observera att dessa inställningar gäller för hela systemet."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/simple_prefs.m:356
msgid "Interface style"
@@@ -17554,130 -17510,125 +18495,238 @@@ msgstr "Aktivera Growl-notifieringar (v
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Pausa iTunes när VLC spelar upp"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Standardkodning"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Visningsinställningar"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Standardkodning"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Visningsinställningar"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Typsnittsfärg"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Typsnitt"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Språk för undertexter"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Språk för undertexter"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Föredraget undertextspråk"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Aktivera skärmtext"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Aktivera skärmtext"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Opacitet"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Tvinga fetstil"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Tvinga fetstil"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Konturfärg"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Konturtjocklek"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Svarta skärmar i helskärmsläge"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Svarta skärmar i helskärmsläge"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Visning"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Utmatningsmodul"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Videoskärmbilder"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Mapp"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Format"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Prefix"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Sekvensnumrering"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Kontrollerades senast: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Ingen kontroll har gjorts ännu."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Utmatningsmodul"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Videoskärmbilder"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Mapp"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Format"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Prefix"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Sekvensnumrering"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Kontrollerades senast: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Ingen kontroll har gjorts ännu."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Lägsta latens"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "LÃ¥g latens"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Hög latens"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Högre latens"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Återställ inställningar"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17699,20 -17650,20 +18748,37 @@@ msgstr "
"\n"
"Vill du verkligen fortsätta?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Välj den mapp att spara dina videoskärmbilder till."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Välj"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Välj en katalog eller filnamn där inspelningarna ska lagras."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Välj den mapp att spara dina videoskärmbilder till."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Välj"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Välj en katalog eller filnamn där inspelningarna ska lagras."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -17720,16 -17671,16 +18786,29 @@@ msgstr "
"Tryck på nya tangenter för\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Ogiltig kombination"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Tyvärr kan dessa tangenter inte tilldelas som snabbtangenter."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Ogiltig kombination"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Tyvärr kan dessa tangenter inte tilldelas som snabbtangenter."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Denna kombination är redan tagen av \"%@\"."
@@@ -17768,7 -17719,7 +18847,11 @@@ msgstr "Undertextsynkronisering:
#: modules/gui/macosx/TrackSynchronization.m:68
msgid "A positive value means that the subtitles are ahead of the video"
++<<<<<<< HEAD
+msgstr "Ett positivt värde innebär att undertexterna ligger före videon."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/TrackSynchronization.m:69
#: modules/gui/qt4/components/extended_panels.cpp:1487
@@@ -17782,7 -17733,7 +18865,11 @@@ msgstr "bilder/s
#: modules/gui/macosx/TrackSynchronization.m:71
#: modules/gui/qt4/components/extended_panels.cpp:1501
msgid "Subtitle duration factor:"
++<<<<<<< HEAD
+msgstr "Varaktighetsfaktor för undertext:"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/TrackSynchronization.m:79
#: modules/gui/qt4/components/extended_panels.cpp:1612
@@@ -17836,7 -17787,7 +18923,11 @@@ msgstr "Bildjustering
#: modules/gui/macosx/VideoEffects.m:93
#: modules/gui/qt4/ui/video_effects.h:1305
msgid "Brightness Threshold"
++<<<<<<< HEAD
+msgstr "Tröskel för ljusnivå"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:97 modules/video_filter/sharpen.c:67
#: modules/gui/qt4/ui/video_effects.h:1309
@@@ -17862,7 -17813,7 +18953,11 @@@ msgstr "Radie
#: modules/gui/macosx/VideoEffects.m:101
#: modules/gui/qt4/ui/video_effects.h:1313
msgid "Film Grain"
++<<<<<<< HEAD
+msgstr "Filmkorn"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:102 modules/video_filter/grain.c:53
#: modules/gui/qt4/ui/video_effects.h:1314
@@@ -17992,7 -17943,7 +19087,11 @@@ msgstr "Posterisera
#: modules/gui/macosx/VideoEffects.m:154 modules/video_filter/posterize.c:60
msgid "Posterize level"
++<<<<<<< HEAD
+msgstr "Färgreduceringsnivå"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:155 modules/video_filter/motionblur.c:59
#: modules/gui/qt4/ui/video_effects.h:1387
@@@ -18755,15 -18706,15 +19854,27 @@@ msgstr "[Spellista]
#: modules/gui/ncurses.c:904
msgid " r Toggle Random playing"
++<<<<<<< HEAD
+msgstr "r Växla slumpmässig uppspelning"
+
+#: modules/gui/ncurses.c:905
+msgid " l Toggle Loop Playlist"
+msgstr "l Växla slingande spellista"
+
+#: modules/gui/ncurses.c:906
+msgid " R Toggle Repeat item"
+msgstr "R Växla upprepande objekt"
++=======
+ msgstr ""
+
+ #: modules/gui/ncurses.c:905
+ msgid " l Toggle Loop Playlist"
+ msgstr ""
+
+ #: modules/gui/ncurses.c:906
+ msgid " R Toggle Repeat item"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:907
msgid " o Order Playlist by title"
@@@ -18771,19 -18722,19 +19882,35 @@@ msgstr " o Sortera spellistan efter tit
#: modules/gui/ncurses.c:908
msgid " O Reverse order Playlist by title"
++<<<<<<< HEAD
+msgstr " O Kasta om spellistans ordning efter titel"
+
+#: modules/gui/ncurses.c:909
+msgid " g Go to the current playing item"
+msgstr " g GÃ¥ till det aktuella uppspelningsobjektet"
+
+#: modules/gui/ncurses.c:910
+msgid " / Look for an item"
+msgstr " / Leta efter ett objekt"
+
+#: modules/gui/ncurses.c:911
+msgid " ; Look for the next item"
+msgstr " ; Leta efter nästa objekt"
++=======
+ msgstr ""
+
+ #: modules/gui/ncurses.c:909
+ msgid " g Go to the current playing item"
+ msgstr ""
+
+ #: modules/gui/ncurses.c:910
+ msgid " / Look for an item"
+ msgstr ""
+
+ #: modules/gui/ncurses.c:911
+ msgid " ; Look for the next item"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:912
msgid " A Add an entry"
@@@ -18796,7 -18747,7 +19923,11 @@@ msgstr "D, <backspace>, <del> Radera e
#: modules/gui/ncurses.c:915
msgid " e Eject (if stopped)"
++<<<<<<< HEAD
+msgstr " e Mata ut (om den stoppas)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:919
msgid "[Filebrowser]"
@@@ -18969,7 -18920,7 +20100,11 @@@ msgstr "Öppna undertexter
#: modules/gui/qt4/components/controller.hpp:121
msgid "Dock fullscreen controller"
++<<<<<<< HEAD
+msgstr "Fäst helskärmskontroller"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:124
msgid "Stop playback"
@@@ -19021,7 -18972,7 +20156,11 @@@ msgstr "Omvänd
#: modules/gui/qt4/components/controller.hpp:132
msgid "Change the loop and repeat modes"
++<<<<<<< HEAD
+msgstr "Ändra slinga- och upprepningslägen"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:133
msgid "Previous media in the playlist"
@@@ -19038,7 -18989,7 +20177,11 @@@ msgstr "Öppna undertextfil
#: modules/gui/qt4/components/controller.hpp:135
msgid "Dock/undock fullscreen controller to/from bottom of screen"
++<<<<<<< HEAD
+msgstr "Sätt fast/ta loss helskärmskontroller till/från skärmens nederkant"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller_widget.cpp:138
msgctxt "Tooltip|Unmute"
@@@ -19624,8 -19575,6 +20767,11 @@@ msgid "
"Double click to change.\n"
"Delete key to remove."
msgstr ""
++<<<<<<< HEAD
+"Dubbelklicka för att ändra.\n"
+"Tryck på Delete för att ta bort."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1410
msgid "Hotkey change"
@@@ -19739,20 -19688,20 +20885,36 @@@ msgstr "Ta bort vald profil
msgid "Create a new profile"
msgstr "Skapa en ny profil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Skapa"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "Denna muxer tillhandahålls inte direkt av VLC: Den kan saknas."
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Profilnamnet saknas"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr "Denna muxer tillhandahålls inte direkt av VLC: Den kan saknas."
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Profilnamnet saknas"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Du måste ange ett namn för profilen."
@@@ -19959,7 -19908,7 +21121,11 @@@ msgstr "
"in personliga uppgifter eller skickar dem, inte ens i anonymt format, till "
"någon.</p>\n"
"<p>Ändå kan <i>VLC</i> automatiskt samla in information om media i din "
++<<<<<<< HEAD
+"spellista med Internetbaserade tjänster från tredjepart. Det inkluderar "
++=======
+ "spellista från tredjeparts Internetbaserade tjänster. Det inkluderar "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"albumomslag, spårnamn, författare och annan metadata.</p>\n"
"Det kan innebära att en del av din mediafiler identifieras till "
"tredjepartsföretag. Därför behöver <i>VLCs</i> utvecklare ditt uttryckliga "
@@@ -19975,7 -19924,7 +21141,11 @@@ msgstr "Hämta mediainfo automatiskt
#: modules/gui/qt4/dialogs/firstrun.cpp:103
msgid "Regularly check for VLC updates"
++<<<<<<< HEAD
+msgstr "Kolla regelbundet om det finns uppdateringar för VLC"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/gototime.cpp:42
msgid "Go to Time"
@@@ -20316,7 -20265,7 +21486,11 @@@ msgstr "Verktygsfältselement
#: modules/gui/qt4/dialogs/toolbar.cpp:71
msgid "Next widget style:"
++<<<<<<< HEAD
+msgstr "Utseende för nästa element:"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/toolbar.cpp:72
msgid "Flat Button"
@@@ -20328,7 -20277,7 +21502,11 @@@ msgstr "Stor knapp
#: modules/gui/qt4/dialogs/toolbar.cpp:74
msgid "Native Slider"
++<<<<<<< HEAD
+msgstr "Inbyggt reglage"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/toolbar.cpp:85
msgid "Main Toolbar"
@@@ -20356,7 -20305,7 +21534,11 @@@ msgstr "Rad 2:
#: modules/gui/qt4/dialogs/toolbar.cpp:115
msgid "Advanced Widget toolbar:"
++<<<<<<< HEAD
+msgstr "Avancerade kontroller:"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/toolbar.cpp:126
msgid "Time Toolbar"
@@@ -20396,7 -20345,7 +21578,11 @@@ msgstr "Utfyllnad
#: modules/gui/qt4/dialogs/toolbar.cpp:320
msgid "Expanding Spacer"
++<<<<<<< HEAD
+msgstr "Utvidgad utfyllnad"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/toolbar.cpp:350
msgid "Splitter"
@@@ -20404,7 -20353,7 +21590,11 @@@ msgstr "Avdelare
#: modules/gui/qt4/dialogs/toolbar.cpp:357
msgid "Time Slider"
++<<<<<<< HEAD
+msgstr "Tidsreglage"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/toolbar.cpp:370
msgid "Small Volume"
@@@ -20424,11 -20373,11 +21614,19 @@@ msgstr "Uppspelningsknappar
#: modules/gui/qt4/dialogs/toolbar.cpp:453
msgid "Aspect ratio selector"
++<<<<<<< HEAD
+msgstr "Bildformatsväljare"
+
+#: modules/gui/qt4/dialogs/toolbar.cpp:457
+msgid "Speed selector"
+msgstr "Hastighetsväljare"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs/toolbar.cpp:457
+ msgid "Speed selector"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/vlm.cpp:73
msgid "Broadcast"
@@@ -20461,7 -20410,7 +21659,11 @@@ msgstr "Upprepningsfördröjning:
#: modules/gui/qt4/dialogs/vlm.cpp:111
#: modules/gui/qt4/ui/sprefs_interface.h:540
msgid " days"
++<<<<<<< HEAD
+msgstr " dygn"
++=======
+ msgstr " dagar"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/vlm.cpp:130
msgid "I&mport"
@@@ -20885,13 -20834,10 +22087,20 @@@ msgid "
"extended panel. This option only works with Windows and X11 with composite "
"extensions."
msgstr ""
++<<<<<<< HEAD
+"Anger fönstrets opacitet mellan 0.1 och 1 för huvudgränssnittet, spellistan "
+"och utvidgade paneler. Detta alternativ fungerar endast med Windows och X11 "
+"med komposittillägg."
+
+#: modules/gui/qt4/qt4.cpp:107
+msgid "Fullscreen controller opacity between 0.1 and 1"
+msgstr "Opacitet för helskärmskontroller mellan 0.1 och 1"
++=======
+
+ #: modules/gui/qt4/qt4.cpp:107
+ msgid "Fullscreen controller opacity between 0.1 and 1"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:108
msgid ""
@@@ -20899,9 -20845,6 +22108,12 @@@
"playlist and extended panel. This option only works with Windows and X11 "
"with composite extensions."
msgstr ""
++<<<<<<< HEAD
+"Anger opaciteten för helskärmskontrollerna mellan 0.1 och 1 för "
+"huvudgränssnittet, spellistan och utvidgade paneler. Detta alternativ "
+"fungerar endast med Windows och X11 med komposittillägg."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:114
msgid "Show unimportant error and warnings dialogs"
@@@ -20989,7 -20932,7 +22201,11 @@@ msgstr "Läs in tillägg vid uppstart
#: modules/gui/qt4/qt4.cpp:151
msgid "Automatically load the extensions module on startup"
++<<<<<<< HEAD
+msgstr "Läs automatiskt in tilläggsmodulen vid uppstart"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:154
msgid "Start in minimal view (without menus)"
@@@ -21004,16 -20947,14 +22220,27 @@@ msgid "
"Display background cone or current album art when not playing. Can be "
"disabled to prevent burning screen."
msgstr ""
++<<<<<<< HEAD
+"Visa bakgrundkonen eller aktuellt albumomslag när ingenting spelas upp. Kan "
+"inaktiveras för att förhindra inbränning på skärmen."
+
+#: modules/gui/qt4/qt4.cpp:160
+msgid "Expanding background cone or art."
+msgstr "Expanderande bakgrundskon eller bild."
+
+#: modules/gui/qt4/qt4.cpp:161
+msgid "Background art fits window's size"
+msgstr "Anpassa bakgrundsbilden efter fönsterstorleken"
++=======
+
+ #: modules/gui/qt4/qt4.cpp:160
+ msgid "Expanding background cone or art."
+ msgstr ""
+
+ #: modules/gui/qt4/qt4.cpp:161
+ msgid "Background art fits window's size"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:163
msgid "Ignore keyboard volume buttons."
@@@ -21026,10 -20967,6 +22253,13 @@@ msgid "
"unchecked, the volume buttons will change VLC's volume when VLC is selected "
"and change the system volume when VLC is not selected."
msgstr ""
++<<<<<<< HEAD
+"Med detta alternativ aktiverat kommer knapparna som höjer, sänker och "
+"stänger av volymen på ditt tangentbord alltid ändra systemvolymen. Med detta "
+"alternativ inaktiverat kommer volymknapparna ändra VLC:s volym när VLC är "
+"markerat och ändra systemvolymen när VLC inte är markerat."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:184
msgid "Never"
@@@ -21180,12 -21117,10 +22410,19 @@@ msgid "
"Lua interface configuration string. Format is: '[\"<interface module name>"
"\"] = { <option> = <value>, ...}, ...'."
msgstr ""
++<<<<<<< HEAD
+"Konfigurationssträng för gränssnittet Lua. Formatet är: '[\"<namn för "
+"gränssnittsmodulen>\"] = { <alternativ> = <värde>, ...}, ...'."
+
+#: modules/lua/vlc.c:54 modules/lua/vlc.c:70
+msgid "A single password restricts access to this interface."
+msgstr "Ett enda lösenord begränsar tillgången till detta gränssnitt."
++=======
+
+ #: modules/lua/vlc.c:54 modules/lua/vlc.c:70
+ msgid "A single password restricts access to this interface."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:56 modules/lua/vlc.c:57
msgid "Source directory"
@@@ -21225,7 -21160,7 +22462,11 @@@ msgstr "
#: modules/lua/vlc.c:75
msgid "CLI input"
++<<<<<<< HEAD
+msgstr "CLI-inmatning"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:76
msgid ""
@@@ -22156,20 -22091,20 +23397,36 @@@ msgstr "Skrivbord
#: modules/stream_filter/dash/dash.cpp:51
#: modules/stream_filter/dash/dash.cpp:52
msgid "Preferred Width"
++<<<<<<< HEAD
+msgstr "Föredragen bredd"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/dash/dash.cpp:54
#: modules/stream_filter/dash/dash.cpp:55
msgid "Preferred Height"
++<<<<<<< HEAD
+msgstr "Föredragen höjd"
+
+#: modules/stream_filter/dash/dash.cpp:57
+msgid "Buffer Size (Seconds)"
+msgstr "Buffertstorlek (sekunder)"
+
+#: modules/stream_filter/dash/dash.cpp:58
+msgid "Buffer size in seconds"
+msgstr "Buffertstorlek i sekunder"
++=======
+ msgstr ""
+
+ #: modules/stream_filter/dash/dash.cpp:57
+ msgid "Buffer Size (Seconds)"
+ msgstr ""
+
+ #: modules/stream_filter/dash/dash.cpp:58
+ msgid "Buffer size in seconds"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/dash/dash.cpp:61
msgid "DASH"
@@@ -22189,7 -22124,7 +23446,11 @@@ msgstr "
#: modules/stream_filter/decomp.c:68
msgid "gzip decompression"
++<<<<<<< HEAD
+msgstr "dekomprimering av gzip"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/httplive.c:55
msgid "Http Live Streaming stream filter"
@@@ -22197,7 -22132,7 +23458,11 @@@ msgstr "
#: modules/stream_filter/record.c:49
msgid "Internal stream record"
++<<<<<<< HEAD
+msgstr "Intern ströminspelning"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/smooth/smooth.c:61
msgid "Smooth Streaming"
@@@ -22456,7 -22391,7 +23721,11 @@@ msgstr "Sida
#: modules/stream_out/langfromtelx.c:50
msgid "Specify the page containing the language"
++<<<<<<< HEAD
+msgstr "Ange sidan som innehåller språket"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/langfromtelx.c:51
msgid "Row"
@@@ -22464,7 -22399,7 +23733,11 @@@ msgstr "Rad
#: modules/stream_out/langfromtelx.c:53
msgid "Specify the row containing the language"
++<<<<<<< HEAD
+msgstr "Ange raden som innehåller språket"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/langfromtelx.c:61
msgid "Lang From Telx"
@@@ -22864,7 -22799,7 +24137,11 @@@ msgstr "Smem
#: modules/stream_out/smem.c:97
msgid "Stream output to memory buffer"
++<<<<<<< HEAD
+msgstr "Strömma utmatning till minnesbuffert"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/standard.c:43
msgid "Output method to use for the stream."
@@@ -22888,7 -22823,7 +24165,11 @@@ msgstr "
#: modules/stream_out/standard.c:50
msgid "address to bind to (helper setting for dst)"
++<<<<<<< HEAD
+msgstr "adress att sammanbinda (hjälpinställning för dst)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/standard.c:52
msgid ""
@@@ -22898,7 -22833,7 +24179,11 @@@ msgstr "
#: modules/stream_out/standard.c:54
msgid "filename for stream (helper setting for dst)"
++<<<<<<< HEAD
+msgstr "filnamn för ström (hjälpinställning för dst)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/standard.c:56
msgid ""
@@@ -22908,7 -22843,7 +24193,11 @@@ msgstr "
#: modules/stream_out/standard.c:91
msgid "Standard stream output"
++<<<<<<< HEAD
+msgstr "Standardströmsutmatning"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:44
msgid "Video encoder"
@@@ -23120,47 -23055,45 +24409,84 @@@ msgstr "Omkoda utgångsström
msgid "Overlays/Subtitles"
msgstr "Overlays/Undertexter"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Teckensnitt med fast bredd"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Typsnittsfamilj för typsnittet du vill använda"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Fil för typsnittet som du vill använda"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Typsnittsstorlek i bildpunkter"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Teckensnitt med fast bredd"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Typsnittsfamilj för typsnittet du vill använda"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Fil för typsnittet som du vill använda"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Typsnittsstorlek i bildpunkter"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Opacitet för text"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Opacitet för text"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+"Opacitet (motsats till genomskinlighet) för text som ska renderas på videon. "
+"0 = genomskinlig, 255 = helt opak. "
+
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Standardfärg för text"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23169,93 -23102,93 +24495,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Relativ typsnittsstorlek"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Opacitet för bakgrund"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Bakgrundsfärg"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Konturopacitet"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Opacitet för skugga"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Skuggfärg"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Skuggvinkel"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Skuggavstånd"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Opacitet för bakgrund"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Bakgrundsfärg"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Konturopacitet"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Opacitet för skugga"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Skuggfärg"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Skuggvinkel"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Skuggavstånd"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Mindre"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Liten"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Stor"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Större"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Använd YUVP-renderare"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Använd YUVP-renderare"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Tunn"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Tjock"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Textrenderare"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2-typsnittsrenderare"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Tunn"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Tjock"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Textrenderare"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2-typsnittsrenderare"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -23463,17 -23396,6 +24869,20 @@@ msgid "
"You can also have a look at pictures and some movies showing such a device "
"in live action."
msgstr ""
++<<<<<<< HEAD
+"Denna modul låter dig kontrollera en så kallad AtmoLight-enhet som ansluts "
+"till din dator.\n"
+"AtmoLight är en hemmagjord version av vad Philips kallar \"AmbiLight\".\n"
+"Om du behöver mer information kan du besöka oss på\n"
+"\n"
+"http://www.vdr-wiki.de/wiki/index.php/Atmo-plugin\n"
+"http://www.vdr-wiki.de/wiki/index.php/AtmoWin\n"
+"\n"
+"Där kan du hitta detaljerade beskrivningar på hur du själv kan bygga en och "
+"var man kan hitta de nödvändiga delarna.\n"
+"Du kan också titta på några bilder och filmer där en sådan enhet används."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:134
msgid "Device type"
@@@ -23487,7 -23409,7 +24896,11 @@@ msgstr "
#: modules/video_filter/atmo/atmo.cpp:152
msgid "AtmoWin Software"
++<<<<<<< HEAD
+msgstr "AtmoWin-programvara"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:154
msgid "Classic AtmoLight"
@@@ -23578,7 -23500,7 +24991,11 @@@ msgstr "
#: modules/video_filter/atmo/atmo.cpp:199
msgid "Mark analyzed pixels"
++<<<<<<< HEAD
+msgstr "Markera analyserade bildpunkter"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:200
msgid "makes the sample grid visible on screen as white pixels"
@@@ -23586,101 -23508,96 +25003,186 @@@ msgstr "
#: modules/video_filter/atmo/atmo.cpp:203
msgid "Color when paused"
++<<<<<<< HEAD
+msgstr "Färg vid paus"
++=======
+ msgstr "Färg när pausad"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:204
msgid ""
"Set the color to show if the user pauses the video. (Have light to get "
"another beer?)"
msgstr ""
++<<<<<<< HEAD
+"Ange färgen som ska visas om användaren pausar videon. (Kan användas för att "
+"säga till när det är dags att hämta någonting att dricka.)"
+
+#: modules/video_filter/atmo/atmo.cpp:207
+msgid "Pause-Red"
+msgstr "Röd nyans för pausning"
+
+#: modules/video_filter/atmo/atmo.cpp:208
+msgid "Red component of the pause color"
+msgstr "Röd komponent för pausfärgen"
+
+#: modules/video_filter/atmo/atmo.cpp:209
+msgid "Pause-Green"
+msgstr "Grön nyans för pausning"
+
+#: modules/video_filter/atmo/atmo.cpp:210
+msgid "Green component of the pause color"
+msgstr "Grön komponent för pausfärgen"
+
+#: modules/video_filter/atmo/atmo.cpp:211
+msgid "Pause-Blue"
+msgstr "Blå nyans för pausning"
+
+#: modules/video_filter/atmo/atmo.cpp:212
+msgid "Blue component of the pause color"
+msgstr "Blå komponent för pausfärgen"
+
+#: modules/video_filter/atmo/atmo.cpp:213
+msgid "Pause-Fadesteps"
+msgstr "Toningssteg för pausning"
++=======
+
+ #: modules/video_filter/atmo/atmo.cpp:207
+ msgid "Pause-Red"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:208
+ msgid "Red component of the pause color"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:209
+ msgid "Pause-Green"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:210
+ msgid "Green component of the pause color"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:211
+ msgid "Pause-Blue"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:212
+ msgid "Blue component of the pause color"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:213
+ msgid "Pause-Fadesteps"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:214
msgid ""
"Number of steps to change current color to pause color (each step takes 40ms)"
msgstr ""
++<<<<<<< HEAD
+"Antal steg för att ändra aktuell färg till pausfärgen (varje steg tar 40ms)"
+
+#: modules/video_filter/atmo/atmo.cpp:217
+msgid "End-Red"
+msgstr "Röd nyans för avstängning"
+
+#: modules/video_filter/atmo/atmo.cpp:218
+msgid "Red component of the shutdown color"
+msgstr "Röd komponent för avstängningsfärgen"
+
+#: modules/video_filter/atmo/atmo.cpp:219
+msgid "End-Green"
+msgstr "Grönnyans för avstängning"
+
+#: modules/video_filter/atmo/atmo.cpp:220
+msgid "Green component of the shutdown color"
+msgstr "Grön komponent för avstängningsfärgen"
+
+#: modules/video_filter/atmo/atmo.cpp:221
+msgid "End-Blue"
+msgstr "Blå nyans för avstängning"
+
+#: modules/video_filter/atmo/atmo.cpp:222
+msgid "Blue component of the shutdown color"
+msgstr "Blå komponent för avstängningsfärgen"
+
+#: modules/video_filter/atmo/atmo.cpp:223
+msgid "End-Fadesteps"
+msgstr "Toningssteg för avstängning"
++=======
+
+ #: modules/video_filter/atmo/atmo.cpp:217
+ msgid "End-Red"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:218
+ msgid "Red component of the shutdown color"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:219
+ msgid "End-Green"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:220
+ msgid "Green component of the shutdown color"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:221
+ msgid "End-Blue"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:222
+ msgid "Blue component of the shutdown color"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:223
+ msgid "End-Fadesteps"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:224
msgid ""
"Number of steps to change current color to end color for dimming up the "
"light in cinema style... (each step takes 40ms)"
msgstr ""
++<<<<<<< HEAD
+"Antal steg för att ändra aktuell färg till avstängningsfärgen för att dimma "
+"upp ljuset i biostil... (varje steg tar 40ms)"
+
+#: modules/video_filter/atmo/atmo.cpp:228
+msgid "Number of zones on top"
+msgstr "Antal zoner i överkanten"
+
+#: modules/video_filter/atmo/atmo.cpp:229
+msgid "Number of zones on the top of the screen"
+msgstr "Antal zoner i skärmens överkant"
+
+#: modules/video_filter/atmo/atmo.cpp:230
+msgid "Number of zones on bottom"
+msgstr "Antal zoner i nederkanten"
+
+#: modules/video_filter/atmo/atmo.cpp:231
+msgid "Number of zones on the bottom of the screen"
+msgstr "Antal zoner i skärmens nederkant"
++=======
+
+ #: modules/video_filter/atmo/atmo.cpp:228
+ msgid "Number of zones on top"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:229
+ msgid "Number of zones on the top of the screen"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:230
+ msgid "Number of zones on bottom"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:231
+ msgid "Number of zones on the bottom of the screen"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:232
msgid "Zones on left / right side"
@@@ -23688,11 -23605,11 +25190,19 @@@ msgstr "Zoner på vänstra / högra sid
#: modules/video_filter/atmo/atmo.cpp:233
msgid "left and right side having always the same number of zones"
++<<<<<<< HEAD
+msgstr "Den vänstra och högra sidan har alltid samma antal zoner"
+
+#: modules/video_filter/atmo/atmo.cpp:235
+msgid "Calculate a average zone"
+msgstr "Räkna ut en genomsnittlig zon"
++=======
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:235
+ msgid "Calculate a average zone"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:236
msgid ""
@@@ -23761,7 -23678,7 +25271,11 @@@ msgstr "
#: modules/video_filter/atmo/atmo.cpp:265
#: modules/gui/qt4/ui/video_effects.h:1381
msgid "Darkness limit"
++<<<<<<< HEAD
+msgstr "Mörkergräns"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:266
msgid ""
@@@ -23791,8 -23708,6 +25305,11 @@@ msgstr "Filterlängd (ms)
msgid ""
"Time it takes until a color is completely changed. This prevents flickering."
msgstr ""
++<<<<<<< HEAD
+"Tid som tar innan en färg ändras helt och hållet. Detta förhindrar ljuset "
+"från att flimra."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:277
msgid "Filter threshold"
@@@ -23800,7 -23715,7 +25317,11 @@@ msgstr "Tröskelvärde för filter
#: modules/video_filter/atmo/atmo.cpp:278
msgid "How much a color has to be changed for an immediate color change."
++<<<<<<< HEAD
+msgstr "Hur mycket en färg måste ändras för en omedelbar färgändring."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:280
#: modules/gui/qt4/ui/video_effects.h:1385
@@@ -23813,7 -23728,7 +25334,11 @@@ msgstr "Filtermjukhet
#: modules/video_filter/atmo/atmo.cpp:283
msgid "Output Color filter mode"
++<<<<<<< HEAD
+msgstr "Filterläge för utmatningsfärg"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:284
msgid ""
@@@ -23874,23 -23789,23 +25399,43 @@@ msgstr "inaktiverad
#: modules/video_filter/atmo/atmo.cpp:322
msgid "Zone 4:summary"
++<<<<<<< HEAD
+msgstr "Zon 4:sammandrag"
+
+#: modules/video_filter/atmo/atmo.cpp:323
+msgid "Zone 3:left"
+msgstr "Zon 3:vänster"
+
+#: modules/video_filter/atmo/atmo.cpp:324
+msgid "Zone 1:right"
+msgstr "Zon 1:höger"
+
+#: modules/video_filter/atmo/atmo.cpp:325
+msgid "Zone 0:top"
+msgstr "Zon 0:överkant"
+
+#: modules/video_filter/atmo/atmo.cpp:326
+msgid "Zone 2:bottom"
+msgstr "Zon 2:nederkant"
++=======
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:323
+ msgid "Zone 3:left"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:324
+ msgid "Zone 1:right"
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:325
+ msgid "Zone 0:top"
+ msgstr "Zon 0:topp"
+
+ #: modules/video_filter/atmo/atmo.cpp:326
+ msgid "Zone 2:bottom"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:328
msgid "Channel / Zone Assignment"
@@@ -23967,11 -23882,11 +25512,19 @@@ msgstr "Välj enhetstyp och anslutning
#: modules/video_filter/atmo/atmo.cpp:399
msgid "Illuminate the room with this color on pause"
++<<<<<<< HEAD
+msgstr "Belys rummet med denna färg vid paus"
+
+#: modules/video_filter/atmo/atmo.cpp:415
+msgid "Illuminate the room with this color on shutdown"
+msgstr "Belys rummet med denna färg vid avstängning"
++=======
+ msgstr ""
+
+ #: modules/video_filter/atmo/atmo.cpp:415
+ msgid "Illuminate the room with this color on shutdown"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:426
msgid "DMX options"
@@@ -23995,7 -23910,7 +25548,11 @@@ msgstr "
#: modules/video_filter/atmo/atmo.cpp:534
msgid "Change channel assignment (fixes wrong wiring)"
++<<<<<<< HEAD
+msgstr "Ändra kanaltilldelningar (fixar feldragna kablar)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:567
msgid "Adjust the white light to your LED stripes"
@@@ -24086,11 -24001,11 +25643,19 @@@ msgstr "Bollfärg
#: modules/video_filter/ball.c:100
msgid "Edge visible"
++<<<<<<< HEAD
+msgstr "Kantsynlighet"
+
+#: modules/video_filter/ball.c:101
+msgid "Set edge visibility."
+msgstr "Ange kantens synlighet."
++=======
+ msgstr ""
+
+ #: modules/video_filter/ball.c:101
+ msgid "Set edge visibility."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/ball.c:103
msgid "Ball speed"
@@@ -24101,8 -24016,6 +25666,11 @@@ msgid "
"Set ball speed, the displacement value in "
"number of pixels by frame."
msgstr ""
++<<<<<<< HEAD
+"Ange bollens hastighet, förskjutningsvärdet i antalet bildpunkter per "
+"bildruta."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/ball.c:107
msgid "Ball size"
@@@ -24112,19 -24025,19 +25680,35 @@@ msgstr "Bollstorlek
msgid ""
"Set ball size giving its radius in number of "
"pixels"
++<<<<<<< HEAD
+msgstr "Ange bollens storlek genom att ställa in radien i antal bildpunkter"
+
+#: modules/video_filter/ball.c:111
+msgid "Gradient threshold"
+msgstr "Gradienttröskel"
+
+#: modules/video_filter/ball.c:112
+msgid "Set gradient threshold for edge computation."
+msgstr "Ange gradientens tröskelvärde för beräkning av kanter."
+
+#: modules/video_filter/ball.c:114
+msgid "Augmented reality ball game"
+msgstr "Bollspel i förstärkt verklighet"
++=======
+ msgstr ""
+
+ #: modules/video_filter/ball.c:111
+ msgid "Gradient threshold"
+ msgstr ""
+
+ #: modules/video_filter/ball.c:112
+ msgid "Set gradient threshold for edge computation."
+ msgstr ""
+
+ #: modules/video_filter/ball.c:114
+ msgid "Augmented reality ball game"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/ball.c:123
msgid "Ball video filter"
@@@ -24160,11 -24073,11 +25744,19 @@@ msgstr "
#: modules/video_filter/blendbench.c:61
msgid "Chroma for the base image"
++<<<<<<< HEAD
+msgstr "Färgstyrka för basbilden"
+
+#: modules/video_filter/blendbench.c:62
+msgid "Chroma which the base image will be loaded in"
+msgstr "Färgstyrkan som basbilden kommer att läsa in i"
++=======
+ msgstr ""
+
+ #: modules/video_filter/blendbench.c:62
+ msgid "Chroma which the base image will be loaded in"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/blendbench.c:64
msgid "Image which will be blended"
@@@ -24176,11 -24089,11 +25768,19 @@@ msgstr "
#: modules/video_filter/blendbench.c:67
msgid "Chroma for the blend image"
++<<<<<<< HEAD
+msgstr "Färgstyrka för blandningsbilden"
+
+#: modules/video_filter/blendbench.c:68
+msgid "Chroma which the blend image will be loaded in"
+msgstr "Färgstyrkan som blandningsbilden kommer att läsa in i"
++=======
+ msgstr ""
+
+ #: modules/video_filter/blendbench.c:68
+ msgid "Chroma which the blend image will be loaded in"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/blendbench.c:74
msgid "Blending benchmark filter"
@@@ -24196,11 -24109,11 +25796,19 @@@ msgstr "Prestandamätning
#: modules/video_filter/blendbench.c:86
msgid "Base image"
++<<<<<<< HEAD
+msgstr "Basbild"
+
+#: modules/video_filter/blendbench.c:92
+msgid "Blend image"
+msgstr "Blandningsbild"
++=======
+ msgstr ""
+
+ #: modules/video_filter/blendbench.c:92
+ msgid "Blend image"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/blend.cpp:44
msgid "Video pictures blending"
@@@ -24728,7 -24641,7 +26336,11 @@@ msgstr "Invertera videofilter
#: modules/video_filter/invert.c:51
msgid "Color inversion"
++<<<<<<< HEAD
+msgstr "Färginvertering"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/logo.c:49
msgid ""
@@@ -25258,7 -25171,7 +26870,11 @@@ msgstr "Panoramix
#: modules/video_filter/panoramix.c:94
msgid "length of the overlapping area (in %)"
++<<<<<<< HEAD
+msgstr "längden för det överlappande området (i %)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/panoramix.c:95
msgid "Select in percent the length of the blended zone"
@@@ -25266,7 -25179,7 +26882,11 @@@ msgstr "
#: modules/video_filter/panoramix.c:98
msgid "height of the overlapping area (in %)"
++<<<<<<< HEAD
+msgstr "höjden för det överlappande området (i %)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/panoramix.c:99
msgid "Select in percent the height of the blended zone (case of 2x2 wall)"
@@@ -25310,7 -25223,7 +26930,11 @@@ msgstr "
#: modules/video_filter/panoramix.c:118
msgid "middle position (in %)"
++<<<<<<< HEAD
+msgstr "mittenposition (i %)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/panoramix.c:119
msgid ""
@@@ -25320,7 -25233,7 +26944,11 @@@ msgstr "
#: modules/video_filter/panoramix.c:121
msgid "Gamma (Red) correction"
++<<<<<<< HEAD
+msgstr "Gammakorrektion (röd)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/panoramix.c:122
msgid ""
@@@ -25329,7 -25242,7 +26957,11 @@@ msgstr "
#: modules/video_filter/panoramix.c:125
msgid "Gamma (Green) correction"
++<<<<<<< HEAD
+msgstr "Gammakorrektion (grön)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/panoramix.c:126
msgid ""
@@@ -25338,7 -25251,7 +26970,11 @@@ msgstr "
#: modules/video_filter/panoramix.c:129
msgid "Gamma (Blue) correction"
++<<<<<<< HEAD
+msgstr "Gammakorrektion (blå)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/panoramix.c:130
msgid ""
@@@ -25443,7 -25356,7 +27079,11 @@@ msgstr "
#: modules/video_filter/posterize.c:61
msgid "Posterize level (number of colors is cube of this value)"
++<<<<<<< HEAD
+msgstr "Färgreduceringsnivå (antalet färger är kuben av detta värde)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/posterize.c:67
msgid "Posterize video filter"
@@@ -25451,7 -25364,7 +27091,11 @@@ msgstr "Färgreducerande videofilter
#: modules/video_filter/posterize.c:69
msgid "Posterize video by lowering the number of colors"
++<<<<<<< HEAD
+msgstr "Färgreducera videor genom att sänka antalet färger"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/postproc.c:68
msgid "Post processing quality"
@@@ -25464,20 -25377,14 +27108,31 @@@ msgid "
"With default filter chain, the values map to the following filters:\n"
"1: hb, 2-4: hb+vb, 5-6: hb+vb+dr"
msgstr ""
++<<<<<<< HEAD
+"Kvalitet för efterbehandling. Giltigt intervall är 0 (inaktiverat) till 6 "
+"(högsta).\n"
+"Högre nivåer kräver mer processorkraft, men framställer bilder med högre "
+"kvalitet.\n"
+"Med den förvalda filterkedjan kommer värdena mappas till följande filter:\n"
+"1: hb, 2-4: hb+vb, 5-6: hb+vb+dr"
+
+#: modules/video_filter/postproc.c:75
+msgid "FFmpeg post processing filter chains"
+msgstr "Filterkedja för efterbehandling av FFmpeg"
+
+#: modules/video_filter/postproc.c:84
+msgid "Video post processing filter"
+msgstr "Filter för efterbehandling av video"
++=======
+
+ #: modules/video_filter/postproc.c:75
+ msgid "FFmpeg post processing filter chains"
+ msgstr ""
+
+ #: modules/video_filter/postproc.c:84
+ msgid "Video post processing filter"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/postproc.c:85
msgid "Postproc"
@@@ -25703,7 -25610,7 +27358,11 @@@ msgstr "Använd rörelsesensorer
#: modules/video_filter/rotate.c:66
msgid "Rotate video filter"
++<<<<<<< HEAD
+msgstr "Videoroteringsfilter"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/rotate.c:67 modules/gui/qt4/ui/video_effects.h:1349
msgid "Rotate"
@@@ -25797,7 -25704,7 +27456,11 @@@ msgstr "Alltid synlig
#: modules/video_filter/rss.c:184
msgid "Scroll with feed"
++<<<<<<< HEAD
+msgstr "Rulla med flöde"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/rss.c:193
msgid "RSS / Atom"
@@@ -26133,7 -26040,7 +27796,11 @@@ msgstr "
#: modules/video_output/androidsurface.c:49 modules/video_output/yuv.c:44
msgid "Chroma used"
++<<<<<<< HEAD
+msgstr "Färgstyrka som används"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/androidsurface.c:51
msgid "Force use of a specific chroma for output. Default is RGB32."
@@@ -26149,7 -26056,7 +27816,11 @@@ msgstr "
#: modules/video_output/decklink.cpp:69
msgid "Output card"
++<<<<<<< HEAD
+msgstr "Utmatningskort"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:71
msgid "DeckLink output card, if multiple exist. The cards are numbered from 0."
@@@ -26236,7 -26143,7 +27907,11 @@@ msgstr "
#: modules/video_output/drawable.c:47 modules/video_output/xcb/window.c:77
msgid "Embedded window video"
++<<<<<<< HEAD
+msgstr "Inbäddat videofönster"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/egl.c:46
msgid "EGL"
@@@ -26248,7 -26155,7 +27923,11 @@@ msgstr "EGL-tillägg för OpenGL
#: modules/video_output/fb.c:56
msgid "Framebuffer device"
++<<<<<<< HEAD
+msgstr "Enhet för bildrutebuffert"
++=======
+ msgstr "Framebuffer-enhet"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/fb.c:58
msgid "Framebuffer device to use for rendering (usually /dev/fb0)."
@@@ -26345,7 -26252,7 +28024,11 @@@ msgstr "GLX
#: modules/video_output/glx.c:43
msgid "GLX extension for OpenGL"
++<<<<<<< HEAD
+msgstr "GLX-tillägg för OpenGL"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/ios.m:66
msgid "iOS OpenGL ES video output (requires UIView)"
@@@ -26427,7 -26334,6 +28110,10 @@@ msgstr "
#: modules/video_output/msw/direct3d.c:61
msgid "Try to use hardware acceleration for subtitle/OSD blending."
msgstr ""
++<<<<<<< HEAD
+"Försök att använda hårdvaruacceleration för undertext-/skärmtextblandning."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/msw/direct3d.c:63
msgid "Recommended video output for Windows Vista and later versions"
@@@ -26446,8 -26352,6 +28132,11 @@@ msgid "
"Try to use hardware acceleration for YUV->RGB conversions. This option "
"doesn't have any effect when using overlays."
msgstr ""
++<<<<<<< HEAD
+"Försök att använda hårdvaruacceleration för konverteringar från YUV till "
+"RGB. Detta alternativ har ingen verkan när överlägg används."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/msw/directx.c:74
msgid "Use video buffers in system memory"
@@@ -26489,8 -26393,6 +28178,11 @@@ msgid "
"Recommended video output for Windows XP. Incompatible with Vista's Aero "
"interface"
msgstr ""
++<<<<<<< HEAD
+"Rekommenderad videoutdata för Windows XP. Inkompatibel med Vista-"
+"gränssnittet Aero."
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/msw/directx.c:102
msgid "DirectX (DirectDraw) video output"
@@@ -26766,11 -26668,11 +28458,19 @@@ msgstr "Typsnitt som ska användas fö
#: modules/visualization/projectm.cpp:63 modules/visualization/vsxu.cpp:56
msgid "The width of the video window, in pixels."
++<<<<<<< HEAD
+msgstr "Bredd för videofönstret i bildpunkter."
+
+#: modules/visualization/projectm.cpp:66 modules/visualization/vsxu.cpp:59
+msgid "The height of the video window, in pixels."
+msgstr "Höjd för videofönstret i bildpunkter."
++=======
+ msgstr ""
+
+ #: modules/visualization/projectm.cpp:66 modules/visualization/vsxu.cpp:59
+ msgid "The height of the video window, in pixels."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/visualization/projectm.cpp:68
msgid "Mesh width"
@@@ -26828,7 -26730,7 +28528,11 @@@ msgstr "Visa 80 band istället för 20
#: modules/visualization/visual/visual.c:61
msgid "More bands for the spectrometer : 80 if enabled else 20."
++<<<<<<< HEAD
+msgstr "Fler band för spektrometern: 80 vid aktivering, annars 20."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/visualization/visual/visual.c:63
msgid "Number of blank pixels between bands."
@@@ -26938,7 -26840,7 +28642,11 @@@ msgstr "Utmatning
#: share/lua/http/dialogs/create_stream.html:193
msgid "Subtitle codec"
++<<<<<<< HEAD
+msgstr "Undertextkodek"
++=======
+ msgstr "Undertextavkodare"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:200
msgid "Output\tmethod"
@@@ -27033,7 -26935,7 +28741,11 @@@ msgstr "Dölj / Visa bibliotek
#: share/lua/http/index.html:216
msgid "Hide / Show Viewer"
++<<<<<<< HEAD
+msgstr "Dölj / visa visare"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:217
msgid "Manage Streams"
@@@ -27230,7 -27132,7 +28942,11 @@@ msgstr "Alternativ
#: modules/gui/qt4/ui/open_capture.h:104
msgid "Access advanced options to tweak the device"
++<<<<<<< HEAD
+msgstr "Kom åt avancerade alternativ för att anpassa enheten"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/open_capture.h:106
msgid "Advanced options..."
@@@ -27536,7 -27438,7 +29252,11 @@@ msgstr "
#: modules/gui/qt4/ui/sprefs_input.h:346
msgid "Video quality post-processing level"
++<<<<<<< HEAD
+msgstr "Nivå för efterbehandling av videokvalitet"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_input.h:347
msgid "Optical drive"
@@@ -27568,7 -27470,7 +29288,11 @@@ msgstr "RTP över RTSP (TCP)
#: modules/gui/qt4/ui/sprefs_input.h:358
msgid "Live555 stream transport"
++<<<<<<< HEAD
+msgstr "Transport för Live555-ström"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_input.h:359
msgid "Default caching policy"
@@@ -27608,7 -27510,7 +29332,11 @@@ msgstr "Pausa uppspelning vid minimerin
#: modules/gui/qt4/ui/sprefs_interface.h:524
msgid "Show media change popup:"
++<<<<<<< HEAD
+msgstr "Visa notis när media ändras:"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:525
msgid "Start in minimal view mode"
@@@ -27816,7 -27718,7 +29544,11 @@@ msgstr "Vill du ladda ned den?
#: modules/gui/qt4/ui/video_effects.h:1315
msgid "Essential"
++<<<<<<< HEAD
+msgstr "Essentiellt"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/video_effects.h:1329
#: modules/gui/qt4/ui/video_effects.h:1338
@@@ -27866,7 -27768,7 +29598,11 @@@ msgstr "Mask
#: modules/gui/qt4/ui/video_effects.h:1379
msgid "Output Color Filtermode"
++<<<<<<< HEAD
+msgstr "Filterläge för utmatningsfärg"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/video_effects.h:1380
msgid "Brightness (%)"
@@@ -27874,7 -27776,7 +29610,11 @@@ msgstr "Ljusstyrka (%)
#: modules/gui/qt4/ui/video_effects.h:1382
msgid "Mark analyzed Pixels"
++<<<<<<< HEAD
+msgstr "Markera analyserade bildpunkter"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/video_effects.h:1384
msgid "Filter threshold (%)"
@@@ -27890,7 -27792,7 +29630,11 @@@ msgstr "Anti-flimmer
#: modules/gui/qt4/ui/video_effects.h:1392
msgid "Soften"
++<<<<<<< HEAD
+msgstr "Mjukgör"
++=======
+ msgstr "Dämpa"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/video_effects.h:1396
msgid "Spatial blur"
@@@ -27952,6 -27854,9 +29696,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "Mediahanteringslista"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "Visa detaljer"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "SAP is a way to publically announce streams that are being sent using "
#~ "multicast UDP or RTP."
@@@ -27991,6 -27896,10 +29741,13 @@@
#~ msgid "\"Water surface\" video distortion effect"
#~ msgstr "Välj effekt"
++<<<<<<< HEAD
++=======
+ #, fuzzy
+ #~ msgid "Image colors inversion"
+ #~ msgstr "Bildklon"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Split the image to make an image wall"
#~ msgstr "Dela upp bilden för att göra en bildvägg"
@@@ -28400,6 -28309,9 +30157,12 @@@
#~ msgid "Media Library based on a SQL based database"
#~ msgstr "Mediabiblioteket baseras på en SQL-baserad databas"
++<<<<<<< HEAD
++=======
+ #~ msgid "Port for the database"
+ #~ msgstr "Port för databasen"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Power Management Inhibitor"
#~ msgstr "Förhindring av strömhantering"
@@@ -28781,6 -28693,9 +30544,12 @@@
#~ msgid "In Volts [0, 13=vertical, 18=horizontal]."
#~ msgstr "I volt [0, 13=vertikal, 18=horisontell]."
++<<<<<<< HEAD
++=======
+ #~ msgid "22 kHz tone"
+ #~ msgstr "22 kHz ton"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "[0=off, 1=on, -1=auto]."
#~ msgstr "[0=av, 1=på, -1=auto]."
@@@ -28936,13 -28851,39 +30705,48 @@@
#~ msgid "IO Method (READ, MMAP, USERPTR)."
#~ msgstr "IO-metod (READ, MMAP, USERPTR)."
++<<<<<<< HEAD
++#~ msgid "Blue balance of the video input (if supported by the v4l2 driver)."
++#~ msgstr "Blåbalans för videoinmatning (om det stöds av v4l2-drivrutinen)."
++
++=======
+ #~ msgid "Brightness of the video input (if supported by the v4l2 driver)."
+ #~ msgstr "Ljusstyrka för videoinmatningen (om det stöds av v4l2-drivrutinen)."
+
+ #~ msgid "Contrast of the video input (if supported by the v4l2 driver)."
+ #~ msgstr "Kontrast för videoinmatningen (om det stöds av v4l2-drivrutinen)."
+
+ #~ msgid "Saturation of the video input (if supported by the v4l2 driver)."
+ #~ msgstr ""
+ #~ "Färgmättnad för videoinmatningen (om det stöds av v4l2-drivrutinen)."
+
+ #~ msgid "Black level of the video input (if supported by the v4l2 driver)."
+ #~ msgstr "Svartnivå för videoinmatning (om det stöds av v4l2-drivrutinen)."
+
+ #~ msgid "Red balance of the video input (if supported by the v4l2 driver)."
+ #~ msgstr "Rödbalans för videoinmatning (om det stöds av v4l2-drivrutinen)."
+
#~ msgid "Blue balance of the video input (if supported by the v4l2 driver)."
#~ msgstr "Blåbalans för videoinmatning (om det stöds av v4l2-drivrutinen)."
+ #~ msgid "Mute audio input (if supported by the v4l2 driver)."
+ #~ msgstr "Tyst ljudinmatning (om det stöds av v4l2-drivrutinen)."
+
+ #~ msgid "Bass level of the audio input (if supported by the v4l2 driver)."
+ #~ msgstr "Basnivån för ljudinmatningen (om det stöds av v4l2-drivrutinen)."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Treble level of the audio input (if supported by the v4l2 driver)."
#~ msgstr ""
#~ "Diskantnivån för ljudinmatningen (om det stöds av v4l2-drivrutinen)."
++<<<<<<< HEAD
++=======
+ #, fuzzy
+ #~ msgid "Loudness of the audio input (if supported by the v4l2 driver)."
+ #~ msgstr "Ljusstyrka för videoinmatningen."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "AUTO"
#~ msgstr "AUTO"
@@@ -29848,6 -29789,14 +31652,17 @@@
#~ msgstr "Dolby Digital"
#~ msgid ""
++<<<<<<< HEAD
++=======
+ #~ "This adds post-processing filters to enhance the picture quality, for "
+ #~ "instance deinterlacing, or to clone or distort the video window."
+ #~ msgstr ""
+ #~ "Det här lägger till efterbehandlingsfilter för att förbättra "
+ #~ "bildkvaliteten, till exempel avflätning, kloning eller distortion av "
+ #~ "videofönstret."
+
+ #~ msgid ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ "failed to convert subtitle encoding.\n"
#~ "Try manually setting a character-encoding before you open the file."
#~ msgstr ""
@@@ -30045,6 -29994,9 +31860,12 @@@
#~ "Visa utökat gränssnitt (equalizer, bildjustering, videofilter...) vid "
#~ "uppstart"
++<<<<<<< HEAD
++=======
+ #~ msgid "Resize VLC to match the video resolution."
+ #~ msgstr "Anpassa VLC för att passa videoupplösningen."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Show labels in toolbar"
#~ msgstr "Visa etiketter på verktygsrad"
@@@ -30120,6 -30072,14 +31941,17 @@@
#~ msgid "Always show video area"
#~ msgstr "Visa alltid videon"
++<<<<<<< HEAD
++=======
+ #, fuzzy
+ #~ msgid ""
+ #~ "Force the Video4Linux2 video device to use a specific chroma format (eg. "
+ #~ "I420, RV24, etc.)"
+ #~ msgstr ""
+ #~ "Tvinga Video4Linux-videoenheten till att använda ett specifikt "
+ #~ "kromaformat (t.ex. I420 (standard), RV24, etc.)"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Charset"
#~ msgstr "Teckenuppsättning"
@@@ -30192,6 -30152,9 +32024,12 @@@
#~ msgid "Listen to IPv4 announcements on the standard address."
#~ msgstr "Lyssna efter IPv4-annonseringar på standardadressen."
++<<<<<<< HEAD
++=======
+ #~ msgid "Session Announcements (SAP)"
+ #~ msgstr "Sessionsannonseringar (SAP)"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "CDDB Disc ID"
#~ msgstr "CDDB Skiv-id"
@@@ -30485,78 -30448,6 +32323,81 @@@
#~ msgstr "Undertextfiler (*.cdg *.idx *.srt *.sub *.utf);;Alla filer (*)"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "Kodekdetaljer"
+
+#, fuzzy
+#~ msgid "Image colors inversion"
+#~ msgstr "Färginvertering"
+
+#, fuzzy
+#~ msgid "Port for the database"
+#~ msgstr "Färgstyrka för basbilden"
+
+#, fuzzy
+#~ msgid "22 kHz tone"
+#~ msgstr "Konstant ton i 22kHz"
+
+#, fuzzy
+#~ msgid "Brightness of the video input (if supported by the v4l2 driver)."
+#~ msgstr "Kontroller för videofångst (om det stöds av enheten)"
+
+#, fuzzy
+#~ msgid "Contrast of the video input (if supported by the v4l2 driver)."
+#~ msgstr "Kontroller för videofångst (om det stöds av enheten)"
+
+#, fuzzy
+#~ msgid "Saturation of the video input (if supported by the v4l2 driver)."
+#~ msgstr "Kontroller för videofångst (om det stöds av enheten)"
+
+#, fuzzy
+#~ msgid "Black level of the video input (if supported by the v4l2 driver)."
+#~ msgstr "Kontroller för videofångst (om det stöds av enheten)"
+
+#, fuzzy
+#~ msgid "Red balance of the video input (if supported by the v4l2 driver)."
+#~ msgstr "Kontroller för videofångst (om det stöds av enheten)"
+
+#, fuzzy
+#~ msgid "Mute audio input (if supported by the v4l2 driver)."
+#~ msgstr "Kontroller för videofångst (om det stöds av enheten)"
+
+#, fuzzy
+#~ msgid "Bass level of the audio input (if supported by the v4l2 driver)."
+#~ msgstr "Kontroller för videofångst (om det stöds av enheten)"
+
+#, fuzzy
+#~ msgid "Loudness of the audio input (if supported by the v4l2 driver)."
+#~ msgstr "Kontroller för videofångst (om det stöds av enheten)"
+
+#, fuzzy
+#~ msgid ""
+#~ "This adds post-processing filters to enhance the picture quality, for "
+#~ "instance deinterlacing, or to clone or distort the video window."
+#~ msgstr ""
+#~ "Detta lägger till efterbehandlingsfilter för att förbättra "
+#~ "bildkvaliteten, t.ex. avflätning, eller videoförvrängning."
+
+#, fuzzy
+#~ msgid "Resize VLC to match the video resolution."
+#~ msgstr "Ändra gränssnittets storlek till videons ursprungliga storlek"
+
+#, fuzzy
+#~ msgid ""
+#~ "Force the Video4Linux2 video device to use a specific chroma format (eg. "
+#~ "I420, RV24, etc.)"
+#~ msgstr ""
+#~ "Tvinga videoinmatningen DirectShow att använda ett specifikt "
+#~ "färgstyrkeformat (t.ex. I420 (standard), RV24, etc.)"
+
+#, fuzzy
+#~ msgid "Session Announcements (SAP)"
+#~ msgstr "Strömmeddelande"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "TCP port to use (default 12345)"
#~ msgstr "TCP-port som ska användas"
@@@ -30970,7 -30861,7 +32811,11 @@@
#, fuzzy
#~ msgid "| longhelp . . . . . . . . . . . a longer help message"
++<<<<<<< HEAD
+#~ msgstr "| help . . . . . . . . . . . . . . . detta hjälpmeddelande"
++=======
+ #~ msgstr "| help . . . . . . . . . . . . . . . det här hjälpmeddelandet"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Force interleaved method."
@@@ -31109,11 -31000,11 +32954,19 @@@
#, fuzzy
#~ msgid "RTSP announce"
++<<<<<<< HEAD
+#~ msgstr "RTSP-meddelande"
+
+#, fuzzy
+#~ msgid "HTTP announce"
+#~ msgstr "HTTP-meddelande"
++=======
+ #~ msgstr "SAP-annonsering"
+
+ #, fuzzy
+ #~ msgid "HTTP announce"
+ #~ msgstr "SAP-annonsering"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "HTML Playlist"
@@@ -31165,7 -31056,7 +33018,11 @@@
#, fuzzy
#~ msgid "SAP Announce"
++<<<<<<< HEAD
+#~ msgstr "SAP-meddelande"
++=======
+ #~ msgstr "SAP-annonsering"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid " [Incoming]"
@@@ -31213,11 -31104,11 +33070,19 @@@
#, fuzzy
#~ msgid " buffers played : %<PRId64>"
++<<<<<<< HEAD
+#~ msgstr "| buffertar spelade : %5<PRIi64>"
+
+#, fuzzy
+#~ msgid " buffers lost : %<PRId64>"
+#~ msgstr "| buffertar förlorade : %5<PRIi64>"
++=======
+ #~ msgstr "| visade bildrutor: %5<PRIi64>"
+
+ #, fuzzy
+ #~ msgid " buffers lost : %<PRId64>"
+ #~ msgstr "| förlorade bildrutor: %5<PRIi64>"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid " [Streaming]"
@@@ -31499,7 -31390,7 +33364,11 @@@
#, fuzzy
#~ msgid "Subtitle Codec"
++<<<<<<< HEAD
+#~ msgstr "Undertextkodek"
++=======
+ #~ msgstr "Undertextavkodare"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Video Bit Rate"
@@@ -31683,7 -31574,7 +33552,11 @@@
#, fuzzy
#~ msgid "Clear Menu"
++<<<<<<< HEAD
+#~ msgstr "Media Meny"
++=======
+ #~ msgstr "Töm"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Fullscreen controller width toggle"
@@@ -32008,7 -31899,9 +33881,13 @@@
#, fuzzy
#~ msgid "Supplementary caching value for remote files, in milliseconds."
++<<<<<<< HEAD
+#~ msgstr "Cachningsvärde för lokala filer i millisekunder."
++=======
+ #~ msgstr ""
+ #~ "Standardmellanlagringsvärde för utgående UDP-strömmar. Detta värde ska "
+ #~ "vara i millisekunder."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Directory input"
@@@ -32194,7 -32087,7 +34073,11 @@@
#, fuzzy
#~ msgid "Balance of the audio input (if supported by the v4l2 driver)."
++<<<<<<< HEAD
+#~ msgstr "Kontroller för videofångst (om det stöds av enheten)"
++=======
+ #~ msgstr "Balans för ljudinmatning."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Treble"
@@@ -32243,7 -32136,7 +34126,11 @@@
#, fuzzy
#~ msgid "Reload image file"
++<<<<<<< HEAD
+#~ msgstr "Videoroteringsfilter"
++=======
+ #~ msgstr "Ta bort en profil"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
@@@ -32379,7 -32272,7 +34266,11 @@@
#, fuzzy
#~ msgid "About the video filters"
++<<<<<<< HEAD
+#~ msgstr "Videoroteringsfilter"
++=======
+ #~ msgstr "Videokloningsfilter"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Controller..."
@@@ -32600,7 -32493,7 +34491,11 @@@
#, fuzzy
#~ msgid "OMAP Framebuffer device"
++<<<<<<< HEAD
+#~ msgstr "Enhet för bildrutebuffert"
++=======
+ #~ msgstr "Framebuffer-enhet"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid ""
@@@ -32806,7 -32699,7 +34701,11 @@@
#, fuzzy
#~ msgid "Caching value in microseconds"
++<<<<<<< HEAD
+#~ msgstr "Cachningsvärde för lokala filer i millisekunder."
++=======
+ #~ msgstr "Mellanlagringsvärde (ms)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Format to use in playlist \"title\" field when no CDDB"
@@@ -33145,11 -33038,11 +35044,19 @@@
#, fuzzy
#~ msgid "SAP Announce:"
++<<<<<<< HEAD
+#~ msgstr "SAP-meddelande"
+
+#, fuzzy
+#~ msgid "SLP Announce:"
+#~ msgstr "SAP-meddelande"
++=======
+ #~ msgstr "SAP-annonsering"
+
+ #, fuzzy
+ #~ msgid "SLP Announce:"
+ #~ msgstr "SAP-annonsering"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Announce Channel:"
@@@ -33320,7 -33213,7 +35227,11 @@@
#, fuzzy
#~ msgid "Embedded Windows video"
++<<<<<<< HEAD
+#~ msgstr "Inbäddat videofönster"
++=======
+ #~ msgstr "Inbäddad video"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "DirectX video output"
@@@ -34644,7 -34537,7 +36555,11 @@@
#, fuzzy
#~ msgid "Video monitoring filter"
++<<<<<<< HEAD
+#~ msgstr "Filter för efterbehandling av video"
++=======
+ #~ msgstr "Videoskalningsfilter"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Statistics input file"
@@@ -34923,7 -34816,7 +36838,11 @@@
#, fuzzy
#~ msgid "Your version"
++<<<<<<< HEAD
+#~ msgstr "Färginvertering"
++=======
+ #~ msgstr "Version"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Streamming"
@@@ -35289,7 -35182,7 +37208,11 @@@
#, fuzzy
#~ msgid "Standard stream"
++<<<<<<< HEAD
+#~ msgstr "Standardströmsutmatning"
++=======
+ #~ msgstr "Standard"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Adjust"
diff --combined po/ta.po
index 2ec2780,ba12e33..f72abbb
--- a/po/ta.po
+++ b/po/ta.po
@@@ -1,24 -1,22 +1,45 @@@
++<<<<<<< HEAD
+# Tamil translation
+# Copyright (C) 2013 VideoLAN
+# This file is distributed under the same license as the VLC package.
+#
+# Translators:
+# Abdul Fousan <abdulfousan at gmail.com>, 2009-2010.
+# suthir <suthir.g at gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: VLC - Trans\n"
+"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-08 08:17+0000\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/vlc-trans/language/"
+"ta/)\n"
++=======
+ # Tamil translations for vlc package.
+ # Copyright (C) 2009-2010 VideoLAN
+ # This file is distributed under the same license as the vlc package.
+ # Abdul Fousan <abdulfousan at gmail.com>, 2009-2010.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: vlc 1.1.0-git\n"
+ "Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: \n"
+ "Last-Translator: Abdul Fousan S <abdulfousan at gmail.com>\n"
+ "Language-Team: VLC Tamil <abdulfousan at gmail.com>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language: ta\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
++<<<<<<< HEAD
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++=======
+ "X-Poedit-Language: Tamil\n"
+ "X-Poedit-Country: India\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_common.h:922
msgid ""
@@@ -27,54 -25,49 +48,97 @@@
"see the file named COPYING for details.\n"
"Written by the VideoLAN team; see the AUTHORS file.\n"
msgstr ""
++<<<<<<< HEAD
+"இநà¯à®¤ திடà¯à®Ÿà®®à¯, சடà¯à®Ÿà®ªà¯à®ªà®Ÿà®¿ அனà¯à®®à®¤à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ எநà¯à®¤ வித உதà¯à®¤à®¿à®°à®µà®¾à®¤à®¤à¯à®¤à¯à®Ÿà®©à¯à®®à¯ வரவிலà¯à®²à¯ˆ.\n"
+"நீஙà¯à®•à®³à¯, இதை கà¯à®©à¯ பொத௠மகà¯à®•à®³à¯ உரிமம௠நிபநà¯à®¤à®©à¯ˆà®•à®³à®¿à®©à¯ கீழ௠மறà¯â€à®µà®¿à®¨à®¿à®¯à¯‡à®¾à®•à®®à¯ செயà¯à®¯à®²à®¾à®®à¯.\n"
+"விவரஙà¯à®•à®³à¯ˆ நகல௠எடà¯à®¤à¯à®¤à®²à¯ எனà¯à®± கோபà¯à®ªà®¿à®²à¯ பாரà¯à®•à¯à®•à®µà¯à®®à¯.\n"
+"வீடியோ லேன௠கà¯à®´à¯à®µà®¿à®©à®¾à®²à¯ எழà¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯; ஆசிரியரà¯à®•à®³à¯ எனà¯à®± கோபà¯à®ªà¯ˆ பாரà¯à®•à¯à®•à®µà¯à®®à¯.\n"
+"\n"
+
+#: include/vlc_config_cat.h:33
+msgid "VLC preferences"
+msgstr "விஎலà¯à®šà®¿ விரà¯à®ªà¯à®ªà®¤à¯ தேரà¯à®µà¯à®•à®³à¯"
+
+#: include/vlc_config_cat.h:35
+msgid "Select \"Advanced Options\" to see all options."
+msgstr "அனைதà¯à®¤à¯ விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯ˆà®¯à¯à®®à¯ காண \"மேமà¯à®ªà®Ÿà¯à®Ÿ விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯\" எனà¯à®ªà®¤à¯ˆ தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®•à¯à®•à®µà¯à®®à¯."
++=======
+
+ #: include/vlc_config_cat.h:33
+ msgid "VLC preferences"
+ msgstr "VLC விரà¯à®ªà¯à®ªà®¤à¯à®¤à¯‡à®°à¯à®µà¯à®•à®³à¯"
+
+ #: include/vlc_config_cat.h:35
+ msgid "Select \"Advanced Options\" to see all options."
+ msgstr "தெரிவ௠\" மேமà¯à®ªà®Ÿà¯à®Ÿ விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯\" விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯ எலà¯à®²à®¾à®¤à¯à®¤à¯ˆà®¯à¯à®®à¯ பாரà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:38 modules/gui/macosx/simple_prefs.m:269
#: modules/gui/qt4/components/simple_preferences.cpp:220
#: modules/gui/qt4/menus.cpp:1075
msgid "Interface"
++<<<<<<< HEAD
+msgstr "இடைமà¯à®•à®ªà¯à®ªà¯"
+
+#: include/vlc_config_cat.h:39
+msgid "Settings for VLC's interfaces"
+msgstr "விஎலà¯à®šà®¿à®¯à®¿à®©à¯ இடைமà¯à®•à®ªà¯à®ªà¯à®•à®³à¯à®•à¯à®•à®¾à®© அமைபà¯à®ªà¯à®•à®³à¯"
+
+#: include/vlc_config_cat.h:41
+msgid "Main interfaces settings"
+msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ இடைமà¯à®•à®ªà¯à®ªà¯à®•à®³à¯â€à®•à¯à®•à®¾à®© அமைபà¯à®ªà¯à®•à®³à¯"
+
+#: include/vlc_config_cat.h:43
+msgid "Main interfaces"
+msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ இடைமà¯à®•à®ªà¯à®ªà¯à®•à®³à¯"
+
+#: include/vlc_config_cat.h:44
+msgid "Settings for the main interface"
+msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ இடைமà¯à®•à®ªà¯à®ªà¯à®•à¯à®•à®¾à®© அமைபà¯à®ªà¯à®•à®³à¯"
+
+#: include/vlc_config_cat.h:46 src/libvlc-module.c:81
+msgid "Control interfaces"
+msgstr "கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ இடைமà¯à®•à®ªà¯à®ªà¯à®•à®³à¯"
+
+#: include/vlc_config_cat.h:47
+msgid "Settings for VLC's control interfaces"
+msgstr "விஎலà¯à®šà®¿à®¯à®¿à®©à¯ கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ இடைமà¯à®•à®ªà¯à®ªà¯à®•à¯à®•à®¾à®© அமைபà¯à®ªà¯à®•à®³à¯"
++=======
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯"
+
+ #: include/vlc_config_cat.h:39
+ msgid "Settings for VLC's interfaces"
+ msgstr "VLCன௠மà¯à®•à®ªà¯à®ªà¯à®•à¯à®•à®¾à®© அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #: include/vlc_config_cat.h:41
+ msgid "Main interfaces settings"
+ msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ à®®à¯à®•à®ªà¯à®ªà¯à®•à¯à®•à®¾à®© அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #: include/vlc_config_cat.h:43
+ msgid "Main interfaces"
+ msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ à®®à¯à®•à®ªà¯à®ªà¯à®•à®³à¯"
+
+ #: include/vlc_config_cat.h:44
+ msgid "Settings for the main interface"
+ msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ à®®à¯à®•à®ªà¯à®ªà¯à®•à¯à®•à®¾à®© அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #: include/vlc_config_cat.h:46 src/libvlc-module.c:81
+ msgid "Control interfaces"
+ msgstr "கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ à®®à¯à®•à®ªà¯à®ªà¯à®•à®³à¯"
+
+ #: include/vlc_config_cat.h:47
+ msgid "Settings for VLC's control interfaces"
+ msgstr "VLCன௠கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ à®®à¯à®•à®ªà¯à®ªà¯à®•à¯à®•à®¾à®© அமைபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:49 include/vlc_config_cat.h:50
#: modules/gui/macosx/simple_prefs.m:279
msgid "Hotkeys settings"
++<<<<<<< HEAD
+msgstr "à®®à¯à®•à¯à®•à®¿à®¯ கà¯à®±à¯à®•à¯à®•à¯ விசை அமைபà¯à®ªà¯à®•à®³à¯"
++=======
+ msgstr "à®®à¯à®•à¯à®•à®¿à®¯à®µà®¿à®šà¯ˆ அமைபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:53 src/input/es_out.c:2866 src/input/es_out.c:2907
#: src/libvlc-module.c:1456 modules/access/imem.c:64
@@@ -88,42 -81,42 +152,78 @@@
#: share/lua/http/dialogs/create_stream.html:150
#: modules/gui/qt4/ui/profiles.h:704 modules/gui/qt4/ui/profiles.h:735
msgid "Audio"
++<<<<<<< HEAD
+msgstr "ஒலி"
+
+#: include/vlc_config_cat.h:54
+msgid "Audio settings"
+msgstr "ஒலி அமைபà¯à®ªà¯à®•à®³à¯"
+
+#: include/vlc_config_cat.h:56
+msgid "General audio settings"
+msgstr "பொத௠ஒலி அமைபà¯à®ªà¯à®•à®³à¯"
++=======
+ msgstr "ஒலிதமà¯"
+
+ #: include/vlc_config_cat.h:54
+ msgid "Audio settings"
+ msgstr "ஒலித அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #: include/vlc_config_cat.h:56
+ msgid "General audio settings"
+ msgstr "பொத௠ஒலித அமைபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:58 include/vlc_config_cat.h:80
#: modules/gui/qt4/ui/profiles.h:733 modules/gui/qt4/ui/profiles.h:743
msgid "Filters"
++<<<<<<< HEAD
+msgstr "வடிபà¯à®ªà®¾à®©à¯à®•à®³à¯"
+
+#: include/vlc_config_cat.h:59
+msgid "Audio filters are used to process the audio stream."
+msgstr "ஒலி வடிபà¯à®ªà®¾à®©à¯à®•à®³à¯ ஒலி தகவலரஙà¯à®•à®¤à¯à®¤à®¿à®²à¯ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®©."
++=======
+ msgstr "சலà¯à®²à®Ÿà¯ˆà®•à®³à¯"
+
+ #: include/vlc_config_cat.h:59
+ msgid "Audio filters are used to process the audio stream."
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:61 src/audio_output/output.c:217
#: modules/gui/macosx/MainMenu.m:387 modules/gui/macosx/MainMenu.m:388
msgid "Visualizations"
++<<<<<<< HEAD
+msgstr "காடà¯à®šà®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯à®•à®³à¯"
++=======
+ msgstr "பாரà¯à®µà¯ˆà®•à¯à®•à¯à®°à®¿à®¯à®µà¯ˆà®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:62 src/audio_output/output.c:284
#: src/libvlc-module.c:197
msgid "Audio visualizations"
++<<<<<<< HEAD
+msgstr "ஒலி காடà¯à®šà®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯à®•à®³à¯"
+
+#: include/vlc_config_cat.h:64 include/vlc_config_cat.h:76
+msgid "Output modules"
+msgstr "வெளியீடà¯â€ தொகà¯à®¤à®¿à®•à¯ கூறà¯à®•à®³à¯"
+
+#: include/vlc_config_cat.h:65
+msgid "General settings for audio output modules."
+msgstr "ஒலி வெளியீடà¯â€ தொகà¯à®¤à®¿à®•à¯ கூறà¯à®•à®³à¯à®•à¯à®•à®¾à®© பொத௠அமைபà¯à®ªà¯à®•à®³à¯"
++=======
+ msgstr "ஒலித பாரà¯à®µà¯ˆà®•à¯à®•à¯à®°à®¿à®¯à®µà¯ˆà®•à®³à¯"
+
+ #: include/vlc_config_cat.h:64 include/vlc_config_cat.h:76
+ msgid "Output modules"
+ msgstr "வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯à®•à®³à¯"
+
+ #: include/vlc_config_cat.h:65
+ msgid "General settings for audio output modules."
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯à®•à¯à®•à®¾à®© பொத௠அமைபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:67 src/libvlc-module.c:1962
#: modules/gui/macosx/VideoEffects.m:85
@@@ -133,13 -126,13 +233,21 @@@ msgstr "இதர
#: include/vlc_config_cat.h:68
msgid "Miscellaneous audio settings and modules."
++<<<<<<< HEAD
+msgstr "இதர ஒலி அமைபà¯à®ªà¯à®•à®³à¯ & தொகà¯à®¤à®¿à®•à¯ கூறà¯à®•à®³à¯"
++=======
+ msgstr "இதர ஒலித அமைபà¯à®ªà¯à®•à®³à¯ & மாடà¯à®²à¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:71 src/input/es_out.c:2869 src/input/es_out.c:2951
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -161,7 -154,7 +269,11 @@@ msgstr "பொத௠நிகழà¯à®ª
#: include/vlc_config_cat.h:78
msgid "Choose your preferred video output and configure it here."
++<<<<<<< HEAD
+msgstr "உஙà¯à®•à®³à¯à®•à¯à®•à¯â€ விரà¯à®ªà¯à®ªà®®à®¾à®© தேரà¯à®µà¯à®•à®³à¯ மறà¯à®±à¯à®®à¯ காணொளிகளின௠வெளியீடà¯à®•à®³à¯ˆ இஙà¯à®•à¯‡ கடà¯à®Ÿà®®à¯ˆà®•à¯à®•."
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:82
msgid "Video filters are used to process the video stream."
@@@ -169,7 -162,7 +281,11 @@@ msgstr "நிகழà¯à®ªà®Ÿà®® ஓட
#: include/vlc_config_cat.h:84
msgid "Subtitles / OSD"
++<<<<<<< HEAD
+msgstr "தà¯à®£à¯ˆà®¤à¯ தலைபà¯à®ªà¯à®•à®³à¯ / திரையில௠தோனà¯à®±à¯à®®à¯ காடà¯à®šà®¿"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:85
msgid ""
@@@ -186,7 -179,7 +302,11 @@@ msgstr "
#: include/vlc_config_cat.h:97
msgid "Access modules"
++<<<<<<< HEAD
+msgstr "தொகà¯à®¤à®¿à®•à¯ கூறà¯à®•à®³à¯ˆ அணà¯à®•à¯à®µà®¤à®±à¯à®•à¯â€"
++=======
+ msgstr "மாடà¯à®²à¯à®•à®³à¯ˆ உபயோகி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:99
msgid ""
@@@ -229,8 -222,9 +349,14 @@@ msgid "Settings for the audio-only deco
msgstr ""
#: include/vlc_config_cat.h:117
++<<<<<<< HEAD
+msgid "Subtitle codecs"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle codecs"
+ msgstr "தà¯à®£à¯ˆ உரை கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:118
msgid "Settings for subtitle, teletext and CC decoders and encoders."
@@@ -369,8 -363,9 +495,14 @@@ msgid "These modules provide network fu
msgstr ""
#: include/vlc_config_cat.h:196
++<<<<<<< HEAD
+msgid "These are general settings for video/audio/subtitle encoding modules."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "These are general settings for video/audio/subtitle encoding modules."
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯à®•à¯à®•à®¾à®© பொத௠அமைபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:199
msgid "Dialog providers can be configured here."
@@@ -434,8 -429,9 +566,14 @@@ msgid "Jump to Specific &Time
msgstr "திடà¯à®Ÿà®µà®Ÿà¯à®Ÿà®®à®¾à®©&நேரம௠கà¯à®•à¯ தாவà¯"
#: include/vlc_intf_strings.h:59
++<<<<<<< HEAD
+msgid "Custom &Bookmarks"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Custom &Bookmarks"
+ msgstr "&நினைவà¯à®•à¯à®•à¯à®±à®¿à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_intf_strings.h:60
msgid "&VLM Configuration"
@@@ -446,10 -442,10 +584,17 @@@ msgid "&About
msgstr "&அறிமà¯à®•à®®à¯"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -488,17 -484,17 +633,29 @@@ msgid "Save...
msgstr "சேமி..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "மீணà¯à®Ÿà¯à®®à¯ செயà¯(All)"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "மீணà¯à®Ÿà¯à®®à¯ செயà¯(One)"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -578,7 -574,7 +735,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "செயலிளகà¯à®• செயà¯"
@@@ -784,44 -780,53 +945,91 @@@ msgid "
msgstr ""
#: src/config/keys.c:56
++<<<<<<< HEAD
+msgid "Backspace"
+msgstr ""
+
+#: src/config/keys.c:57
+msgid "Brightness Down"
+msgstr ""
+
+#: src/config/keys.c:58
+msgid "Brightness Up"
+msgstr ""
+
+#: src/config/keys.c:59
+msgid "Browser Back"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Backspace"
+ msgstr "பினà¯à®©à®®à¯"
+
+ #: src/config/keys.c:57
+ #, fuzzy
+ msgid "Brightness Down"
+ msgstr "பிரகாசமà¯"
+
+ #: src/config/keys.c:58
+ #, fuzzy
+ msgid "Brightness Up"
+ msgstr "பிரகாசமà¯"
+
+ #: src/config/keys.c:59
+ #, fuzzy
+ msgid "Browser Back"
+ msgstr "கணà¯à®Ÿà¯†à®Ÿà¯à®•à¯à®•"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:60
msgid "Browser Favorites"
msgstr ""
#: src/config/keys.c:61
++<<<<<<< HEAD
+msgid "Browser Forward"
+msgstr ""
+
+#: src/config/keys.c:62
+msgid "Browser Home"
+msgstr ""
+
+#: src/config/keys.c:63
+msgid "Browser Refresh"
+msgstr ""
+
+#: src/config/keys.c:64
+msgid "Browser Search"
+msgstr ""
+
+#: src/config/keys.c:65
+msgid "Browser Stop"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Browser Forward"
+ msgstr "à®®à¯à®©à¯à®©à¯‹à®•à¯à®•à®¿à®¯ அடி"
+
+ #: src/config/keys.c:62
+ #, fuzzy
+ msgid "Browser Home"
+ msgstr "கணà¯à®Ÿà¯†à®Ÿà¯à®•à¯à®•"
+
+ #: src/config/keys.c:63
+ #, fuzzy
+ msgid "Browser Refresh"
+ msgstr "பà¯à®¤à¯à®¤à¯à®£à®°à¯à®µà¯ படà¯à®Ÿà®¿à®¯à®²à¯"
+
+ #: src/config/keys.c:64
+ #, fuzzy
+ msgid "Browser Search"
+ msgstr "கணà¯à®Ÿà¯†à®Ÿà¯à®•à¯à®•"
+
+ #: src/config/keys.c:65
+ #, fuzzy
+ msgid "Browser Stop"
+ msgstr "கணà¯à®Ÿà¯†à®Ÿà¯à®•à¯à®•"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:66 modules/gui/macosx/playlist.m:518
#: modules/gui/qt4/dialogs/bookmarks.cpp:50
@@@ -839,40 -844,46 +1047,74 @@@ msgid "End
msgstr "இறà¯à®¤à®¿"
#: src/config/keys.c:69
++<<<<<<< HEAD
+msgid "Enter"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Enter"
+ msgstr "மையமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:70
msgid "Esc"
msgstr ""
#: src/config/keys.c:71
++<<<<<<< HEAD
+msgid "F1"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "F1"
+ msgstr "1"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:72
msgid "F10"
msgstr ""
#: src/config/keys.c:73
++<<<<<<< HEAD
+msgid "F11"
+msgstr ""
+
+#: src/config/keys.c:74
+msgid "F12"
+msgstr ""
+
+#: src/config/keys.c:75
+msgid "F2"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "F11"
+ msgstr "X11"
+
+ #: src/config/keys.c:74
+ #, fuzzy
+ msgid "F12"
+ msgstr "1/2"
+
+ #: src/config/keys.c:75
+ #, fuzzy
+ msgid "F2"
+ msgstr "2"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:76
msgid "F3"
msgstr ""
#: src/config/keys.c:77
++<<<<<<< HEAD
+msgid "F4"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "F4"
+ msgstr "4"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:78
msgid "F5"
@@@ -903,76 -914,93 +1145,163 @@@ msgid "Insert
msgstr ""
#: src/config/keys.c:86
++<<<<<<< HEAD
+msgid "Media Angle"
+msgstr ""
+
+#: src/config/keys.c:87
+msgid "Media Audio Track"
+msgstr ""
+
+#: src/config/keys.c:88
+msgid "Media Forward"
+msgstr ""
+
+#: src/config/keys.c:89
+msgid "Media Menu"
+msgstr ""
+
+#: src/config/keys.c:90
+msgid "Media Next Frame"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Media Angle"
+ msgstr "ஊடக கோபà¯à®ªà¯à®•à®³à¯"
+
+ #: src/config/keys.c:87
+ #, fuzzy
+ msgid "Media Audio Track"
+ msgstr "ஒலித சà¯à®µà®Ÿà¯"
+
+ #: src/config/keys.c:88
+ #, fuzzy
+ msgid "Media Forward"
+ msgstr "à®®à¯à®©à¯à®©à¯‹à®•à¯à®•à®¿à®¯ அடி"
+
+ #: src/config/keys.c:89
+ #, fuzzy
+ msgid "Media Menu"
+ msgstr "ஊடக கோபà¯à®ªà¯à®•à®³à¯"
+
+ #: src/config/keys.c:90
+ #, fuzzy
+ msgid "Media Next Frame"
+ msgstr "ஊடக கோபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:91
msgid "Media Next Track"
msgstr ""
#: src/config/keys.c:92
++<<<<<<< HEAD
+msgid "Media Play Pause"
+msgstr ""
+
+#: src/config/keys.c:93
+msgid "Media Prev Frame"
+msgstr ""
+
+#: src/config/keys.c:94
+msgid "Media Prev Track"
+msgstr ""
+
+#: src/config/keys.c:95
+msgid "Media Record"
+msgstr ""
+
+#: src/config/keys.c:96
+msgid "Media Repeat"
+msgstr ""
+
+#: src/config/keys.c:97
+msgid "Media Rewind"
+msgstr ""
+
+#: src/config/keys.c:98
+msgid "Media Select"
+msgstr ""
+
+#: src/config/keys.c:99
+msgid "Media Shuffle"
+msgstr ""
+
+#: src/config/keys.c:100
+msgid "Media Stop"
+msgstr ""
+
+#: src/config/keys.c:101
+msgid "Media Subtitle"
+msgstr ""
+
+#: src/config/keys.c:102
+msgid "Media Time"
+msgstr ""
+
+#: src/config/keys.c:103
+msgid "Media View"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Media Play Pause"
+ msgstr "ஓடà¯/நிறà¯à®¤à¯à®¤à¯"
+
+ #: src/config/keys.c:93
+ #, fuzzy
+ msgid "Media Prev Frame"
+ msgstr "கணà¯à®Ÿà¯†à®Ÿà¯à®•à¯à®•"
+
+ #: src/config/keys.c:94
+ #, fuzzy
+ msgid "Media Prev Track"
+ msgstr "கணà¯à®Ÿà¯†à®Ÿà¯à®•à¯à®•"
+
+ #: src/config/keys.c:95
+ #, fuzzy
+ msgid "Media Record"
+ msgstr "பதிவà¯à®•à®³à¯"
+
+ #: src/config/keys.c:96
+ #, fuzzy
+ msgid "Media Repeat"
+ msgstr "மீணà¯à®Ÿà¯à®®à¯ செயà¯à®¯à®¾à®¤à¯"
+
+ #: src/config/keys.c:97
+ #, fuzzy
+ msgid "Media Rewind"
+ msgstr "ஊடக கோபà¯à®ªà¯à®•à®³à¯"
+
+ #: src/config/keys.c:98
+ #, fuzzy
+ msgid "Media Select"
+ msgstr "ஊடக கோபà¯à®ªà¯à®•à®³à¯"
+
+ #: src/config/keys.c:99
+ #, fuzzy
+ msgid "Media Shuffle"
+ msgstr "ஊடக கோபà¯à®ªà¯à®•à®³à¯"
+
+ #: src/config/keys.c:100
+ #, fuzzy
+ msgid "Media Stop"
+ msgstr "ஊடகமà¯: %s"
+
+ #: src/config/keys.c:101
+ #, fuzzy
+ msgid "Media Subtitle"
+ msgstr "ஊடக கோபà¯à®ªà¯à®•à®³à¯"
+
+ #: src/config/keys.c:102
+ #, fuzzy
+ msgid "Media Time"
+ msgstr "ஊடக கோபà¯à®ªà¯à®•à®³à¯"
+
+ #: src/config/keys.c:103
+ #, fuzzy
+ msgid "Media View"
+ msgstr "ஊடக கோபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:104 modules/gui/qt4/components/controller.cpp:541
msgid "Menu"
@@@ -987,20 -1015,23 +1316,37 @@@ msgid "Mouse Wheel Left
msgstr ""
#: src/config/keys.c:107
++<<<<<<< HEAD
+msgid "Mouse Wheel Right"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Mouse Wheel Right"
+ msgstr "நிகழà¯à®ªà®Ÿ உயரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:108
msgid "Mouse Wheel Up"
msgstr ""
#: src/config/keys.c:109
++<<<<<<< HEAD
+msgid "Page Down"
+msgstr ""
+
+#: src/config/keys.c:110
+msgid "Page Up"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Page Down"
+ msgstr "பகà¯à®•à®®à¯"
+
+ #: src/config/keys.c:110
+ #, fuzzy
+ msgid "Page Up"
+ msgstr "பகà¯à®•à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:112 modules/demux/mp4/id3genres.h:76
msgid "Space"
@@@ -1025,24 -1056,28 +1371,46 @@@ msgid "Volume Down
msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®®à¯ கீழே"
#: src/config/keys.c:117
++<<<<<<< HEAD
+msgid "Volume Mute"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Volume Mute"
+ msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®®à¯ மேலே"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:118 modules/gui/macosx/MainMenu.m:468
msgid "Volume Up"
msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®®à¯ உயரே"
#: src/config/keys.c:119
++<<<<<<< HEAD
+msgid "Zoom In"
+msgstr ""
+
+#: src/config/keys.c:120
+msgid "Zoom Out"
+msgstr ""
+
+#: src/config/keys.c:248
+msgid "Ctrl+"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Zoom In"
+ msgstr "உர௠அளவà¯"
+
+ #: src/config/keys.c:120
+ #, fuzzy
+ msgid "Zoom Out"
+ msgstr "உர௠அளவà¯"
+
+ #: src/config/keys.c:248
+ #, fuzzy
+ msgid "Ctrl+"
+ msgstr "Ctrl+L"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:249
msgid "Alt+"
@@@ -1053,12 -1088,14 +1421,23 @@@ msgid "Shift+
msgstr ""
#: src/config/keys.c:251
++<<<<<<< HEAD
+msgid "Meta+"
+msgstr ""
+
+#: src/config/keys.c:252
+msgid "Command+"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Meta+"
+ msgstr "பெரà¯à®¤à®°à®µà¯"
+
+ #: src/config/keys.c:252
+ #, fuzzy
+ msgid "Command+"
+ msgstr "ஆணை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/control.c:226
#, c-format
@@@ -1233,23 -1270,24 +1612,43 @@@ msgid "Frame rate
msgstr "வடிவம௠அளவà¯"
#: src/input/es_out.c:2980
++<<<<<<< HEAD
+msgid "Decoded format"
+msgstr ""
+
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #, fuzzy
+ msgid "Decoded format"
+ msgstr "&கோடக௠தகவலà¯"
+
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1355,8 -1393,9 +1754,14 @@@ msgid "Audio Track
msgstr "ஒலித சà¯à®µà®Ÿà¯"
#: src/input/var.c:210
++<<<<<<< HEAD
+msgid "Subtitle Track"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle Track"
+ msgstr "தà¯à®£à¯ˆ உரை சà¯à®µà®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/var.c:273
msgid "Next title"
@@@ -1367,9 -1406,9 +1772,15 @@@ msgid "Previous title
msgstr "à®®à¯à®¨à¯à®¤à¯ˆà®¯ தலைபà¯à®ªà¯"
#: src/input/var.c:312
++<<<<<<< HEAD
+#, c-format
+msgid "Title %i%s"
+msgstr ""
++=======
+ #, fuzzy, c-format
+ msgid "Title %i%s"
+ msgstr "தலைபà¯à®ªà¯ %i"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/input/var.c:338 src/input/var.c:397
#, c-format
@@@ -1403,8 -1442,9 +1814,14 @@@ msgid "Telnet
msgstr ""
#: src/interface/interface.c:95
++<<<<<<< HEAD
+msgid "Web"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Web"
+ msgstr "ஈரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/interface/interface.c:98
msgid "Debug logging"
@@@ -1565,8 -1605,9 +1982,14 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:138
++<<<<<<< HEAD
+msgid "Audio gain"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio gain"
+ msgstr "ஒலிதம௠உளà¯à®³à¯€à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:140
msgid "This linear gain will be applied to outputted audio."
@@@ -1581,8 -1622,9 +2004,14 @@@ msgid "The step size of the volume is a
msgstr ""
#: src/libvlc-module.c:147
++<<<<<<< HEAD
+msgid "Remember the audio volume"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Remember the audio volume"
+ msgstr "கோடநிலை ஒலித ஒலிசà¯à®šà®¤à¯à®¤à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:149
msgid ""
@@@ -1600,8 -1642,9 +2029,14 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:157
++<<<<<<< HEAD
+msgid "Audio resampler"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio resampler"
+ msgstr "மாதிரி அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:159
msgid "This selects which plugin to use for audio resampling."
@@@ -1640,7 -1683,7 +2075,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1659,8 -1702,9 +2098,14 @@@ msgid "Off
msgstr "அமதà¯à®¤à¯"
#: src/libvlc-module.c:182
++<<<<<<< HEAD
+msgid "Stereo audio output mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Stereo audio output mode"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:194
msgid "This adds audio post processing filters, to modify the sound rendering."
@@@ -1705,8 -1749,9 +2150,14 @@@ msgid "Protect against sound clipping
msgstr ""
#: src/libvlc-module.c:221
++<<<<<<< HEAD
+msgid "Enable time stretching audio"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Enable time stretching audio"
+ msgstr "ஒலிததà¯à®¤à¯ˆ இயஙà¯à®•à®šà¯ செயà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:223
msgid ""
@@@ -1722,7 -1767,7 +2173,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "ஒனà¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
@@@ -1746,7 -1791,7 +2201,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "நிகழà¯à®ªà®Ÿà®¤à¯à®¤à¯ˆ செயலà¯à®ªà®Ÿ வை"
@@@ -1936,7 -1981,7 +2395,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "எபà¯à®ªà¯‹à®¤à¯à®®à¯ மேலே"
@@@ -1987,7 -2032,7 +2450,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -1996,7 -2041,7 +2463,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2052,7 -2097,7 +2523,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2064,8 -2109,9 +2539,14 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:379
++<<<<<<< HEAD
+msgid "Video splitter module"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Video splitter module"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:381
msgid "This adds video splitters like clone or wall"
@@@ -2221,7 -2267,7 +2702,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2299,8 -2345,9 +2784,14 @@@ msgid "Caching value for optical media
msgstr ""
#: src/libvlc-module.c:513
++<<<<<<< HEAD
+msgid "Network caching (ms)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Network caching (ms)"
+ msgstr "பிணைய அமைபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:515
msgid "Caching value for network resources, in milliseconds."
@@@ -2349,12 -2396,12 +2840,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2362,7 -2409,7 +2862,11 @@@ msgid "Default
msgstr "கோட நிலை"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2429,8 -2476,9 +2933,14 @@@ msgid "Stream number of the audio trac
msgstr ""
#: src/libvlc-module.c:583 modules/gui/qt4/ui/open_disk.h:313
++<<<<<<< HEAD
+msgid "Subtitle track"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle track"
+ msgstr "தà¯à®£à¯ˆ உரைகள௠சà¯à®µà®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:585
msgid "Stream number of the subtitle track to use (from 0 to n)."
@@@ -2466,16 -2514,18 +2976,28 @@@ msgid "Stream ID of the audio track to
msgstr ""
#: src/libvlc-module.c:603
++<<<<<<< HEAD
+msgid "Subtitle track ID"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle track ID"
+ msgstr "தà¯à®£à¯ˆ உரை சà¯à®µà®Ÿà¯ ID"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:605
msgid "Stream ID of the subtitle track to use."
msgstr ""
#: src/libvlc-module.c:607
++<<<<<<< HEAD
+msgid "Preferred video resolution"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Preferred video resolution"
+ msgstr "விரà¯à®ªà¯à®ª ஒலிதமொழி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:609
msgid ""
@@@ -2486,8 -2536,9 +3008,14 @@@
msgstr ""
#: src/libvlc-module.c:615
++<<<<<<< HEAD
+msgid "Best available"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Best available"
+ msgstr "உதவி ஒனà¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:615
msgid "Full HD (1080p)"
@@@ -2665,7 -2716,7 +3193,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -2688,8 -2739,9 +3220,14 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:712
++<<<<<<< HEAD
+msgid "Subpictures source module"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subpictures source module"
+ msgstr "தà¯à®£à¯ˆ பà¯à®•à¯ˆà®ªà¯à®ªà®Ÿà®™à¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:714
msgid ""
@@@ -2803,8 -2855,9 +3341,14 @@@ msgid "Default TCP connection timeout (
msgstr ""
#: src/libvlc-module.c:792
++<<<<<<< HEAD
+msgid "HTTP server address"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "HTTP server address"
+ msgstr "HTTP à®®à¯à®•à®µà®°à®¿:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:794
msgid ""
@@@ -2814,8 -2867,9 +3358,14 @@@
msgstr ""
#: src/libvlc-module.c:798
++<<<<<<< HEAD
+msgid "RTSP server address"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "RTSP server address"
+ msgstr "HTTP à®®à¯à®•à®µà®°à®¿:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:800
msgid ""
@@@ -2827,8 -2881,9 +3377,14 @@@
msgstr ""
#: src/libvlc-module.c:806
++<<<<<<< HEAD
+msgid "HTTP server port"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "HTTP server port"
+ msgstr "HTTP வழஙà¯à®•à®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:808
msgid ""
@@@ -2838,8 -2893,9 +3394,14 @@@
msgstr ""
#: src/libvlc-module.c:813
++<<<<<<< HEAD
+msgid "HTTPS server port"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "HTTPS server port"
+ msgstr "HTTP வழஙà¯à®•à®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:815
msgid ""
@@@ -2849,8 -2905,9 +3411,14 @@@
msgstr ""
#: src/libvlc-module.c:820
++<<<<<<< HEAD
+msgid "RTSP server port"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "RTSP server port"
+ msgstr "HTTP வழஙà¯à®•à®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:822
msgid ""
@@@ -3175,8 -3232,9 +3743,14 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:1006
++<<<<<<< HEAD
+msgid "VoD server module"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "VoD server module"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1008
msgid ""
@@@ -3456,8 -3514,9 +4030,14 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:1171
++<<<<<<< HEAD
+msgid "Load Media Library"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Load Media Library"
+ msgstr "ஊடகநூலகமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1173
msgid "Enable this option to load the SQL-based Media Library at VLC startup"
@@@ -3477,7 -3536,7 +4057,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "பà¯à®±à®•à¯à®•à®£à®¿"
@@@ -3501,8 -3560,8 +4085,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3513,8 -3572,9 +4102,14 @@@ msgid "Select the hotkey to use to swa
msgstr ""
#: src/libvlc-module.c:1205
++<<<<<<< HEAD
+msgid "Exit fullscreen"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Exit fullscreen"
+ msgstr "à®®à¯à®´à¯à®¤à¯à®¤à®¿à®°à¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1206
msgid "Select the hotkey to use to exit fullscreen state."
@@@ -3582,10 -3642,10 +4177,17 @@@ msgid "Slower (fine)
msgstr "மெதà¯à®µà®¾à®• (fine)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3598,10 -3658,10 +4200,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "à®®à¯à®¨à¯à®¤à¯ˆà®¯"
@@@ -3610,9 -3670,9 +4219,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3847,9 -3907,9 +4462,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "சதà¯à®¤à®¤à¯à®¤à¯ˆ கà¯à®±à¯ˆ"
@@@ -3898,8 -3958,9 +4519,14 @@@ msgid "Select the key to synchronize bo
msgstr ""
#: src/libvlc-module.c:1308
++<<<<<<< HEAD
+msgid "Subtitle sync / reset audio & subtitle synchronization"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle sync / reset audio & subtitle synchronization"
+ msgstr "தà¯à®£à¯ˆ உரை சà¯à®µà®Ÿà¯: %s"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1309
msgid "Select the key to reset synchronization of audio & subtitle timestamps."
@@@ -4027,8 -4088,9 +4654,14 @@@ msgstr "
#: src/libvlc-module.c:1346
#: modules/gui/qt4/components/playlist/standardpanel.cpp:234
++<<<<<<< HEAD
+msgid "Clear the playlist"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Clear the playlist"
+ msgstr "தà¯à®Ÿà¯ˆ படà¯à®Ÿà®¿à®¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1347
msgid "Select the key to clear the current playlist."
@@@ -4143,8 -4205,9 +4776,14 @@@ msgid "Decrease scale factor
msgstr ""
#: src/libvlc-module.c:1380
++<<<<<<< HEAD
+msgid "Toggle deinterlacing"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Toggle deinterlacing"
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1381
msgid "Activate or deactivate deinterlacing."
@@@ -4163,16 -4226,18 +4802,28 @@@ msgid "Show controller in fullscreen
msgstr ""
#: src/libvlc-module.c:1385
++<<<<<<< HEAD
+msgid "Boss key"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Boss key"
+ msgstr "à®®à¯à®•à¯à®•à®¿à®¯ விசை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1386
msgid "Hide the interface and pause playback."
msgstr ""
#: src/libvlc-module.c:1387
++<<<<<<< HEAD
+msgid "Context menu"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Context menu"
+ msgstr "தொடரà¯à®¨à¯à®¤à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1388
msgid "Show the contextual popup menu."
@@@ -4198,8 -4263,9 +4849,14 @@@ msgid "Record access filter start/stop.
msgstr ""
#: src/libvlc-module.c:1395
++<<<<<<< HEAD
+msgid "Normal/Loop/Repeat"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Normal/Loop/Repeat"
+ msgstr "மீணà¯à®Ÿà¯à®®à¯ செயà¯à®¯à®¾à®¤à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1396
msgid "Toggle Normal/Loop/Repeat playlist modes"
@@@ -4263,7 -4329,7 +4920,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "திடிரனகைபà¯à®ªà®±à¯à®±à¯"
@@@ -4462,12 -4528,12 +5123,21 @@@ msgstr "பதிவிறகà¯à®•à®®à
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "தவிரà¯à®•à¯à®•"
@@@ -4656,8 -4722,9 +5326,14 @@@ msgid "Chuvash
msgstr ""
#: src/text/iso-639_def.h:67
++<<<<<<< HEAD
+msgid "Cornish"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Cornish"
+ msgstr "நிறைவேறà¯à®±à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:68
msgid "Corsican"
@@@ -4668,8 -4735,9 +5344,14 @@@ msgid "Czech
msgstr ""
#: src/text/iso-639_def.h:70
++<<<<<<< HEAD
+msgid "Danish"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Danish"
+ msgstr "நிறைவேறà¯à®±à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:71
msgid "Dutch"
@@@ -4684,8 -4752,9 +5366,14 @@@ msgid "English
msgstr ""
#: src/text/iso-639_def.h:74
++<<<<<<< HEAD
+msgid "Esperanto"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Esperanto"
+ msgstr "Esperanto (Latin-3)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:75
msgid "Estonian"
@@@ -4700,8 -4769,9 +5388,14 @@@ msgid "Fijian
msgstr ""
#: src/text/iso-639_def.h:78
++<<<<<<< HEAD
+msgid "Finnish"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Finnish"
+ msgstr "நிறைவேறà¯à®±à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:79
msgid "French"
@@@ -4744,8 -4814,9 +5438,14 @@@ msgid "Guarani
msgstr ""
#: src/text/iso-639_def.h:89
++<<<<<<< HEAD
+msgid "Gujarati"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Gujarati"
+ msgstr "காலமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:90
msgid "Hebrew"
@@@ -4776,12 -4847,14 +5476,23 @@@ msgid "Inuktitut
msgstr ""
#: src/text/iso-639_def.h:97
++<<<<<<< HEAD
+msgid "Interlingue"
+msgstr ""
+
+#: src/text/iso-639_def.h:98
+msgid "Interlingua"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Interlingue"
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯"
+
+ #: src/text/iso-639_def.h:98
+ #, fuzzy
+ msgid "Interlingua"
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:99
msgid "Indonesian"
@@@ -4856,8 -4929,9 +5567,14 @@@ msgid "Lao
msgstr ""
#: src/text/iso-639_def.h:117 modules/demux/mp4/id3genres.h:118
++<<<<<<< HEAD
+msgid "Latin"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Latin"
+ msgstr "மதிபà¯à®ªà®¿à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:118
msgid "Latvian"
@@@ -4976,16 -5050,18 +5693,28 @@@ msgid "Panjabi
msgstr ""
#: src/text/iso-639_def.h:148
++<<<<<<< HEAD
+msgid "Persian"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Persian"
+ msgstr "பதிபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:149
msgid "Pali"
msgstr ""
#: src/text/iso-639_def.h:150
++<<<<<<< HEAD
+msgid "Polish"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Polish"
+ msgstr "வெளியிடà¯à®Ÿà®¾à®³à®°à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:151
msgid "Portuguese"
@@@ -5000,8 -5076,9 +5729,14 @@@ msgid "Quechua
msgstr ""
#: src/text/iso-639_def.h:154
++<<<<<<< HEAD
+msgid "Original audio"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Original audio"
+ msgstr "அசல௠அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:155
msgid "Raeto-Romance"
@@@ -5016,8 -5093,9 +5751,14 @@@ msgid "Rundi
msgstr ""
#: src/text/iso-639_def.h:158
++<<<<<<< HEAD
+msgid "Russian"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Russian"
+ msgstr "Russian (KOI8-R)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:159
msgid "Sango"
@@@ -5072,8 -5150,9 +5813,14 @@@ msgid "Sotho, Southern
msgstr ""
#: src/text/iso-639_def.h:172
++<<<<<<< HEAD
+msgid "Spanish"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Spanish"
+ msgstr "நிறைவேறà¯à®±à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:173
msgid "Sardinian"
@@@ -5116,8 -5195,9 +5863,14 @@@ msgid "Tajik
msgstr ""
#: src/text/iso-639_def.h:183
++<<<<<<< HEAD
+msgid "Tagalog"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Tagalog"
+ msgstr "செயலிளகà¯à®• செயà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:184
msgid "Thai"
@@@ -5160,8 -5240,9 +5913,14 @@@ msgid "Uighur
msgstr ""
#: src/text/iso-639_def.h:194
++<<<<<<< HEAD
+msgid "Ukrainian"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Ukrainian"
+ msgstr "Ukrainian (KOI8-U)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:195
msgid "Urdu"
@@@ -5172,8 -5253,9 +5931,14 @@@ msgid "Uzbek
msgstr ""
#: src/text/iso-639_def.h:197
++<<<<<<< HEAD
+msgid "Vietnamese"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Vietnamese"
+ msgstr "Vietnamese (VISCII)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/text/iso-639_def.h:198
msgid "Volapuk"
@@@ -5225,7 -5307,7 +5990,11 @@@ msgstr "வெடà¯à®Ÿà¯
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
@@@ -5292,8 -5374,9 +6061,14 @@@ msgid "ALSA
msgstr ""
#: modules/access/alsa.c:57
++<<<<<<< HEAD
+msgid "ALSA audio capture"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "ALSA audio capture"
+ msgstr "ALSA ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/attachment.c:44
msgid "Attachment"
@@@ -5312,20 -5395,23 +6087,37 @@@ msgid "FFmpeg access
msgstr ""
#: modules/access/avio.h:50
++<<<<<<< HEAD
+msgid "libavformat access output"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "libavformat access output"
+ msgstr "வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ˆ உபயோகி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bd/bd.c:54
msgid "BD"
msgstr ""
#: modules/access/bd/bd.c:55
++<<<<<<< HEAD
+msgid "Blu-ray Disc Input"
+msgstr ""
+
+#: modules/access/bluray.c:60
+msgid "Blu-ray menus"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Blu-ray Disc Input"
+ msgstr "Blu-Ray வடà¯à®Ÿà¯ உளà¯à®³à¯€à®Ÿà¯"
+
+ #: modules/access/bluray.c:60
+ #, fuzzy
+ msgid "Blu-ray menus"
+ msgstr "Blu-Ray"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:61
msgid "Use Blu-ray menus. If disabled, the movie will start directly"
@@@ -5333,12 -5419,14 +6125,23 @@@ msgstr "
#: modules/access/bluray.c:69 modules/services_discovery/udev.c:596
#: modules/gui/qt4/ui/open_disk.h:299
++<<<<<<< HEAD
+msgid "Blu-ray"
+msgstr ""
+
+#: modules/access/bluray.c:70
+msgid "Blu-ray Disc support (libbluray)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Blu-ray"
+ msgstr "Blu-Ray"
+
+ #: modules/access/bluray.c:70
+ #, fuzzy
+ msgid "Blu-ray Disc support (libbluray)"
+ msgstr "Blu-Ray வடà¯à®Ÿà¯ உளà¯à®³à¯€à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:263
msgid ""
@@@ -5347,12 -5435,14 +6150,23 @@@
msgstr ""
#: modules/access/bluray.c:272
++<<<<<<< HEAD
+msgid "Blu-ray Disc is corrupted."
+msgstr ""
+
+#: modules/access/bluray.c:275
+msgid "Missing AACS configuration file!"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Blu-ray Disc is corrupted."
+ msgstr "Blu-Ray வடà¯à®Ÿà¯ உளà¯à®³à¯€à®Ÿà¯"
+
+ #: modules/access/bluray.c:275
+ #, fuzzy
+ msgid "Missing AACS configuration file!"
+ msgstr "VLM வடிவமைபà¯à®ªà¯ கோபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/bluray.c:278
msgid "No valid processing key found in AACS config file."
@@@ -5385,8 -5475,9 +6199,14 @@@ msgid "Your system BD+ decoding librar
msgstr ""
#: modules/access/bluray.c:370
++<<<<<<< HEAD
+msgid "Blu-ray error"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Blu-ray error"
+ msgstr "Blu-Ray"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/cdda.c:62 modules/gui/macosx/open.m:162
#: modules/gui/qt4/ui/open_disk.h:300
@@@ -5451,8 -5542,9 +6271,14 @@@ msgid "
msgstr ""
#: modules/access/decklink.cpp:55 modules/video_output/decklink.cpp:80
++<<<<<<< HEAD
+msgid "Audio connection"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio connection"
+ msgstr "ஒலித கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/decklink.cpp:57
msgid ""
@@@ -5482,8 -5574,9 +6308,14 @@@ msgid "
msgstr ""
#: modules/access/decklink.cpp:71 modules/video_output/decklink.cpp:95
++<<<<<<< HEAD
+msgid "Video connection"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Video connection"
+ msgstr "நிகழà¯à®ªà®Ÿ கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/decklink.cpp:73
msgid ""
@@@ -5493,8 -5586,9 +6325,14 @@@ msgstr "
#: modules/access/decklink.cpp:82 modules/access/linsys/linsys_sdi.c:93
#: modules/video_output/decklink.cpp:113
++<<<<<<< HEAD
+msgid "SDI"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "SDI"
+ msgstr "SDP"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/decklink.cpp:82 modules/video_output/decklink.cpp:113
msgid "HDMI"
@@@ -5509,12 -5603,14 +6347,23 @@@ msgid "Component
msgstr ""
#: modules/access/decklink.cpp:82 modules/video_output/decklink.cpp:113
++<<<<<<< HEAD
+msgid "Composite"
+msgstr ""
+
+#: modules/access/decklink.cpp:82 modules/video_output/decklink.cpp:113
+msgid "S-video"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Composite"
+ msgstr "தொகà¯à®ªà¯à®ªà®¿:"
+
+ #: modules/access/decklink.cpp:82 modules/video_output/decklink.cpp:113
+ #, fuzzy
+ msgid "S-video"
+ msgstr "நிகழà¯à®ªà®Ÿà®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/decklink.cpp:89 modules/video_output/decklink.cpp:120
msgid "Embedded"
@@@ -5525,8 -5621,9 +6374,14 @@@ msgid "AES/EBU
msgstr ""
#: modules/access/decklink.cpp:89 modules/video_output/decklink.cpp:120
++<<<<<<< HEAD
+msgid "Analog"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Analog"
+ msgstr "செயலிளகà¯à®• செயà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/decklink.cpp:94 modules/demux/rawvid.c:61
msgid "Aspect ratio (4:3, 16:9). Default assumes square pixels."
@@@ -5657,8 -5754,9 +6512,14 @@@ msgid "Set the TV channel the tuner wil
msgstr ""
#: modules/access/dshow/dshow.cpp:166
++<<<<<<< HEAD
+msgid "Tuner Frequency"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Tuner Frequency"
+ msgstr "அலைவரிசை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:167
msgid "This overrides the channel. Measured in Hz."
@@@ -5667,8 -5765,9 +6528,14 @@@ msgstr "
#: modules/access/dshow/dshow.cpp:168
#: modules/gui/qt4/components/open_panels.cpp:832
#: modules/gui/qt4/components/open_panels.cpp:1053
++<<<<<<< HEAD
+msgid "Video standard"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Video standard"
+ msgstr "நிகழà¯à®ªà®Ÿ நிரà¯à®µà®¾à®•à®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dshow/dshow.cpp:169
msgid "Tuner country code"
@@@ -5793,8 -5892,9 +6660,14 @@@ msgid "The capture device \"%s\" does n
msgstr ""
#: modules/access/dtv/access.c:36
++<<<<<<< HEAD
+msgid "DVB adapter"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "DVB adapter"
+ msgstr "DVB வகை:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:38
msgid ""
@@@ -5803,8 -5903,9 +6676,14 @@@
msgstr ""
#: modules/access/dtv/access.c:41
++<<<<<<< HEAD
+msgid "DVB device"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "DVB device"
+ msgstr "DVD சாதனமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:43
msgid ""
@@@ -5823,24 -5924,27 +6702,42 @@@ msgid "
msgstr ""
#: modules/access/dtv/access.c:50
++<<<<<<< HEAD
+msgid "Network name"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Network name"
+ msgstr "பிணைய பெயரà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:51
msgid "Unique network name in the System Tuning Spaces"
msgstr ""
#: modules/access/dtv/access.c:53
++<<<<<<< HEAD
+msgid "Network name to create"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Network name to create"
+ msgstr "பிணைய பெயரà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:54
msgid "Create unique name in the System Tuning Spaces"
msgstr ""
#: modules/access/dtv/access.c:56
++<<<<<<< HEAD
+msgid "Frequency (Hz)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Frequency (Hz)"
+ msgstr "அலைவரிசை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:58
msgid ""
@@@ -5854,16 -5958,19 +6751,32 @@@ msgid "Modulation / Constellation
msgstr ""
#: modules/access/dtv/access.c:62
++<<<<<<< HEAD
+msgid "Layer A modulation"
+msgstr ""
+
+#: modules/access/dtv/access.c:63
+msgid "Layer B modulation"
+msgstr ""
+
+#: modules/access/dtv/access.c:64
+msgid "Layer C modulation"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Layer A modulation"
+ msgstr "உரà¯à®µà®ªà¯†à®°à¯à®•à¯à®•à®®à¯"
+
+ #: modules/access/dtv/access.c:63
+ #, fuzzy
+ msgid "Layer B modulation"
+ msgstr "உரà¯à®µà®ªà¯†à®°à¯à®•à¯à®•à®®à¯"
+
+ #: modules/access/dtv/access.c:64
+ #, fuzzy
+ msgid "Layer C modulation"
+ msgstr "உரà¯à®µà®ªà¯†à®°à¯à®•à¯à®•à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:66
msgid ""
@@@ -5893,8 -6000,9 +6806,14 @@@ msgid "
msgstr ""
#: modules/access/dtv/access.c:94
++<<<<<<< HEAD
+msgid "FEC code rate"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "FEC code rate"
+ msgstr "வடிவம௠அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:95
msgid "High-priority code rate"
@@@ -5929,8 -6037,9 +6848,14 @@@ msgid "Bandwidth (MHz)
msgstr ""
#: modules/access/dtv/access.c:124
++<<<<<<< HEAD
+msgid "10 MHz"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "10 MHz"
+ msgstr "6 MHz"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:124
msgid "8 MHz"
@@@ -5945,20 -6054,24 +6870,41 @@@ msgid "6 MHz
msgstr "6 MHz"
#: modules/access/dtv/access.c:125
++<<<<<<< HEAD
+msgid "5 MHz"
+msgstr ""
+
+#: modules/access/dtv/access.c:125
+msgid "1.712 MHz"
+msgstr ""
+
+#: modules/access/dtv/access.c:128
+msgid "Guard interval"
+msgstr ""
+
+#: modules/access/dtv/access.c:136
+msgid "Hierarchy mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "5 MHz"
+ msgstr "6 MHz"
+
+ #: modules/access/dtv/access.c:125
+ #, fuzzy
+ msgid "1.712 MHz"
+ msgstr "7 MHz"
+
+ #: modules/access/dtv/access.c:128
+ #, fuzzy
+ msgid "Guard interval"
+ msgstr "Lua à®®à¯à®•à®ªà¯à®ªà¯"
+
+ #: modules/access/dtv/access.c:136
+ #, fuzzy
+ msgid "Hierarchy mode"
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯ மாடà¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:144
msgid "DVB-T2 Physical Layer Pipe"
@@@ -6009,8 -6122,9 +6955,14 @@@ msgid "0.25
msgstr ""
#: modules/access/dtv/access.c:164
++<<<<<<< HEAD
+msgid "Transport stream ID"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Transport stream ID"
+ msgstr "உளà¯à®³à¯€à®Ÿà¯ ஓடை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:166
msgid "Polarization (Voltage)"
@@@ -6027,20 -6141,24 +6979,41 @@@ msgid "Unspecified (0V)
msgstr ""
#: modules/access/dtv/access.c:172
++<<<<<<< HEAD
+msgid "Vertical (13V)"
+msgstr ""
+
+#: modules/access/dtv/access.c:172
+msgid "Horizontal (18V)"
+msgstr ""
+
+#: modules/access/dtv/access.c:173
+msgid "Circular Right Hand (13V)"
+msgstr ""
+
+#: modules/access/dtv/access.c:173
+msgid "Circular Left Hand (18V)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Vertical (13V)"
+ msgstr "மேலà¯à®•à¯€à®´à¯"
+
+ #: modules/access/dtv/access.c:172
+ #, fuzzy
+ msgid "Horizontal (18V)"
+ msgstr "கிடைமடà¯à®Ÿà®®à¯"
+
+ #: modules/access/dtv/access.c:173
+ #, fuzzy
+ msgid "Circular Right Hand (13V)"
+ msgstr "வடà¯à®Ÿ வலதà¯"
+
+ #: modules/access/dtv/access.c:173
+ #, fuzzy
+ msgid "Circular Left Hand (18V)"
+ msgstr "வடà¯à®Ÿ இடதà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:175
msgid "High LNB voltage"
@@@ -6054,8 -6172,9 +7027,14 @@@ msgid "
msgstr ""
#: modules/access/dtv/access.c:181
++<<<<<<< HEAD
+msgid "Local oscillator low frequency (kHz)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Local oscillator low frequency (kHz)"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ அலைவரிசை (Hz)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:182
msgid "Local oscillator high frequency (kHz)"
@@@ -6080,8 -6199,9 +7059,14 @@@ msgid "
msgstr ""
#: modules/access/dtv/access.c:192
++<<<<<<< HEAD
+msgid "Continuous 22kHz tone"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Continuous 22kHz tone"
+ msgstr "தொடரà¯à®šà¯à®šà®¿à®¯à®¾à®© ஓடை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:194
msgid ""
@@@ -6119,8 -6239,9 +7104,14 @@@ msgid "
msgstr ""
#: modules/access/dtv/access.c:218
++<<<<<<< HEAD
+msgid "Network identifier"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Network identifier"
+ msgstr "பிணைய அமைபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:219
msgid "Satellite azimuth"
@@@ -6131,8 -6252,9 +7122,14 @@@ msgid "Satellite azimuth in tenths of d
msgstr ""
#: modules/access/dtv/access.c:221
++<<<<<<< HEAD
+msgid "Satellite elevation"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Satellite elevation"
+ msgstr "File Selection"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/dtv/access.c:222
msgid "Satellite elevation in tenths of degree"
@@@ -6155,23 -6277,27 +7152,44 @@@ msgid "Satellite range code as defined
msgstr ""
#: modules/access/dtv/access.c:232
++<<<<<<< HEAD
+msgid "Major channel"
+msgstr ""
+
+#: modules/access/dtv/access.c:233
+msgid "ATSC minor channel"
+msgstr ""
+
+#: modules/access/dtv/access.c:234
+msgid "Physical channel"
+msgstr ""
+
+#: modules/access/dtv/access.c:240
+msgid "DTV"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Major channel"
+ msgstr "ஒலித அலைவரிசைகளà¯"
- #: modules/access/dtv/access.c:241
- msgid "Digital Television and Radio"
+ #: modules/access/dtv/access.c:233
+ #, fuzzy
+ msgid "ATSC minor channel"
+ msgstr "ஒலித அலைவரிசைகளà¯"
+
+ #: modules/access/dtv/access.c:234
+ #, fuzzy
+ msgid "Physical channel"
+ msgstr "ஒலித அலைவரிசைகளà¯"
+
+ #: modules/access/dtv/access.c:240
+ #, fuzzy
+ msgid "DTV"
+ msgstr "தொலைகாடà¯à®šà®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+
+ #: modules/access/dtv/access.c:241
+ msgid "Digital Television and Radio"
msgstr ""
#: modules/access/dtv/access.c:279
@@@ -6304,14 -6430,14 +7322,25 @@@ msgid "File reading failed
msgstr "கோபà¯à®ªà¯ வாசிபà¯à®ªà¯ தோலà¯à®µà®¿"
#: modules/access/file.c:177
++<<<<<<< HEAD
+#, c-format
+msgid "VLC could not open the file \"%s\" (%m)."
+msgstr ""
+
+#: modules/access/file.c:299
+#, c-format
+msgid "VLC could not read the file (%m)."
+msgstr ""
++=======
+ #, fuzzy, c-format
+ msgid "VLC could not open the file \"%s\" (%m)."
+ msgstr "VLC யால௠கோபà¯à®ªà¯à®•à®³à¯ˆ திறகà¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ \"%s\"."
+
+ #: modules/access/file.c:299
+ #, fuzzy, c-format
+ msgid "VLC could not read the file (%m)."
+ msgstr "VLC யால௠கோபà¯à®ªà¯à®•à®³à¯ˆ வாசிகà¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/fs.c:33
msgid "Subdirectory behavior"
@@@ -6330,12 -6456,14 +7359,23 @@@ msgid "Collapse
msgstr ""
#: modules/access/fs.c:42
++<<<<<<< HEAD
+msgid "Expand"
+msgstr ""
+
+#: modules/access/fs.c:44
+msgid "Ignored extensions"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Expand"
+ msgstr "à®®à¯à®Ÿà®¿à®µà¯"
+
+ #: modules/access/fs.c:44
+ #, fuzzy
+ msgid "Ignored extensions"
+ msgstr "AAC நீடிபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/fs.c:46
msgid ""
@@@ -6357,20 -6485,23 +7397,37 @@@ msgid "
msgstr ""
#: modules/access/fs.c:55
++<<<<<<< HEAD
+msgid "Do not sort the items."
+msgstr ""
+
+#: modules/access/fs.c:57
+msgid "Directory sort order"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Do not sort the items."
+ msgstr "VLC யால௠கோபà¯à®ªà¯à®•à®³à¯ˆ வாசிகà¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
+
+ #: modules/access/fs.c:57
+ #, fuzzy
+ msgid "Directory sort order"
+ msgstr "நேரடியாக காடà¯à®Ÿà¯ உளà¯à®³à¯€à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/fs.c:59
msgid "Define the sort algorithm used when adding items from a directory."
msgstr ""
#: modules/access/fs.c:62
++<<<<<<< HEAD
+msgid "File input"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "File input"
+ msgstr "FTP உளà¯à®³à¯€à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/fs.c:63 modules/access_output/file.c:79
#: modules/audio_output/file.c:110 modules/gui/macosx/open.m:130
@@@ -6385,8 -6516,9 +7442,14 @@@ msgid "File
msgstr "கோபà¯à®ªà¯"
#: modules/access/fs.c:72 modules/gui/qt4/ui/sprefs_video.h:359
++<<<<<<< HEAD
+msgid "Directory"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Directory"
+ msgstr "கோபà¯à®ªà¯/கோபà¯à®ªà®•à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/ftp.c:58
msgid "FTP user name"
@@@ -6496,16 -6628,18 +7559,28 @@@ msgid "Forward Cookies across http redi
msgstr ""
#: modules/access/http.c:88
++<<<<<<< HEAD
+msgid "HTTP referer value"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "HTTP referer value"
+ msgstr "HTTP பயனரà¯à®ªà¯†à®¯à®°à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/http.c:89
msgid "Customize the HTTP referer, simulating a previous document"
msgstr ""
#: modules/access/http.c:91
++<<<<<<< HEAD
+msgid "User Agent"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "User Agent"
+ msgstr "HTTP பயனரà¯à®ªà¯†à®¯à®°à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/http.c:92
msgid ""
@@@ -6539,8 -6673,9 +7614,14 @@@ msgid "Dummy
msgstr ""
#: modules/access/idummy.c:43
++<<<<<<< HEAD
+msgid "Dummy input"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Dummy input"
+ msgstr "UDP உளà¯à®³à¯€à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/imem.c:49 modules/gui/qt4/components/playlist/sorting.h:54
#: modules/stream_out/bridge.c:41 modules/stream_out/mosaic_bridge.c:105
@@@ -6552,28 -6687,32 +7633,51 @@@ msgid "Set the ID of the elementary str
msgstr ""
#: modules/access/imem.c:53 modules/demux/image.c:48
++<<<<<<< HEAD
+msgid "Group"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Group"
+ msgstr "வெடà¯à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/imem.c:55 modules/demux/image.c:50
msgid "Set the group of the elementary stream"
msgstr ""
#: modules/access/imem.c:57
++<<<<<<< HEAD
+msgid "Category"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Category"
+ msgstr "அதà¯à®¤à®¿à®¯à®¾à®¯à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/imem.c:59
msgid "Set the category of the elementary stream"
msgstr ""
#: modules/access/imem.c:64
++<<<<<<< HEAD
+msgid "Unknown"
+msgstr ""
+
+#: modules/access/imem.c:64
+msgid "Data"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Unknown"
+ msgstr "தெரியாத வகை"
+
+ #: modules/access/imem.c:64
+ #, fuzzy
+ msgid "Data"
+ msgstr "தேதி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/imem.c:69
msgid "Set the codec of the elementary stream"
@@@ -6588,8 -6727,9 +7692,14 @@@ msgid "Sample rate of an audio elementa
msgstr ""
#: modules/access/imem.c:79 modules/audio_output/amem.c:49
++<<<<<<< HEAD
+msgid "Channels count"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Channels count"
+ msgstr "அலைவரிசைகளà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/imem.c:81
msgid "Channels count of an audio elementary stream"
@@@ -6622,8 -6762,9 +7732,14 @@@ msgid "Height of video or subtitle elem
msgstr ""
#: modules/access/imem.c:89
++<<<<<<< HEAD
+msgid "Display aspect ratio"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Display aspect ratio"
+ msgstr "மாதிரி தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/imem.c:91
msgid "Display aspect ratio of a video elementary stream"
@@@ -6650,16 -6791,18 +7766,28 @@@ msgid "Data for the get and release fun
msgstr ""
#: modules/access/imem.c:105
++<<<<<<< HEAD
+msgid "Get function"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Get function"
+ msgstr "மூட௠தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/imem.c:107
msgid "Address of the get callback function"
msgstr ""
#: modules/access/imem.c:109
++<<<<<<< HEAD
+msgid "Release function"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Release function"
+ msgstr "மூட௠தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/imem.c:111
msgid "Address of the release callback function"
@@@ -6667,16 -6810,18 +7795,28 @@@ msgstr "
#: modules/access/imem.c:113 modules/gui/macosx/AudioEffects.m:130
#: modules/gui/qt4/components/extended_panels.cpp:1401
++<<<<<<< HEAD
+msgid "Size"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Size"
+ msgstr "அளவà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/imem.c:115
msgid "Size of stream in bytes"
msgstr ""
#: modules/access/imem.c:118 modules/access/imem.c:119
++<<<<<<< HEAD
+msgid "Memory input"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Memory input"
+ msgstr "உளà¯à®³à¯€à®Ÿà¯ இலà¯à®²à¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/jack.c:59
msgid "Pace"
@@@ -6716,8 -6861,9 +7856,14 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:75
#: modules/access/linsys/linsys_sdi.c:70
++<<<<<<< HEAD
+msgid "Video ID"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Video ID"
+ msgstr "நிகழà¯à®ªà®Ÿ PID"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/linsys/linsys_hdsdi.c:77
#: modules/access/linsys/linsys_sdi.c:72
@@@ -6731,8 -6877,9 +7877,14 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:81
#: modules/access/linsys/linsys_sdi.c:76
++<<<<<<< HEAD
+msgid "Audio configuration"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio configuration"
+ msgstr "&VLM வடிவமைபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/linsys/linsys_hdsdi.c:83
#: modules/access/linsys/linsys_sdi.c:78
@@@ -6748,8 -6895,9 +7900,14 @@@ msgid "HD-SDI
msgstr ""
#: modules/access/linsys/linsys_sdi.c:79
++<<<<<<< HEAD
+msgid "Teletext configuration"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Teletext configuration"
+ msgstr "&VLM வடிவமைபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/linsys/linsys_sdi.c:81
msgid ""
@@@ -6757,20 -6905,23 +7915,37 @@@
msgstr ""
#: modules/access/linsys/linsys_sdi.c:82
++<<<<<<< HEAD
+msgid "Teletext language"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Teletext language"
+ msgstr "தà¯à®£à¯ˆ உரை மொழி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/linsys/linsys_sdi.c:84
msgid "Allows you to set Teletext language (page=lang/type,...)."
msgstr ""
#: modules/access/linsys/linsys_sdi.c:92
++<<<<<<< HEAD
+msgid "SDI Input"
+msgstr ""
+
+#: modules/access/linsys/linsys_sdi.c:113
+msgid "SDI Demux"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "SDI Input"
+ msgstr "உளà¯à®³à¯€à®Ÿà¯"
+
+ #: modules/access/linsys/linsys_sdi.c:113
+ #, fuzzy
+ msgid "SDI Demux"
+ msgstr "AVI demuxer"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/live555.cpp:78
msgid "Kasenna RTSP dialect"
@@@ -6814,8 -6965,9 +7989,14 @@@ msgid "
msgstr ""
#: modules/access/live555.cpp:94
++<<<<<<< HEAD
+msgid "RTSP frame buffer size"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "RTSP frame buffer size"
+ msgstr "எலà¯à®²à¯ˆ அகலமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/live555.cpp:95
msgid ""
@@@ -6869,8 -7021,9 +8050,14 @@@ msgid "Please enter a valid login name
msgstr ""
#: modules/access/live555.cpp:655
++<<<<<<< HEAD
+msgid "RTSP connection failed"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "RTSP connection failed"
+ msgstr "இணைபà¯à®ªà¯ தோலà¯à®µà®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/live555.cpp:656
msgid "Access to the stream is denied by the server configuration."
@@@ -6928,9 -7081,9 +8115,15 @@@ msgid "VLC could not read the file.
msgstr "VLC யால௠கோபà¯à®ªà¯à®•à®³à¯ˆ வாசிகà¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
#: modules/access/mtp.c:292 modules/access/vdr.c:536
++<<<<<<< HEAD
+#, c-format
+msgid "VLC could not open the file \"%s\". (%m)"
+msgstr ""
++=======
+ #, fuzzy, c-format
+ msgid "VLC could not open the file \"%s\". (%m)"
+ msgstr "VLC யால௠கோபà¯à®ªà¯à®•à®³à¯ˆ திறகà¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ \"%s\"."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/oss.c:66
msgid "Capture the audio stream in stereo."
@@@ -6976,8 -7129,9 +8169,14 @@@ msgid "Append to file if it exists inst
msgstr ""
#: modules/access_output/file.c:71
++<<<<<<< HEAD
+msgid "Format time and date"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Format time and date"
+ msgstr "வடிவூடà¯à®Ÿà®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/file.c:72
msgid "Perform ISO C time and date formatting on the file path"
@@@ -7045,8 -7199,9 +8244,14 @@@ msgid "HTTP stream output
msgstr "HTTP ஓடை வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
#: modules/access_output/livehttp.c:69
++<<<<<<< HEAD
+msgid "Segment length"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Segment length"
+ msgstr "பகà¯à®¤à®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/livehttp.c:70
msgid "Length of TS stream segments"
@@@ -7062,8 -7217,9 +8267,14 @@@ msgid "
msgstr ""
#: modules/access_output/livehttp.c:76
++<<<<<<< HEAD
+msgid "Number of segments"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Number of segments"
+ msgstr "அலைவரிசை இலகà¯à®•à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/livehttp.c:77
msgid "Number of segments to include in index"
@@@ -7078,8 -7234,9 +8289,14 @@@ msgid "Add EXT-X-ALLOW-CACHE:NO directi
msgstr ""
#: modules/access_output/livehttp.c:82
++<<<<<<< HEAD
+msgid "Index file"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Index file"
+ msgstr "உரà¯à®µ கோபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/livehttp.c:83
msgid "Path to the index file to create"
@@@ -7094,8 -7251,9 +8311,14 @@@ msgid "Full URL to put in index file. U
msgstr ""
#: modules/access_output/livehttp.c:89
++<<<<<<< HEAD
+msgid "Delete segments"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Delete segments"
+ msgstr "பகà¯à®¤à®¿à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/livehttp.c:90
msgid "Delete segments when they are no longer needed"
@@@ -7106,8 -7264,9 +8329,14 @@@ msgid "Use muxers rate control mechanis
msgstr ""
#: modules/access_output/livehttp.c:94
++<<<<<<< HEAD
+msgid "AES key URI to place in playlist"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "AES key URI to place in playlist"
+ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ தேடலà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/livehttp.c:96
msgid "AES key file"
@@@ -7137,12 -7296,14 +8366,23 @@@ msgid "Generate IV instead using segmen
msgstr ""
#: modules/access_output/livehttp.c:108
-#, fuzzy
++<<<<<<< HEAD
msgid "HTTP Live streaming output"
-msgstr "HTTP ஓடை வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
+msgstr ""
#: modules/access_output/livehttp.c:109
-#, fuzzy
+msgid "LiveHTTP"
+msgstr ""
++=======
++#, fuzzy
++msgid "HTTP Live streaming output"
++msgstr "HTTP ஓடை வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
++
++#: modules/access_output/livehttp.c:109
++#, fuzzy
+ msgid "LiveHTTP"
+ msgstr "HTTP"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access_output/shout.c:64
#: modules/gui/qt4/components/sout/sout_widgets.cpp:368
@@@ -7260,28 -7421,34 +8500,59 @@@ msgid "
msgstr ""
#: modules/access/pulse.c:42
++<<<<<<< HEAD
+msgid "PulseAudio"
+msgstr ""
+
+#: modules/access/pulse.c:43
+msgid "PulseAudio input"
+msgstr ""
+
+#: modules/access/qtcapture.m:43
+msgid "Video Capture width"
+msgstr ""
+
+#: modules/access/qtcapture.m:44
+msgid "Video Capture width in pixel"
+msgstr ""
+
+#: modules/access/qtcapture.m:45
+msgid "Video Capture height"
+msgstr ""
+
+#: modules/access/qtcapture.m:46
+msgid "Video Capture height in pixel"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "PulseAudio"
+ msgstr "ஒலிதமà¯"
+
+ #: modules/access/pulse.c:43
+ #, fuzzy
+ msgid "PulseAudio input"
+ msgstr "ஒலிதம௠உளà¯à®³à¯€à®Ÿà¯"
+
+ #: modules/access/qtcapture.m:43
+ #, fuzzy
+ msgid "Video Capture width"
+ msgstr "நிகழà¯à®ªà®Ÿ திடிரனகைபà¯à®ªà®±à¯à®±à¯ அகலமà¯"
+
+ #: modules/access/qtcapture.m:44
+ #, fuzzy
+ msgid "Video Capture width in pixel"
+ msgstr "நிகழà¯à®ªà®Ÿ கைபà¯à®ªà®±à¯à®±à¯à®¤à®²à¯ (Video4Linux)"
+
+ #: modules/access/qtcapture.m:45
+ #, fuzzy
+ msgid "Video Capture height"
+ msgstr "நிகழà¯à®ªà®Ÿ திடிரனகைபà¯à®ªà®±à¯à®±à¯ உயரமà¯"
+
+ #: modules/access/qtcapture.m:46
+ #, fuzzy
+ msgid "Video Capture height in pixel"
+ msgstr "நிகழà¯à®ªà®Ÿ திடிரனகைபà¯à®ªà®±à¯à®±à¯ உயரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/qtcapture.m:60 modules/access/qtcapture.m:61
msgid "Quicktime Capture"
@@@ -7302,28 -7469,33 +8573,55 @@@ msgid "Uncompressed RAR
msgstr ""
#: modules/access/rdp.c:49
++<<<<<<< HEAD
+msgid "RDP auth username"
+msgstr ""
+
+#: modules/access/rdp.c:50
+msgid "RDP auth password"
+msgstr ""
+
+#: modules/access/rdp.c:51
+msgid "RDP Password"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "RDP auth username"
+ msgstr "RTSP பயனரà¯à®ªà¯†à®¯à®°à¯"
+
+ #: modules/access/rdp.c:50
+ #, fuzzy
+ msgid "RDP auth password"
+ msgstr "RTSP கடவà¯à®šà¯à®šà¯Šà®²à¯"
+
+ #: modules/access/rdp.c:51
+ #, fuzzy
+ msgid "RDP Password"
+ msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/rdp.c:52
msgid "Encrypted connexion"
msgstr ""
#: modules/access/rdp.c:54
++<<<<<<< HEAD
+msgid "Acquisition rate (in fps)"
+msgstr ""
+
+#: modules/access/rdp.c:65
+msgid "RDP"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Acquisition rate (in fps)"
+ msgstr "ஒலிதம௠பாரà¯à®µà¯ˆà®•à¯à®•à®³à¯"
+
+ #: modules/access/rdp.c:65
+ #, fuzzy
+ msgid "RDP"
+ msgstr "RTP"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/rdp.c:69
msgid "RDP Remote Desktop"
@@@ -7499,16 -7671,18 +8797,28 @@@ msgid "
msgstr ""
#: modules/access/screen/screen.c:79
++<<<<<<< HEAD
+msgid "Display ID"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Display ID"
+ msgstr "காடà¯à®šà®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/screen/screen.c:81
msgid "Display ID. If not specified, main display ID is used. "
msgstr ""
#: modules/access/screen/screen.c:82
++<<<<<<< HEAD
+msgid "Screen index"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Screen index"
+ msgstr "திரை உளà¯à®³à¯€à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/screen/screen.c:84
msgid "Index of screen (1, 2, 3, ...). Alternative to Display ID."
@@@ -7521,7 -7695,7 +8831,11 @@@ msgstr "திரை உளà¯à®³à¯€à®Ÿ
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "திரை"
@@@ -7535,8 -7709,9 +8849,14 @@@ msgid "Region left column
msgstr ""
#: modules/access/screen/xcb.c:44
++<<<<<<< HEAD
+msgid "Abscissa of the capture region in pixels."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Abscissa of the capture region in pixels."
+ msgstr "நிகழà¯à®ªà®Ÿ திடிரனகைபà¯à®ªà®±à¯à®±à¯ உயரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/screen/xcb.c:46
msgid "Region top row"
@@@ -7571,8 -7746,9 +8891,14 @@@ msgid "SDP
msgstr "SDP"
#: modules/access/sdp.c:34
++<<<<<<< HEAD
+msgid "Session Description Protocol"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Session Description Protocol"
+ msgstr "பகà¯à®¤à®¿ விவரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/sftp.c:51
msgid "SFTP port"
@@@ -7612,16 -7788,18 +8938,28 @@@ msgid "Pixel depth of the frame buffer
msgstr ""
#: modules/access/shm.c:49
++<<<<<<< HEAD
+msgid "Frame buffer width"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Frame buffer width"
+ msgstr "எலà¯à®²à¯ˆ அகலமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/shm.c:51
msgid "Pixel width of the frame buffer (ignored for XWD file)"
msgstr ""
#: modules/access/shm.c:53
++<<<<<<< HEAD
+msgid "Frame buffer height"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Frame buffer height"
+ msgstr "எலà¯à®²à¯ˆ உயரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/shm.c:55
msgid "Pixel height of the frame buffer (ignored for XWD file)"
@@@ -7670,8 -7848,9 +9008,14 @@@ msgid "32 bits
msgstr ""
#: modules/access/shm.c:82
++<<<<<<< HEAD
+msgid "Framebuffer input"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Framebuffer input"
+ msgstr "போலி ஒலித உளà¯à®³à¯€à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/shm.c:83
msgid "Shared memory framebuffer"
@@@ -7710,8 -7889,9 +9054,14 @@@ msgid "TCP input
msgstr "TCP உளà¯à®³à¯€à®Ÿà¯"
#: modules/access/timecode.c:43
++<<<<<<< HEAD
+msgid "Time code"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Time code"
+ msgstr "நிகழà¯à®ªà®Ÿ கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/timecode.c:44
msgid "Time code subpicture elementary stream generator"
@@@ -7726,20 -7906,24 +9076,41 @@@ msgid "UDP input
msgstr "UDP உளà¯à®³à¯€à®Ÿà¯"
#: modules/access/v4l2/controls.c:784
++<<<<<<< HEAD
+msgid "Reset defaults"
+msgstr ""
+
+#: modules/access/v4l2/v4l2.c:44
+msgid "Video capture device"
+msgstr ""
+
+#: modules/access/v4l2/v4l2.c:45
+msgid "Video capture device node."
+msgstr ""
+
+#: modules/access/v4l2/v4l2.c:46
+msgid "VBI capture device"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Reset defaults"
+ msgstr "இயலà¯à®ªà®¾à®©à®¤à¯ தேரà¯à®µà¯à®•à®³à¯à®•à¯à®•à¯ மாறà¯à®±à¯à®•"
+
+ #: modules/access/v4l2/v4l2.c:44
+ #, fuzzy
+ msgid "Video capture device"
+ msgstr "நிகழà¯à®ªà®Ÿ கைபà¯à®ªà®±à¯à®±à¯à®¤à®²à¯"
+
+ #: modules/access/v4l2/v4l2.c:45
+ #, fuzzy
+ msgid "Video capture device node."
+ msgstr "நிகழà¯à®ªà®Ÿ சாதனம௠பெயரà¯"
+
+ #: modules/access/v4l2/v4l2.c:46
+ #, fuzzy
+ msgid "VBI capture device"
+ msgstr "கைபà¯à®ªà®±à¯à®±à¯ & சாதனமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:48
msgid "The device node where VBI data can be read (for closed captions) "
@@@ -7784,8 -7968,9 +9155,14 @@@ msgid "Radio device
msgstr "வானொலி சாதனமà¯"
#: modules/access/v4l2/v4l2.c:74
++<<<<<<< HEAD
+msgid "Radio tuner device node."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Radio tuner device node."
+ msgstr "வானொலி சாதனமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:75
#: modules/gui/qt4/components/open_panels.cpp:1060
@@@ -7805,12 -7990,14 +9182,23 @@@ msgid "Tuner audio mono/stereo and trac
msgstr ""
#: modules/access/v4l2/v4l2.c:82
++<<<<<<< HEAD
+msgid "Reset controls"
+msgstr ""
+
+#: modules/access/v4l2/v4l2.c:83
+msgid "Reset controls to defaults."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Reset controls"
+ msgstr "நீடà¯à®Ÿà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #: modules/access/v4l2/v4l2.c:83
+ #, fuzzy
+ msgid "Reset controls to defaults."
+ msgstr "இயலà¯à®ªà®¾à®©à®¤à¯ தேரà¯à®µà¯à®•à®³à¯à®•à¯à®•à¯ மாறà¯à®±à¯à®•"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:84 modules/gui/macosx/VideoEffects.m:92
#: modules/video_filter/atmo/atmo.cpp:263
@@@ -7823,8 -8010,9 +9211,14 @@@ msgid "Picture brightness or black leve
msgstr ""
#: modules/access/v4l2/v4l2.c:86
++<<<<<<< HEAD
+msgid "Automatic brightness"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Automatic brightness"
+ msgstr "தானாக"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:88
msgid "Automatically adjust the picture brightness."
@@@ -7860,12 -8048,14 +9254,23 @@@ msgid "Hue or color balance.
msgstr ""
#: modules/access/v4l2/v4l2.c:95
++<<<<<<< HEAD
+msgid "Automatic hue"
+msgstr ""
+
+#: modules/access/v4l2/v4l2.c:97
+msgid "Automatically adjust the picture hue."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Automatic hue"
+ msgstr "தானாக"
+
+ #: modules/access/v4l2/v4l2.c:97
+ #, fuzzy
+ msgid "Automatically adjust the picture hue."
+ msgstr "தானாக பà¯à®¤à¯à®ªà¯à®ªà®¿à®•à¯à®• சோதனை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:98
msgid "White balance temperature (K)"
@@@ -7907,24 -8097,28 +9312,46 @@@ msgid "Gamma
msgstr ""
#: modules/access/v4l2/v4l2.c:113
++<<<<<<< HEAD
+msgid "Gamma adjust."
+msgstr ""
+
+#: modules/access/v4l2/v4l2.c:114
+msgid "Automatic gain"
+msgstr ""
+
+#: modules/access/v4l2/v4l2.c:116
+msgid "Automatically set the video gain."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Gamma adjust."
+ msgstr "உரà¯à®µ சரியாகà¯à®•à®²à¯"
+
+ #: modules/access/v4l2/v4l2.c:114
+ #, fuzzy
+ msgid "Automatic gain"
+ msgstr "தானாக"
+
+ #: modules/access/v4l2/v4l2.c:116
+ #, fuzzy
+ msgid "Automatically set the video gain."
+ msgstr "தானாக பà¯à®¤à¯à®ªà¯à®ªà®¿à®•à¯à®• சோதனை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:117 modules/audio_filter/gain.c:62
msgid "Gain"
msgstr ""
#: modules/access/v4l2/v4l2.c:119
++<<<<<<< HEAD
+msgid "Picture gain."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Picture gain."
+ msgstr "சிதà¯à®¤à®¿à®°à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:120
msgid "Sharpness"
@@@ -7935,20 -8129,23 +9362,37 @@@ msgid "Sharpness filter adjust.
msgstr ""
#: modules/access/v4l2/v4l2.c:122
++<<<<<<< HEAD
+msgid "Chroma gain"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Chroma gain"
+ msgstr "Chroma வடிவூடà¯à®Ÿà®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:123
msgid "Chroma gain control."
msgstr ""
#: modules/access/v4l2/v4l2.c:124
++<<<<<<< HEAD
+msgid "Automatic chroma gain"
+msgstr ""
+
+#: modules/access/v4l2/v4l2.c:126
+msgid "Automatically control the chroma gain."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Automatic chroma gain"
+ msgstr "தானாக"
+
+ #: modules/access/v4l2/v4l2.c:126
+ #, fuzzy
+ msgid "Automatically control the chroma gain."
+ msgstr "தானாக பà¯à®¤à¯à®ªà¯à®ªà®¿à®•à¯à®• சோதனை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:127
msgid "Power line frequency"
@@@ -7972,8 -8169,9 +9416,14 @@@ msgid "Backlight compensation
msgstr ""
#: modules/access/v4l2/v4l2.c:141
++<<<<<<< HEAD
+msgid "Band-stop filter"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Band-stop filter"
+ msgstr "நகலி நிகழà¯à®ªà®Ÿ சலà¯à®²à®Ÿà¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:143
msgid "Cut a light band induced by fluorescent lighting (unit undocumented)."
@@@ -8014,16 -8212,19 +9464,32 @@@ msgid "
msgstr ""
#: modules/access/v4l2/v4l2.c:156
++<<<<<<< HEAD
+msgid "Color effect"
+msgstr ""
+
+#: modules/access/v4l2/v4l2.c:157
+msgid "Select a color effect."
+msgstr ""
+
+#: modules/access/v4l2/v4l2.c:164
+msgid "Black & white"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Color effect"
+ msgstr "எழà¯à®¤à¯à®¤à¯à®±à¯ விளைவà¯"
+
+ #: modules/access/v4l2/v4l2.c:157
+ #, fuzzy
+ msgid "Select a color effect."
+ msgstr "கோபà¯à®ªà®•à®¤à¯à®¤à¯ˆ தெரிவ௠செயà¯"
+
+ #: modules/access/v4l2/v4l2.c:164
+ #, fuzzy
+ msgid "Black & white"
+ msgstr "கறà¯à®ªà¯à®ªà¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:164 modules/gui/macosx/VideoEffects.m:136
#: modules/video_filter/sepia.c:65 modules/gui/qt4/ui/video_effects.h:1341
@@@ -8047,12 -8248,14 +9513,23 @@@ msgid "Sky blue
msgstr ""
#: modules/access/v4l2/v4l2.c:166
++<<<<<<< HEAD
+msgid "Grass green"
+msgstr ""
+
+#: modules/access/v4l2/v4l2.c:166
+msgid "Skin whiten"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Grass green"
+ msgstr "பசà¯à®šà¯ˆ"
+
+ #: modules/access/v4l2/v4l2.c:166
+ #, fuzzy
+ msgid "Skin whiten"
+ msgstr "தோலà¯à®•à®³à¯ˆ உபயோகி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:166
msgid "Vivid"
@@@ -8060,16 -8263,18 +9537,28 @@@ msgstr "
#: modules/access/v4l2/v4l2.c:169 modules/audio_output/auhal.c:66
#: modules/audio_output/directx.c:115 modules/audio_output/waveout.c:146
++<<<<<<< HEAD
+msgid "Audio volume"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio volume"
+ msgstr "ஒலித கோபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:171
msgid "Volume of the audio input."
msgstr ""
#: modules/access/v4l2/v4l2.c:172
++<<<<<<< HEAD
+msgid "Audio balance"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio balance"
+ msgstr "ஒலிதம௠மொழி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:174
msgid "Balance of the audio input."
@@@ -8096,8 -8301,9 +9585,14 @@@ msgid "Mute the audio.
msgstr ""
#: modules/access/v4l2/v4l2.c:184
++<<<<<<< HEAD
+msgid "Loudness mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Loudness mode"
+ msgstr "சதà¯à®¤à®®à®¾à®•"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:186
msgid "Loudness mode a.k.a. bass boost."
@@@ -8150,8 -8356,9 +9645,14 @@@ msgid "Mono
msgstr "Mono"
#: modules/access/v4l2/v4l2.c:269
++<<<<<<< HEAD
+msgid "Primary language"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Primary language"
+ msgstr "ஒலிதம௠மொழி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:270
msgid "Secondary language or program"
@@@ -8162,8 -8369,9 +9663,14 @@@ msgid "Dual mono
msgstr ""
#: modules/access/v4l2/v4l2.c:275
++<<<<<<< HEAD
+msgid "V4L"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "V4L"
+ msgstr "VLM"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/v4l2/v4l2.c:276
msgid "Video4Linux input"
@@@ -8202,8 -8410,9 +9709,14 @@@ msgid "VCD input
msgstr "VCD உளà¯à®³à¯€à®Ÿà¯"
#: modules/access/vcd/vcd.c:54
++<<<<<<< HEAD
+msgid "[vcd:][device][#[title][,[chapter]]]"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "[vcd:][device][#[title][,[chapter]]]"
+ msgstr "[வடà¯à®Ÿà¯:][சாதனமà¯][@[தலைபà¯à®ªà¯][,[அதà¯à®¤à®¿à®¯à®¾à®¯à®®à¯]]]"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vcdx/access.c:272 modules/access/vcdx/access.c:352
#: modules/access/vcdx/access.c:674 modules/access/vcdx/info.c:229
@@@ -8253,7 -8462,7 +9766,11 @@@ msgstr "ஒலி max #
msgid "Volume Set"
msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®¤à¯ˆ அமை"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -8379,8 -8588,9 +9896,14 @@@ msgid "Support for VDR recordings (http
msgstr ""
#: modules/access/vdr.c:78
++<<<<<<< HEAD
+msgid "Chapter offset in ms"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Chapter offset in ms"
+ msgstr "அதà¯à®¤à®¿à®¯à®¾à®¯ கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vdr.c:80
msgid "Move all chapters. This value should be set in milliseconds."
@@@ -8391,24 -8601,28 +9914,46 @@@ msgid "Default frame rate for chapter i
msgstr ""
#: modules/access/vdr.c:88
++<<<<<<< HEAD
+msgid "VDR"
+msgstr ""
+
+#: modules/access/vdr.c:91
+msgid "VDR recordings"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "VDR"
+ msgstr "VOD"
+
+ #: modules/access/vdr.c:91
+ #, fuzzy
+ msgid "VDR recordings"
+ msgstr "பதிவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vdr.c:809
msgid "VDR Cut Marks"
msgstr ""
#: modules/access/vdr.c:872
++<<<<<<< HEAD
+msgid "Start"
+msgstr ""
+
+#: modules/access/vnc.c:48
+msgid "X.509 Certificate Authority"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Start"
+ msgstr "&தொடகà¯à®•à®®à¯ "
+
+ #: modules/access/vnc.c:48
+ #, fuzzy
+ msgid "X.509 Certificate Authority"
+ msgstr "சானà¯à®±à®¿à®¤à®´à¯ கோபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:49
msgid "Certificate of the Authority to verify server's against"
@@@ -8443,24 -8657,27 +9988,42 @@@ msgid "RGB chroma (RV32, RV24, RV16, RG
msgstr ""
#: modules/access/vnc.c:61
++<<<<<<< HEAD
+msgid "Compression level"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Compression level"
+ msgstr "தொகà¯à®ªà¯à®ªà®¿:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:62
msgid "Transfer compression level from 0 (none) to 9 (max)"
msgstr ""
#: modules/access/vnc.c:63
++<<<<<<< HEAD
+msgid "Image quality"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Image quality"
+ msgstr "உரà¯à®µ அகலமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:64
msgid "Image quality 1 to 9 (max)"
msgstr ""
#: modules/access/vnc.c:78
++<<<<<<< HEAD
+msgid "VNC"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "VNC"
+ msgstr "VCD"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/access/vnc.c:82
msgid "VNC client access"
@@@ -8491,8 -8708,9 +10054,14 @@@ msgid "Audio filter for simple channel
msgstr ""
#: modules/arm_neon/volume.c:38
++<<<<<<< HEAD
+msgid "ARM NEON audio volume"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "ARM NEON audio volume"
+ msgstr "ஒலித கோபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/arm_neon/yuv_rgb.c:35
msgid "ARM NEON video chroma YUV->RGBA"
@@@ -8590,12 -8808,14 +10159,23 @@@ msgid "
msgstr ""
#: modules/audio_filter/audiobargraph_a.c:82
++<<<<<<< HEAD
+msgid "Audio part of the BarGraph function"
+msgstr ""
+
+#: modules/audio_filter/audiobargraph_a.c:83
+msgid "Audiobar Graph"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio part of the BarGraph function"
+ msgstr "ஒலிதமà¯/நிகழà¯à®ªà®Ÿà®®à¯"
+
+ #: modules/audio_filter/audiobargraph_a.c:83
+ #, fuzzy
+ msgid "Audiobar Graph"
+ msgstr "ஒலிதமà¯/நிகழà¯à®ªà®Ÿà®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/channel_mixer/dolby.c:49
msgid "Simple decoder for Dolby Surround encoded streams"
@@@ -8672,13 -8892,15 +10252,25 @@@ msgstr "
#: modules/audio_filter/channel_mixer/mono.c:93
#: modules/audio_filter/channel_mixer/remap.c:62
++<<<<<<< HEAD
+msgid "Rear left"
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/mono.c:93
+#: modules/audio_filter/channel_mixer/remap.c:62
+msgid "Rear right"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Rear left"
+ msgstr "வலையம௠3:இடதà¯"
+
+ #: modules/audio_filter/channel_mixer/mono.c:93
+ #: modules/audio_filter/channel_mixer/remap.c:62
+ #, fuzzy
+ msgid "Rear right"
+ msgstr "வலதà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/channel_mixer/mono.c:94
#: modules/audio_filter/channel_mixer/remap.c:63
@@@ -8687,26 -8909,30 +10279,50 @@@ msgstr "
#: modules/audio_filter/channel_mixer/mono.c:95
#: modules/audio_filter/channel_mixer/remap.c:63
++<<<<<<< HEAD
+msgid "Side left"
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/mono.c:95
+#: modules/audio_filter/channel_mixer/remap.c:63
+msgid "Side right"
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/mono.c:95
+#: modules/audio_filter/channel_mixer/remap.c:62
+msgid "Rear center"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Side left"
+ msgstr "ஓடà¯à®Ÿà¯ இடதà¯"
+
+ #: modules/audio_filter/channel_mixer/mono.c:95
+ #: modules/audio_filter/channel_mixer/remap.c:63
+ #, fuzzy
+ msgid "Side right"
+ msgstr "நிகழà¯à®ªà®Ÿ உயரமà¯"
+
+ #: modules/audio_filter/channel_mixer/mono.c:95
+ #: modules/audio_filter/channel_mixer/remap.c:62
+ #, fuzzy
+ msgid "Rear center"
+ msgstr "சதவிகிதமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/channel_mixer/mono.c:102
msgid "Audio filter for stereo to mono conversion"
msgstr ""
#: modules/audio_filter/channel_mixer/remap.c:74
++<<<<<<< HEAD
+msgid "Audio channel remapper"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio channel remapper"
+ msgstr "ஒலித அலைவரிசைகளà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/channel_mixer/simple.c:45
msgid "Audio filter for simple channel mixing"
@@@ -8792,16 -9018,18 +10408,28 @@@ msgid "Set the RMS/peak (0 ... 1).
msgstr ""
#: modules/audio_filter/compressor.c:158
++<<<<<<< HEAD
+msgid "Attack time"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Attack time"
+ msgstr "தொடகà¯à®•à®®à¯ நேரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/compressor.c:160
msgid "Set the attack time in milliseconds (1.5 ... 400)."
msgstr ""
#: modules/audio_filter/compressor.c:162
++<<<<<<< HEAD
+msgid "Release time"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Release time"
+ msgstr "பà¯à®¤à¯à®¤à¯à®£à®°à¯à®µà¯ நேரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/compressor.c:164
msgid "Set the release time in milliseconds (2 ... 800)."
@@@ -8817,8 -9045,9 +10445,14 @@@ msgstr "
#: modules/audio_filter/compressor.c:169 modules/gui/macosx/AudioEffects.m:123
#: modules/gui/qt4/components/extended_panels.cpp:1383
++<<<<<<< HEAD
+msgid "Ratio"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Ratio"
+ msgstr "மதிபà¯à®ªà®¿à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/compressor.c:170
msgid "Set the ratio (n:1) (1 ... 20)."
@@@ -8842,8 -9071,9 +10476,14 @@@ msgstr "
#: modules/audio_filter/compressor.c:179 modules/gui/macosx/AudioEffects.m:144
#: modules/gui/qt4/dialogs/extended.cpp:67
++<<<<<<< HEAD
+msgid "Compressor"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Compressor"
+ msgstr "தொகà¯à®ªà¯à®ªà®¿:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/compressor.c:180
msgid "Dynamic range compressor"
@@@ -9035,8 -9265,9 +10675,14 @@@ msgid "Increase or decrease the gain (d
msgstr ""
#: modules/audio_filter/gain.c:63
++<<<<<<< HEAD
+msgid "Gain control filter"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Gain control filter"
+ msgstr "இயகà¯à®• கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/karaoke.c:35 modules/demux/xiph_metadata.h:49
#: modules/gui/macosx/AudioEffects.m:140
@@@ -9044,8 -9275,9 +10690,14 @@@ msgid "Karaoke
msgstr ""
#: modules/audio_filter/karaoke.c:36
++<<<<<<< HEAD
+msgid "Simple Karaoke filter"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Simple Karaoke filter"
+ msgstr "மாதிரி அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/normvol.c:65
msgid "Number of audio buffers"
@@@ -9165,8 -9397,9 +10817,14 @@@ msgid "Sinc function (medium quality)
msgstr ""
#: modules/audio_filter/resampler/src.c:50
++<<<<<<< HEAD
+msgid "Sinc function (fast)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Sinc function (fast)"
+ msgstr "மூட௠தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/resampler/src.c:50
msgid "Zero Order Hold (fastest)"
@@@ -9314,24 -9547,28 +10972,46 @@@ msgid "Single precision audio volume
msgstr ""
#: modules/audio_mixer/integer.c:38
++<<<<<<< HEAD
+msgid "Integer audio volume"
+msgstr ""
+
+#: modules/audio_output/adummy.c:37
+msgid "Dummy audio output"
+msgstr ""
+
+#: modules/audio_output/alsa.c:64 modules/audio_output/oss.c:67
+msgid "Audio output device"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Integer audio volume"
+ msgstr "கோடநிலை ஒலித ஒலிசà¯à®šà®¤à¯à®¤à®®à¯"
+
+ #: modules/audio_output/adummy.c:37
+ #, fuzzy
+ msgid "Dummy audio output"
+ msgstr "ஒனà¯à®±à¯à®•à¯à®•à¯à®®à¯à®¤à®µà®¾à®¤ நிகழà¯à®ªà®Ÿà®®à¯ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
+
+ #: modules/audio_output/alsa.c:64 modules/audio_output/oss.c:67
+ #, fuzzy
+ msgid "Audio output device"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/alsa.c:65
msgid "Audio output device (using ALSA syntax)."
msgstr ""
#: modules/audio_output/alsa.c:67 modules/audio_output/waveout.c:141
++<<<<<<< HEAD
+msgid "Audio output channels"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio output channels"
+ msgstr "ஒலித அலைவரிசைகளà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/alsa.c:68 modules/audio_output/waveout.c:142
msgid ""
@@@ -9364,7 -9601,7 +11044,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "ALSA ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ தோலà¯à®µà®¿"
@@@ -9376,57 -9613,64 +11060,112 @@@ msgid "
msgstr ""
#: modules/audio_output/amem.c:34
++<<<<<<< HEAD
+msgid "Audio memory"
+msgstr ""
+
+#: modules/audio_output/amem.c:35
+msgid "Audio memory output"
+msgstr ""
+
+#: modules/audio_output/amem.c:42
+msgid "Sample format"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio memory"
+ msgstr "நிகழà¯à®ªà®Ÿà®®à¯ நினைவகமà¯"
+
+ #: modules/audio_output/amem.c:35
+ #, fuzzy
+ msgid "Audio memory output"
+ msgstr "நிகழà¯à®ªà®Ÿà®®à¯ நினைவகம௠வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
+
+ #: modules/audio_output/amem.c:42
+ #, fuzzy
+ msgid "Sample format"
+ msgstr "மாதிரி அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/audioqueue.c:66
msgid "AudioQueue (iOS / Mac OS) audio output"
msgstr ""
#: modules/audio_output/audiotrack.c:137
++<<<<<<< HEAD
+msgid "Android AudioTrack audio output"
+msgstr ""
+
+#: modules/audio_output/audiounit_ios.c:93
+msgid "AudioUnit output for iOS"
+msgstr ""
+
+#: modules/audio_output/auhal.c:69
+msgid "Last audio device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #, fuzzy
+ msgid "Android AudioTrack audio output"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ கோபà¯à®ªà¯"
+
+ #: modules/audio_output/audiounit_ios.c:89
+ #, fuzzy
+ msgid "AudioUnit output for iOS"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ தோலà¯à®µà®¿"
+
+ #: modules/audio_output/auhal.c:69
+ #, fuzzy
+ msgid "Last audio device"
+ msgstr "ஒலித சாதனமà¯"
+
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ #, fuzzy
+ msgid "System Sound Output Device"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -9535,36 -9779,42 +11274,69 @@@ msgid "
msgstr ""
#: modules/audio_output/kai.c:110
++<<<<<<< HEAD
+msgid "K Audio Interface audio output"
+msgstr ""
+
+#: modules/audio_output/opensles_android.c:131
+msgid "OpenSLES audio output"
+msgstr ""
+
+#: modules/audio_output/opensles_android.c:132
+msgid "OpenSLES"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "K Audio Interface audio output"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ கோபà¯à®ªà¯"
+
+ #: modules/audio_output/opensles_android.c:131
+ #, fuzzy
+ msgid "OpenSLES audio output"
+ msgstr "ALSA ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
+
+ #: modules/audio_output/opensles_android.c:132
+ #, fuzzy
+ msgid "OpenSLES"
+ msgstr "திற"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/oss.c:68
msgid "OSS device node path."
msgstr ""
#: modules/audio_output/oss.c:72
++<<<<<<< HEAD
+msgid "Open Sound System audio output"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Open Sound System audio output"
+ msgstr "ALSA ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/pulse.c:45
msgid "Pulseaudio audio output"
msgstr ""
#: modules/audio_output/sndio.c:39
++<<<<<<< HEAD
+msgid "OpenBSD sndio audio output"
+msgstr ""
+
+#: modules/audio_output/volume.h:30
+msgid "Software gain"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "OpenBSD sndio audio output"
+ msgstr "ALSA ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
+
+ #: modules/audio_output/volume.h:30
+ #, fuzzy
+ msgid "Software gain"
+ msgstr "சிதà¯à®¤à®¿à®°à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/volume.h:31
msgid "This linear gain will be applied in software."
@@@ -9581,8 -9831,9 +11353,14 @@@ msgid "
msgstr ""
#: modules/audio_output/waveout.c:150
++<<<<<<< HEAD
+msgid "WaveOut audio output"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "WaveOut audio output"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ கோபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/waveout.c:706
msgid "Microsoft Soundmapper"
@@@ -9750,8 -10001,9 +11528,14 @@@ msgid "
msgstr ""
#: modules/codec/avcodec/avcodec.h:112
++<<<<<<< HEAD
+msgid "Discard cropping information"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Discard cropping information"
+ msgstr "தகவலà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:113
msgid "Discard internal cropping parameters (e.g. from H.264 SPS)."
@@@ -9766,8 -10018,9 +11550,14 @@@ msgid "Set FFmpeg debug mask
msgstr ""
#: modules/codec/avcodec/avcodec.h:118
++<<<<<<< HEAD
+msgid "Codec name"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Codec name"
+ msgstr "கோடகà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:119
msgid "Internal libavcodec codec name"
@@@ -9806,8 -10059,9 +11596,14 @@@ msgid "This allows hardware decoding wh
msgstr ""
#: modules/codec/avcodec/avcodec.h:139
++<<<<<<< HEAD
+msgid "VDA output pixel format"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "VDA output pixel format"
+ msgstr "வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ வடிவூடà¯à®Ÿà®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/avcodec.h:140
msgid "The pixel format for output image buffers."
@@@ -10049,8 -10303,9 +11845,14 @@@ msgid "
msgstr ""
#: modules/codec/avcodec/dxva2.c:58
++<<<<<<< HEAD
+msgid "DirectX Video Acceleration (DXVA) 2.0"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "DirectX Video Acceleration (DXVA) 2.0"
+ msgstr "மேசைதà¯à®¤à®³à®®à¯3D நிகழà¯à®ªà®Ÿà®®à¯ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/encoder.c:256
#, c-format
@@@ -10079,8 -10334,9 +11881,14 @@@ msgid "VLC could not open the encoder.
msgstr ""
#: modules/codec/avcodec/vaapi.c:53
++<<<<<<< HEAD
+msgid "Video Acceleration (VA) API"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Video Acceleration (VA) API"
+ msgstr "மேசைதà¯à®¤à®³à®®à¯3D நிகழà¯à®ªà®Ÿà®®à¯ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/avcodec/vda.c:47
msgid "420YpCbCr8Planar"
@@@ -10419,8 -10675,9 +12227,14 @@@ msgid "DVB subtitles encoder
msgstr ""
#: modules/codec/edummy.c:40
++<<<<<<< HEAD
+msgid "Dummy encoder"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Dummy encoder"
+ msgstr "ஒனà¯à®±à¯à®•à¯à®•à¯à®®à¯à®¤à®µà®¾à®¤ à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/faad.c:52
msgid "AAC audio decoder (using libfaad2)"
@@@ -10431,8 -10688,9 +12245,14 @@@ msgid "AAC extension
msgstr "AAC நீடிபà¯à®ªà¯"
#: modules/codec/fdkaac.c:67
++<<<<<<< HEAD
+msgid "Encoder Profile"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Encoder Profile"
+ msgstr "சிற௠வாழà¯à®•à¯à®•à¯ˆà®•à¯ கà¯à®±à®¿à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fdkaac.c:68
msgid "Encoder Algorithm to use"
@@@ -10447,8 -10705,9 +12267,14 @@@ msgid "This is an optional feature onl
msgstr ""
#: modules/codec/fdkaac.c:73
++<<<<<<< HEAD
+msgid "VBR Quality"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "VBR Quality"
+ msgstr "தரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/fdkaac.c:74
msgid "Quality of the VBR Encoding (0=cbr, 1-5 constant quality vbr, 5 is best"
@@@ -10499,8 -10758,9 +12325,14 @@@ msgid "FDKAAC
msgstr ""
#: modules/codec/fdkaac.c:101
++<<<<<<< HEAD
+msgid "FDK-AAC Audio encoder"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "FDK-AAC Audio encoder"
+ msgstr "ஒலித கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/flac.c:112
msgid "Flac audio decoder"
@@@ -10570,8 -10830,9 +12402,14 @@@ msgid "G.711 decoder
msgstr ""
#: modules/codec/g711.c:53
++<<<<<<< HEAD
+msgid "G.711 encoder"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "G.711 encoder"
+ msgstr "ஒனà¯à®±à¯à®•à¯à®•à¯à®®à¯à®¤à®µà®¾à®¤ à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/kate.c:194 modules/codec/subsdec.c:173
msgid "Formatted Subtitles"
@@@ -10592,46 -10853,46 +12430,74 @@@ msgstr "நிழலà¯
msgid "Outline"
msgstr "சà¯à®°à¯à®•à¯à®•à®®à®¾à®©"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "கறà¯à®ªà¯à®ªà¯ "
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "சாமà¯à®ªà®²à¯ "
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "வெளà¯à®³à¯ˆ "
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "சிவபà¯à®ªà¯ "
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10639,61 -10900,61 +12505,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "மஞà¯à®šà®²à¯ "
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "பசà¯à®šà¯ˆ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "எழà¯à®®à®¿à®šà¯à®šà®®à¯ பழ நிறமà¯"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "ஊதா "
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "நேவி"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "நீலமà¯"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10823,7 -11084,7 +12725,11 @@@ msgstr "தà¯à®£à¯ˆ உரை(மேà®
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -10874,12 -11135,14 +12780,23 @@@ msgid "Video encoder (using OpenMAX IL)
msgstr ""
#: modules/codec/omxil/vout.c:49
++<<<<<<< HEAD
+msgid "OpenMAX IL video output"
+msgstr ""
+
+#: modules/codec/opus.c:62
+msgid "Opus audio decoder"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "OpenMAX IL video output"
+ msgstr "OpenGL நிகழà¯à®ªà®Ÿ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
+
+ #: modules/codec/opus.c:62
+ #, fuzzy
+ msgid "Opus audio decoder"
+ msgstr "ஒலித கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/opus.c:64
msgid "Opus"
@@@ -10890,8 -11153,9 +12807,14 @@@ msgid "PNG video decoder
msgstr ""
#: modules/codec/qsv.c:56
++<<<<<<< HEAD
+msgid "Enable software mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Enable software mode"
+ msgstr "செயலà¯à®ªà®Ÿ வை சà¯à®µà®°à¯ தாளà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:57
msgid ""
@@@ -10900,8 -11164,9 +12823,14 @@@
msgstr ""
#: modules/codec/qsv.c:61
++<<<<<<< HEAD
+msgid "Codec Profile"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Codec Profile"
+ msgstr "தேரà¯à®µà¯ உளà¯à®³à¯€à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:63
msgid ""
@@@ -10911,8 -11176,9 +12840,14 @@@
msgstr ""
#: modules/codec/qsv.c:67
++<<<<<<< HEAD
+msgid "Codec Level"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Codec Level"
+ msgstr "கோடகà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:69
msgid ""
@@@ -10953,8 -11219,9 +12888,14 @@@ msgid "
msgstr ""
#: modules/codec/qsv.c:90
++<<<<<<< HEAD
+msgid "IDR interval"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "IDR interval"
+ msgstr "Lua à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:92
msgid ""
@@@ -10967,8 -11234,9 +12908,14 @@@
msgstr ""
#: modules/codec/qsv.c:100
++<<<<<<< HEAD
+msgid "Rate Control Method"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Rate Control Method"
+ msgstr "தொலை கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:102
msgid ""
@@@ -11051,8 -11319,9 +12998,14 @@@ msgid "
msgstr ""
#: modules/codec/qsv.c:139
++<<<<<<< HEAD
+msgid "Number of slices per frame"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Number of slices per frame"
+ msgstr "அலைவரிசை இலகà¯à®•à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:140
msgid ""
@@@ -11093,8 -11362,9 +13046,14 @@@ msgid "Pseudo raw video packetizer
msgstr ""
#: modules/codec/schroedinger.c:63
++<<<<<<< HEAD
+msgid "Rate control method"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Rate control method"
+ msgstr "தொலை கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:64
msgid "Method used to encode the video sequence"
@@@ -11109,12 -11379,14 +13068,23 @@@ msgid "Constant bitrate mode (CBR)
msgstr ""
#: modules/codec/schroedinger.c:79
++<<<<<<< HEAD
+msgid "Low Delay mode"
+msgstr ""
+
+#: modules/codec/schroedinger.c:80
+msgid "Lossless mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Low Delay mode"
+ msgstr "தாமத நேரமà¯"
+
+ #: modules/codec/schroedinger.c:80
+ #, fuzzy
+ msgid "Lossless mode"
+ msgstr "உபயோகி மாடà¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:81
msgid "Constant lambda mode"
@@@ -11129,8 -11401,9 +13099,14 @@@ msgid "Constant quality mode
msgstr ""
#: modules/codec/schroedinger.c:87
++<<<<<<< HEAD
+msgid "GOP structure"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "GOP structure"
+ msgstr "சிதà¯à®¤à®¿à®°à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:88
msgid "GOP structure used to encode the video sequence"
@@@ -11197,24 -11470,27 +13173,42 @@@ msgid "
msgstr ""
#: modules/codec/schroedinger.c:147
++<<<<<<< HEAD
+msgid "No pre-filtering"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "No pre-filtering"
+ msgstr "சலà¯à®²à®Ÿà¯ˆ இலà¯à®²à¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:149
msgid "Gaussian Low Pass Filter"
msgstr ""
#: modules/codec/schroedinger.c:150
++<<<<<<< HEAD
+msgid "Add Noise"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Add Noise"
+ msgstr "கோபà¯à®ªà¯à®•à®³à¯ˆ சேரà¯..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:151
msgid "Gaussian Adaptive Low Pass Filter"
msgstr ""
#: modules/codec/schroedinger.c:152
++<<<<<<< HEAD
+msgid "Low Pass Filter"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Low Pass Filter"
+ msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯ கோபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:173
msgid "Size of motion compensation blocks"
@@@ -11262,8 -11538,9 +13256,14 @@@ msgid "Motion Vector precision in pels
msgstr ""
#: modules/codec/schroedinger.c:261
++<<<<<<< HEAD
+msgid "perceptual weighting method"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "perceptual weighting method"
+ msgstr "ஓடை வழிமà¯à®±à¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:272
msgid "perceptual distance"
@@@ -11334,8 -11611,9 +13334,14 @@@ msgid "Enable Scene Change Detection
msgstr ""
#: modules/codec/schroedinger.c:327
++<<<<<<< HEAD
+msgid "Force Profile"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Force Profile"
+ msgstr "சிற௠வாழà¯à®•à¯à®•à¯ˆà®•à¯ கà¯à®±à®¿à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:339
msgid "VC2 Low Delay Profile"
@@@ -11346,12 -11624,14 +13352,23 @@@ msgid "VC2 Simple Profile
msgstr ""
#: modules/codec/schroedinger.c:341
++<<<<<<< HEAD
+msgid "VC2 Main Profile"
+msgstr ""
+
+#: modules/codec/schroedinger.c:342
+msgid "Main Profile"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "VC2 Main Profile"
+ msgstr "பà¯à®¤à®¿à®¯ பாவனையாளரை செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
+
+ #: modules/codec/schroedinger.c:342
+ #, fuzzy
+ msgid "Main Profile"
+ msgstr "சிற௠வாழà¯à®•à¯à®•à¯ˆà®•à¯ கà¯à®±à®¿à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/schroedinger.c:363
msgid "Dirac video decoder using libschroedinger"
@@@ -11486,20 -11766,23 +13503,37 @@@ msgid "DVD subtitles packetizer
msgstr ""
#: modules/codec/stl.c:45
++<<<<<<< HEAD
+msgid "EBU STL subtitles decoder"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "EBU STL subtitles decoder"
+ msgstr "தà¯à®£à¯ˆ உரை கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#. xgettext:
#. The character encoding name in parenthesis corresponds to that used for
#. the GetACP translation. "Windows-1252" applies to Western European
#. languages using the Latin alphabet.
#: modules/codec/subsdec.c:97
++<<<<<<< HEAD
+msgid "Default (Windows-1252)"
+msgstr ""
+
+#: modules/codec/subsdec.c:98
+msgid "System codeset"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Default (Windows-1252)"
+ msgstr "Baltic (Windows-1257)"
+
+ #: modules/codec/subsdec.c:98
+ #, fuzzy
+ msgid "System codeset"
+ msgstr "அமைபà¯à®ªà¯ Id"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsdec.c:99
msgid "Universal (UTF-8)"
@@@ -11530,8 -11813,9 +13564,14 @@@ msgid "Western European (Windows-1252)
msgstr "Western European (Windows-1252)"
#: modules/codec/subsdec.c:109
++<<<<<<< HEAD
+msgid "Western European (IBM 00850)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Western European (IBM 00850)"
+ msgstr "Western European (Latin-9)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsdec.c:111
msgid "Eastern European (Latin-2)"
@@@ -11666,24 -11950,27 +13706,42 @@@ msgid "Vietnamese (Windows-1258)
msgstr "Vietnamese (Windows-1258)"
#: modules/codec/subsdec.c:166
++<<<<<<< HEAD
+msgid "Subtitle text encoding"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle text encoding"
+ msgstr "தà¯à®£à¯ˆ உரை தாமதமாக கீழே"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsdec.c:167
msgid "Set the encoding used in text subtitles"
msgstr ""
#: modules/codec/subsdec.c:168
++<<<<<<< HEAD
+msgid "Subtitle justification"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle justification"
+ msgstr "தà¯à®£à¯ˆ உரை நிலை à®®à¯à®©à¯à®©à¯‡à®±à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsdec.c:169
msgid "Set the justification of subtitles"
msgstr ""
#: modules/codec/subsdec.c:170
++<<<<<<< HEAD
+msgid "UTF-8 subtitle autodetection"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "UTF-8 subtitle autodetection"
+ msgstr "தà¯à®£à¯ˆ உரை விவரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/subsdec.c:171
msgid ""
@@@ -11697,8 -11984,9 +13755,14 @@@ msgid "
msgstr ""
#: modules/codec/subsdec.c:182
++<<<<<<< HEAD
+msgid "Text subtitle decoder"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Text subtitle decoder"
+ msgstr "தà¯à®£à¯ˆ உரை கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#. xgettext:
#. The Windows ANSI code page most commonly used for this language.
@@@ -11830,8 -12118,9 +13894,14 @@@ msgid "Libtwolame audio encoder
msgstr ""
#: modules/codec/uleaddvaudio.c:41
++<<<<<<< HEAD
+msgid "Ulead DV audio decoder"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Ulead DV audio decoder"
+ msgstr "ஒலித கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/vorbis.c:175
msgid "Maximum encoding bitrate"
@@@ -12055,8 -12344,9 +14125,14 @@@ msgid "Pure-interlaced mode.
msgstr ""
#: modules/codec/x264.c:164
++<<<<<<< HEAD
+msgid "Frame packing"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Frame packing"
+ msgstr "வடிவம௠அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:165
msgid ""
@@@ -12566,20 -12856,23 +14642,37 @@@ msgid "
msgstr ""
#: modules/codec/x264.c:408
++<<<<<<< HEAD
+msgid "HRD-timing information"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "HRD-timing information"
+ msgstr "தகவலà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:409
msgid "Default tune setting used"
msgstr ""
#: modules/codec/x264.c:410
++<<<<<<< HEAD
+msgid "Default preset setting used"
+msgstr ""
+
+#: modules/codec/x264.c:412
+msgid "x264 advanced options."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Default preset setting used"
+ msgstr "கோடநிலை ஓடை"
+
+ #: modules/codec/x264.c:412
+ #, fuzzy
+ msgid "x264 advanced options."
+ msgstr "மேமà¯à®ªà®Ÿà¯à®Ÿ கோபà¯à®ªà¯à®•à®³à¯ˆ காடà¯à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:413
msgid "x264 advanced options, in the form {opt=val,op2=val2} ."
@@@ -12606,21 -12899,23 +14699,39 @@@ msgid "tesa
msgstr "tesa"
#: modules/codec/x264.c:429
++<<<<<<< HEAD
+msgid "Fast"
+msgstr ""
+
+#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #, fuzzy
+ msgid "Fast"
+ msgstr "விரைவாக"
+
+ #: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "வழகà¯à®•à®®à®¾à®©"
#: modules/codec/x264.c:429
++<<<<<<< HEAD
+msgid "Slow"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Slow"
+ msgstr "மெதà¯à®µà®¾à®•"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:434
msgid "Spatial"
@@@ -12639,20 -12934,23 +14750,37 @@@ msgid "column alternation
msgstr ""
#: modules/codec/x264.c:439
++<<<<<<< HEAD
+msgid "row alternation"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "row alternation"
+ msgstr " ஊரவை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:439
msgid "side by side"
msgstr ""
#: modules/codec/x264.c:439
++<<<<<<< HEAD
+msgid "top bottom"
+msgstr ""
+
+#: modules/codec/x264.c:439
+msgid "frame alternation"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "top bottom"
+ msgstr "வலையம௠2:கீழே"
+
+ #: modules/codec/x264.c:439
+ #, fuzzy
+ msgid "frame alternation"
+ msgstr "மாதிரி தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:443
msgid "H.264/MPEG-4 Part 10/AVC encoder (x264 10-bit)"
@@@ -12663,8 -12961,9 +14791,14 @@@ msgid "H.264/MPEG-4 Part 10/AVC encode
msgstr ""
#: modules/codec/xwd.c:36
++<<<<<<< HEAD
+msgid "XWD image decoder"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "XWD image decoder"
+ msgstr "AVI demuxer"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/zvbi.c:58
msgid "Teletext page"
@@@ -12675,8 -12974,9 +14809,14 @@@ msgid "Open the indicated Teletext page
msgstr ""
#: modules/codec/zvbi.c:62 modules/gui/qt4/dialogs/toolbar.cpp:421
++<<<<<<< HEAD
+msgid "Teletext transparency"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Teletext transparency"
+ msgstr "தெளà¯à®³à®¤à¯à®¤à¯†à®³à®¿à®¨à¯à®¤"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/zvbi.c:63
msgid "Setting vbi-opaque to false makes the boxed text transparent."
@@@ -12718,8 -13018,8 +14858,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -12744,8 -13044,9 +14889,14 @@@ msgid "
msgstr ""
#: modules/control/dummy.c:49
++<<<<<<< HEAD
+msgid "Dummy interface"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Dummy interface"
+ msgstr "ஒனà¯à®±à¯à®•à¯à®•à¯à®®à¯à®¤à®µà®¾à®¤ à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/gestures.c:71
msgid "Motion threshold (10-100)"
@@@ -12797,18 -13098,19 +14948,34 @@@ msgid "Hotkeys management interface
msgstr "à®®à¯à®•à¯à®•à®¿à®¯à®µà®¿à®šà¯ˆà®•à®³à¯ கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ à®®à¯à®•à®ªà¯à®ªà¯"
#: modules/control/hotkeys.c:188
++<<<<<<< HEAD
+msgid "One"
+msgstr ""
+
+#: modules/control/hotkeys.c:195
+#, c-format
+msgid "Loop: %s"
+msgstr ""
+
+#: modules/control/hotkeys.c:202
+#, c-format
+msgid "Random: %s"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "One"
+ msgstr "இயஙà¯à®•à®šà¯ செயà¯"
+
+ #: modules/control/hotkeys.c:195
+ #, fuzzy, c-format
+ msgid "Loop: %s"
+ msgstr "வெடà¯à®Ÿà¯: %s"
+
+ #: modules/control/hotkeys.c:202
+ #, fuzzy, c-format
+ msgid "Random: %s"
+ msgstr "கà¯à®±à®¿à®ªà¯à®ªà®¿à®²à®¾"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:331
#, c-format
@@@ -12828,8 -13130,9 +14995,14 @@@ msgid "Sub sync: bookmarked audio time
msgstr ""
#: modules/control/hotkeys.c:424 modules/control/hotkeys.c:493
++<<<<<<< HEAD
+msgid "No active subtitle"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "No active subtitle"
+ msgstr "Podcast அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:430
msgid "Sub sync: bookmarked subtitle time"
@@@ -12845,8 -13148,9 +15018,14 @@@ msgid "Sub sync: corrected %i ms (tota
msgstr ""
#: modules/control/hotkeys.c:472
++<<<<<<< HEAD
+msgid "Sub sync: delay reset"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Sub sync: delay reset"
+ msgstr "தà¯à®£à¯ˆ உரை தாமதமாக"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:501
#, c-format
@@@ -12913,18 -13217,19 +15092,34 @@@ msgid "Deinterlace on
msgstr ""
#: modules/control/hotkeys.c:1022
++<<<<<<< HEAD
+msgid "Subtitle position: no active subtitle"
+msgstr ""
+
+#: modules/control/hotkeys.c:1034
+#, c-format
+msgid "Subtitle position %d px"
+msgstr ""
+
+#: modules/control/hotkeys.c:1168
+#, c-format
+msgid "Volume %ld%%"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle position: no active subtitle"
+ msgstr "தà¯à®£à¯ˆ உரை நிலை à®®à¯à®©à¯à®©à¯‡à®±à¯"
+
+ #: modules/control/hotkeys.c:1034
+ #, fuzzy, c-format
+ msgid "Subtitle position %d px"
+ msgstr "தà¯à®£à¯ˆ உரை நிலை à®®à¯à®©à¯à®©à¯‡à®±à¯"
+
+ #: modules/control/hotkeys.c:1168
+ #, fuzzy, c-format
+ msgid "Volume %ld%%"
+ msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®®à¯ %d%%"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/hotkeys.c:1173
#, c-format
@@@ -12994,8 -13299,9 +15189,14 @@@ msgid "Network Sync
msgstr ""
#: modules/control/netsync.c:72
++<<<<<<< HEAD
+msgid "Network synchronization"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Network synchronization"
+ msgstr "பிணைய அமைபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/control/ntservice.c:44
msgid "Install Windows Service"
@@@ -13055,9 -13361,9 +15256,15 @@@ msgstr "ஆரமà¯à®ªà®¨à®¿à®²à¯ˆ
msgid "Opening"
msgstr "திறகà¯à®•à®¿à®±à®¤à¯"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "நிறà¯à®¤à¯à®¤à¯"
@@@ -13452,8 -13758,9 +15659,14 @@@ msgid "AIFF demuxer
msgstr ""
#: modules/demux/asf/asf.c:56
++<<<<<<< HEAD
+msgid "ASF/WMV demuxer"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "ASF/WMV demuxer"
+ msgstr "AVI demuxer"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/asf/asf.c:180
msgid "Could not demux ASF stream"
@@@ -13468,8 -13775,9 +15681,14 @@@ msgid "AU demuxer
msgstr ""
#: modules/demux/avformat/avformat.c:41
++<<<<<<< HEAD
+msgid "Avformat demuxer"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Avformat demuxer"
+ msgstr "AVI demuxer"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/avformat/avformat.c:42
msgid "Avformat"
@@@ -13492,8 -13800,9 +15711,14 @@@ msgid "Force use of a specific avforma
msgstr ""
#: modules/demux/avformat/avformat.h:37
++<<<<<<< HEAD
+msgid "Format name"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Format name"
+ msgstr "வடிவூடà¯à®Ÿà®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/avformat/avformat.h:38
msgid "Internal libavcodec format name"
@@@ -13534,8 -13843,9 +15759,14 @@@ msgid "AVI demuxer
msgstr "AVI demuxer"
#: modules/demux/avi/avi.c:673
++<<<<<<< HEAD
+msgid "Broken or missing AVI Index"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Broken or missing AVI Index"
+ msgstr "சரிசெயà¯à®¯ AVI உளà¯à®³à®Ÿà®•à¯à®•à®®à¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/avi/avi.c:674
msgid ""
@@@ -13552,8 -13862,9 +15783,14 @@@ msgid "Build index then play
msgstr ""
#: modules/demux/avi/avi.c:680
++<<<<<<< HEAD
+msgid "Play as is"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Play as is"
+ msgstr "ஓட௠& à®®à¯à®Ÿà®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/avi/avi.c:680
msgid "Do not play"
@@@ -13568,8 -13879,9 +15805,14 @@@ msgid "CDG demuxer
msgstr ""
#: modules/demux/demuxdump.c:32
++<<<<<<< HEAD
+msgid "Dump module"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Dump module"
+ msgstr "Demux மாடà¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/demuxdump.c:33
msgid "Dump filename"
@@@ -13626,8 -13938,9 +15869,14 @@@ msgid "
msgstr ""
#: modules/demux/image.c:61
++<<<<<<< HEAD
+msgid "Duration in seconds"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Duration in seconds"
+ msgstr "காலம௠in ms"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/image.c:63
msgid ""
@@@ -13640,8 -13953,9 +15889,14 @@@ msgid "Frame rate of the elementary str
msgstr ""
#: modules/demux/image.c:70
++<<<<<<< HEAD
+msgid "Real-time"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Real-time"
+ msgstr "தாமத நேரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/image.c:72
msgid ""
@@@ -13650,12 -13964,14 +15905,23 @@@
msgstr ""
#: modules/demux/image.c:76
++<<<<<<< HEAD
+msgid "Image demuxer"
+msgstr ""
+
+#: modules/demux/image.c:77
+msgid "Image"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Image demuxer"
+ msgstr "AVI demuxer"
+
+ #: modules/demux/image.c:77
+ #, fuzzy
+ msgid "Image"
+ msgstr "உரà¯à®µ கோபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mjpeg.c:46 modules/demux/mpeg/es.c:50
#: modules/demux/mpeg/h264.c:43 modules/demux/rawvid.c:44
@@@ -13695,8 -14011,9 +15961,14 @@@ msgid "Matroska stream demuxer
msgstr ""
#: modules/demux/mkv/mkv.cpp:54
++<<<<<<< HEAD
+msgid "Respect ordered chapters"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Respect ordered chapters"
+ msgstr "à®®à¯à®¨à¯à®¤à¯ˆà®¯ DVD அதà¯à®¤à®¿à®¯à®¾à®¯à®¤à¯à®¤à¯ˆ தெரிவ௠செயà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mkv/mkv.cpp:55
msgid "Play chapters in the order specified in the segment."
@@@ -13932,8 -14249,9 +16204,14 @@@ msgid "Game
msgstr ""
#: modules/demux/mp4/id3genres.h:69
++<<<<<<< HEAD
+msgid "Sound Clip"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Sound Clip"
+ msgstr "சதà¯à®¤à®®à¯ தாமதமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:70
msgid "Gospel"
@@@ -13944,8 -14262,9 +16222,14 @@@ msgid "Noise
msgstr ""
#: modules/demux/mp4/id3genres.h:72
++<<<<<<< HEAD
+msgid "Alternative Rock"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Alternative Rock"
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:73
msgid "Bass"
@@@ -14044,8 -14363,9 +16328,14 @@@ msgid "Cabaret
msgstr ""
#: modules/demux/mp4/id3genres.h:98
++<<<<<<< HEAD
+msgid "New Wave"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "New Wave"
+ msgstr "அலைகளà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:99 modules/gui/macosx/VideoEffects.m:160
#: modules/video_filter/psychedelic.c:55
@@@ -14118,8 -14438,9 +16408,14 @@@ msgid "Swing
msgstr ""
#: modules/demux/mp4/id3genres.h:116
++<<<<<<< HEAD
+msgid "Fast Fusion"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Fast Fusion"
+ msgstr "à®®à¯à®©à¯à®©à¯‹à®•à¯à®•à®¿à®¯ அடி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:117
msgid "Bebob"
@@@ -14134,8 -14455,9 +16430,14 @@@ msgid "Celtic
msgstr ""
#: modules/demux/mp4/id3genres.h:121
++<<<<<<< HEAD
+msgid "Bluegrass"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Bluegrass"
+ msgstr "நீலமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:122
msgid "Avantgarde"
@@@ -14166,8 -14488,9 +16468,14 @@@ msgid "Big Band
msgstr ""
#: modules/demux/mp4/id3genres.h:130
++<<<<<<< HEAD
+msgid "Easy Listening"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Easy Listening"
+ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:131
msgid "Acoustic"
@@@ -14182,8 -14505,9 +16490,14 @@@ msgid "Speech
msgstr ""
#: modules/demux/mp4/id3genres.h:134
++<<<<<<< HEAD
+msgid "Chanson"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Chanson"
+ msgstr "அலைவரிசை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:135
msgid "Opera"
@@@ -14234,8 -14558,9 +16548,14 @@@ msgid "Folklore
msgstr ""
#: modules/demux/mp4/id3genres.h:148
++<<<<<<< HEAD
+msgid "Ballad"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Ballad"
+ msgstr "எலà¯à®²à®¾à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:149
msgid "Power Ballad"
@@@ -14270,12 -14595,14 +16590,23 @@@ msgid "Euro-House
msgstr ""
#: modules/demux/mp4/id3genres.h:157
++<<<<<<< HEAD
+msgid "Dance Hall"
+msgstr ""
+
+#: modules/demux/mp4/id3genres.h:158
+msgid "Goa"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Dance Hall"
+ msgstr "தவிரà¯à®•à¯à®•"
+
+ #: modules/demux/mp4/id3genres.h:158
+ #, fuzzy
+ msgid "Goa"
+ msgstr "&செலà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:159
msgid "Drum & Bass"
@@@ -14286,12 -14613,14 +16617,23 @@@ msgid "Club - House
msgstr ""
#: modules/demux/mp4/id3genres.h:161
++<<<<<<< HEAD
+msgid "Hardcore"
+msgstr ""
+
+#: modules/demux/mp4/id3genres.h:162
+msgid "Terror"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Hardcore"
+ msgstr "&தேடà¯:"
+
+ #: modules/demux/mp4/id3genres.h:162
+ #, fuzzy
+ msgid "Terror"
+ msgstr "வழà¯à®•à¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:163
msgid "Indie"
@@@ -14322,8 -14651,9 +16664,14 @@@ msgid "Heavy Metal
msgstr ""
#: modules/demux/mp4/id3genres.h:170
++<<<<<<< HEAD
+msgid "Black Metal"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Black Metal"
+ msgstr "கறà¯à®ªà¯à®ªà¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:171
msgid "Crossover"
@@@ -14338,8 -14668,9 +16686,14 @@@ msgid "Christian Rock
msgstr ""
#: modules/demux/mp4/id3genres.h:174
++<<<<<<< HEAD
+msgid "Merengue"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Merengue"
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/id3genres.h:175
msgid "Salsa"
@@@ -14374,8 -14705,9 +16728,14 @@@ msgid "Writer
msgstr ""
#: modules/demux/mp4/mp4.c:1060
++<<<<<<< HEAD
+msgid "Composer"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Composer"
+ msgstr "தொகà¯à®ªà¯à®ªà®¿:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1061
msgid "Producer"
@@@ -14388,24 -14720,29 +16748,50 @@@ msgid "Information
msgstr "தகவலà¯"
#: modules/demux/mp4/mp4.c:1063
++<<<<<<< HEAD
+msgid "Director"
+msgstr ""
+
+#: modules/demux/mp4/mp4.c:1064
+msgid "Disclaimer"
+msgstr ""
+
+#: modules/demux/mp4/mp4.c:1065
+msgid "Requirements"
+msgstr ""
+
+#: modules/demux/mp4/mp4.c:1066
+msgid "Original Format"
+msgstr ""
+
+#: modules/demux/mp4/mp4.c:1067
+msgid "Display Source As"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Director"
+ msgstr "கோபà¯à®ªà¯/கோபà¯à®ªà®•à®®à¯"
+
+ #: modules/demux/mp4/mp4.c:1064
+ #, fuzzy
+ msgid "Disclaimer"
+ msgstr "கைவிடà¯à®Ÿà¯à®µà®¿à®Ÿà¯"
+
+ #: modules/demux/mp4/mp4.c:1065
+ #, fuzzy
+ msgid "Requirements"
+ msgstr "பகà¯à®¤à®¿à®•à®³à¯"
+
+ #: modules/demux/mp4/mp4.c:1066
+ #, fuzzy
+ msgid "Original Format"
+ msgstr "அசல௠ID"
+
+ #: modules/demux/mp4/mp4.c:1067
+ #, fuzzy
+ msgid "Display Source As"
+ msgstr "பாரà¯à®µà¯ˆ அமைபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1068
msgid "Host Computer"
@@@ -14416,8 -14753,9 +16802,14 @@@ msgid "Performers
msgstr ""
#: modules/demux/mp4/mp4.c:1070
++<<<<<<< HEAD
+msgid "Original Performer"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Original Performer"
+ msgstr "அசல௠அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1071
msgid "Providers Source Content"
@@@ -14437,44 -14775,51 +16829,83 @@@ msgid "Lyrics
msgstr "பாடல௠வரிகளà¯"
#: modules/demux/mp4/mp4.c:1075
++<<<<<<< HEAD
+msgid "Record Company"
+msgstr ""
+
+#: modules/demux/mp4/mp4.c:1076
+msgid "Model"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Record Company"
+ msgstr "பதிவ௠மà¯à®Ÿà®¿à®¨à®¤à®¤à¯"
+
+ #: modules/demux/mp4/mp4.c:1076
+ #, fuzzy
+ msgid "Model"
+ msgstr "அளவை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1077
msgid "Product"
msgstr ""
#: modules/demux/mp4/mp4.c:1078
++<<<<<<< HEAD
+msgid "Grouping"
+msgstr ""
+
+#: modules/demux/mp4/mp4.c:1080
+msgid "Sub-Title"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Grouping"
+ msgstr "வெடà¯à®Ÿà¯"
+
+ #: modules/demux/mp4/mp4.c:1080
+ #, fuzzy
+ msgid "Sub-Title"
+ msgstr "தà¯à®£à¯ˆ உரை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1081
msgid "Arranger"
msgstr ""
#: modules/demux/mp4/mp4.c:1082
++<<<<<<< HEAD
+msgid "Art Director"
+msgstr ""
+
+#: modules/demux/mp4/mp4.c:1083
+msgid "Copyright Acknowledgement"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Art Director"
+ msgstr "கோபà¯à®ªà¯/கோபà¯à®ªà®•à®®à¯"
+
+ #: modules/demux/mp4/mp4.c:1083
+ #, fuzzy
+ msgid "Copyright Acknowledgement"
+ msgstr "நகலà¯à®‰à®°à®¿à®®à¯ˆ பெரà¯à®¤à®°à®µà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1084
msgid "Conductor"
msgstr ""
#: modules/demux/mp4/mp4.c:1085
++<<<<<<< HEAD
+msgid "Song Description"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Song Description"
+ msgstr "விவரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mp4/mp4.c:1086
msgid "Liner Notes"
@@@ -14515,8 -14860,9 +16946,14 @@@ msgid "MPEG-I/II/4 / A52 / DTS / MLP au
msgstr ""
#: modules/demux/mpeg/es.c:58
++<<<<<<< HEAD
+msgid "Audio ES"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio ES"
+ msgstr "ஒலிதமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/mpeg/es.c:70
msgid "MPEG-4 video"
@@@ -14642,24 -14988,29 +17079,50 @@@ msgid "Podcast Info
msgstr "Podcast விவரமà¯"
#: modules/demux/playlist/podcast.c:196
-#, fuzzy
++<<<<<<< HEAD
+msgid "Podcast Link"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:197
+msgid "Podcast Copyright"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:198
+msgid "Podcast Category"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:199 modules/demux/playlist/podcast.c:273
+msgid "Podcast Keywords"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:200 modules/demux/playlist/podcast.c:274
+msgid "Podcast Subtitle"
+msgstr ""
++=======
++#, fuzzy
+ msgid "Podcast Link"
+ msgstr "Podcast விவரமà¯"
+
+ #: modules/demux/playlist/podcast.c:197
+ #, fuzzy
+ msgid "Podcast Copyright"
+ msgstr "நகலà¯à®‰à®°à®¿à®®à¯ˆ"
+
+ #: modules/demux/playlist/podcast.c:198
+ #, fuzzy
+ msgid "Podcast Category"
+ msgstr "Podcast பாரà¯à®¸à®°à¯"
+
+ #: modules/demux/playlist/podcast.c:199 modules/demux/playlist/podcast.c:273
+ #, fuzzy
+ msgid "Podcast Keywords"
+ msgstr "Podcast பாரà¯à®¸à®°à¯"
+
+ #: modules/demux/playlist/podcast.c:200 modules/demux/playlist/podcast.c:274
+ #, fuzzy
+ msgid "Podcast Subtitle"
+ msgstr "Podcast அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/playlist/podcast.c:206 modules/demux/playlist/podcast.c:275
msgid "Podcast Summary"
@@@ -14670,20 -15021,24 +17133,41 @@@ msgid "Podcast Publication Date
msgstr ""
#: modules/demux/playlist/podcast.c:270
++<<<<<<< HEAD
+msgid "Podcast Author"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:271
+msgid "Podcast Subcategory"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:272
+msgid "Podcast Duration"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:276
+msgid "Podcast Type"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Podcast Author"
+ msgstr "Podcast விவரமà¯"
+
+ #: modules/demux/playlist/podcast.c:271
+ #, fuzzy
+ msgid "Podcast Subcategory"
+ msgstr "Podcast சà¯à®°à¯à®•à¯à®•à®®à¯"
+
+ #: modules/demux/playlist/podcast.c:272
+ #, fuzzy
+ msgid "Podcast Duration"
+ msgstr " ஊரவை"
+
+ #: modules/demux/playlist/podcast.c:276
+ #, fuzzy
+ msgid "Podcast Type"
+ msgstr "Podcast பாரà¯à®¸à®°à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/playlist/podcast.c:287
msgid "Podcast Size"
@@@ -14804,16 -15159,18 +17288,28 @@@ msgid "Real demuxer
msgstr ""
#: modules/demux/sid.cpp:56
++<<<<<<< HEAD
+msgid "C64 sid demuxer"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "C64 sid demuxer"
+ msgstr "AVI demuxer"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/smf.c:41
msgid "SMF demuxer"
msgstr ""
#: modules/demux/stl.c:43
++<<<<<<< HEAD
+msgid "EBU STL subtitles parser"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "EBU STL subtitles parser"
+ msgstr "தà¯à®£à¯ˆ&உரை கோபà¯à®ªà¯à®•à®³à¯ˆ உபயோகி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/subtitle.c:51
msgid "Apply a delay to all subtitles (in 1/10s, eg 100 means 10s)."
@@@ -14836,20 -15193,24 +17332,41 @@@ msgid "Override the default track descr
msgstr ""
#: modules/demux/subtitle.c:70
++<<<<<<< HEAD
+msgid "Text subtitle parser"
+msgstr ""
+
+#: modules/demux/subtitle.c:78 modules/video_filter/subsdelay.c:275
+msgid "Subtitle delay"
+msgstr ""
+
+#: modules/demux/subtitle.c:80
+msgid "Subtitle format"
+msgstr ""
+
+#: modules/demux/subtitle.c:83
+msgid "Subtitle description"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Text subtitle parser"
+ msgstr "தà¯à®£à¯ˆ&உரை கோபà¯à®ªà¯à®•à®³à¯ˆ உபயோகி"
+
+ #: modules/demux/subtitle.c:78 modules/video_filter/subsdelay.c:275
+ #, fuzzy
+ msgid "Subtitle delay"
+ msgstr "தà¯à®£à¯ˆ உரை தாமதமாக"
+
+ #: modules/demux/subtitle.c:80
+ #, fuzzy
+ msgid "Subtitle format"
+ msgstr "தà¯à®£à¯ˆ உரை வடிவூடà¯à®Ÿà®®à¯"
+
+ #: modules/demux/subtitle.c:83
+ #, fuzzy
+ msgid "Subtitle description"
+ msgstr "தà¯à®£à¯ˆ உரை விவரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/demux/ts.c:94
msgid "Extra PMT"
@@@ -14936,7 -15297,7 +17453,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15095,8 -15456,9 +17616,14 @@@ msgid "
msgstr ""
#: modules/gui/macosx/about.m:115
++<<<<<<< HEAD
+msgid "Compiled by %s with %@"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Compiled by %s with %@"
+ msgstr "தொகà¯à®¤à¯à®¤à®¤à¯ %s"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/about.m:132 modules/gui/qt4/dialogs/help.cpp:94
msgid ""
@@@ -15115,7 -15477,7 +17642,11 @@@ msgid "VLC media player Help
msgstr "VLC ஊடகஇயகà¯à®•à®¿ உதவி"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "உளà¯à®³à®Ÿà®•à¯à®•à®®à¯"
@@@ -15137,8 -15499,9 +17668,14 @@@ msgstr "
#: modules/gui/macosx/TrackSynchronization.m:60
#: modules/gui/macosx/VideoEffects.m:96
#: modules/gui/qt4/dialogs/gototime.cpp:66
++<<<<<<< HEAD
+msgid "Reset"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Reset"
+ msgstr "மீணà¯à®Ÿà¯à®®à¯ செயà¯(All)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:120
#: modules/gui/qt4/components/extended_panels.cpp:1380
@@@ -15147,8 -15510,9 +17684,14 @@@ msgstr "
#: modules/gui/macosx/AudioEffects.m:121
#: modules/gui/qt4/components/extended_panels.cpp:1381
++<<<<<<< HEAD
+msgid "Release"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Release"
+ msgstr "மூட௠தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:122
#: modules/gui/qt4/components/extended_panels.cpp:1382
@@@ -15156,8 -15520,9 +17699,14 @@@ msgid "Threshold
msgstr ""
#: modules/gui/macosx/AudioEffects.m:128
++<<<<<<< HEAD
+msgid "Enable Spatializer"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Enable Spatializer"
+ msgstr "ஒலிததà¯à®¤à¯ˆ இயஙà¯à®•à®šà¯ செயà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:137
msgid "Headphone virtualization"
@@@ -15172,8 -15537,9 +17721,14 @@@ msgid "Maximum level
msgstr ""
#: modules/gui/macosx/AudioEffects.m:146
++<<<<<<< HEAD
+msgid "Filter"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Filter"
+ msgstr "சலà¯à®²à®Ÿà¯ˆà®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:147
#: modules/gui/qt4/dialogs/extended.cpp:73
@@@ -15186,8 -15552,9 +17741,14 @@@ msgstr "
#: modules/gui/macosx/AudioEffects.m:207
#: modules/gui/macosx/ConvertAndSave.m:1054
++<<<<<<< HEAD
+msgid "Organize Profiles..."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Organize Profiles..."
+ msgstr "சிற௠வாழà¯à®•à¯à®•à¯ˆà®•à¯ கà¯à®±à®¿à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:385 modules/gui/macosx/VideoEffects.m:877
msgid "Duplicate current profile for a new profile"
@@@ -15196,24 -15563,26 +17757,42 @@@ msgstr "
#: modules/gui/macosx/AudioEffects.m:386
#: modules/gui/macosx/ConvertAndSave.m:367
#: modules/gui/macosx/VideoEffects.m:878
++<<<<<<< HEAD
+msgid "Enter a name for the new profile:"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Enter a name for the new profile:"
+ msgstr "பà¯à®¤à®¿à®¯ பாவனையாளரை செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:388 modules/gui/macosx/AudioEffects.m:642
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "சேமி"
#: modules/gui/macosx/AudioEffects.m:399 modules/gui/macosx/AudioEffects.m:738
#: modules/gui/macosx/VideoEffects.m:940
++<<<<<<< HEAD
+msgid "Remove a preset"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Remove a preset"
+ msgstr "அகறà¯à®±à¯ எலà¯à®²à®¾à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:400 modules/gui/macosx/AudioEffects.m:739
#: modules/gui/macosx/VideoEffects.m:941
@@@ -15227,8 -15596,9 +17806,14 @@@ msgid "Remove
msgstr "அகறà¯à®±à¯"
#: modules/gui/macosx/AudioEffects.m:461
++<<<<<<< HEAD
+msgid "Add new Preset..."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Add new Preset..."
+ msgstr "கோபà¯à®ªà®•à®¤à¯à®¤à¯ˆ சேரà¯..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:466
msgid "Organize Presets..."
@@@ -15344,7 -15714,7 +17929,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "நேரம௠கà¯à®•à¯ தாவà¯"
@@@ -15361,20 -15731,22 +17950,36 @@@ msgid "Click to play or pause the curre
msgstr ""
#: modules/gui/macosx/ControlsBar.m:56 modules/gui/macosx/fspanel.m:417
++<<<<<<< HEAD
+msgid "Backward"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #, fuzzy
+ msgid "Backward"
+ msgstr "பினà¯à®©à¯‹à®•à¯à®•à®¿à®¯ அடி"
+
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
msgstr ""
#: modules/gui/macosx/ControlsBar.m:60 modules/gui/macosx/fspanel.m:419
++<<<<<<< HEAD
+msgid "Forward"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #, fuzzy
+ msgid "Forward"
+ msgstr "à®®à¯à®©à¯à®©à¯‹à®•à¯à®•à®¿à®¯ அடி"
+
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15387,118 -15759,128 +17992,226 @@@ msgid "
msgstr ""
#: modules/gui/macosx/ControlsBar.m:68 modules/gui/macosx/fspanel.m:421
++<<<<<<< HEAD
+msgid "Toggle Fullscreen mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Toggle Fullscreen mode"
+ msgstr "விலகà¯à®•à¯ à®®à¯à®´à¯à®¤à¯à®¤à®¿à®°à¯ˆ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ControlsBar.m:69
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ #, fuzzy
+ msgid "Click to stop playback."
+ msgstr "பினà¯à®©à®©à®¿â€Ž தோலà¯à®µà®¿"
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ #, fuzzy
+ msgid "Show/Hide Playlist"
+ msgstr "தொகà¯à®ªà¯à®ªà¯à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯ˆ காடà¯à®Ÿà¯"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
+#: share/lua/http/index.html:241
+msgid "Repeat"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
+ #: share/lua/http/index.html:241
+ #, fuzzy
+ msgid "Repeat"
+ msgstr "மீணà¯à®Ÿà¯à®®à¯ செயà¯:"
+
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ #, fuzzy
+ msgid "Full Volume"
+ msgstr "சிறிய ஒலிசà¯à®šà®¤à¯à®¤à®®à¯"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ConvertAndSave.m:152
+msgid "Convert & Stream"
+msgstr ""
+
+#: modules/gui/macosx/ConvertAndSave.m:153
+msgid "Go!"
+msgstr ""
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ConvertAndSave.m:152
+ #, fuzzy
+ msgid "Convert & Stream"
+ msgstr "&செயலà¯à®²à®¾à®•à¯à®•à¯ /சேமி "
+
+ #: modules/gui/macosx/ConvertAndSave.m:153
+ #, fuzzy
+ msgid "Go!"
+ msgstr "&செலà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:154 modules/gui/macosx/MainWindow.m:173
msgid "Drop media here"
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:155 modules/gui/macosx/MainWindow.m:171
++<<<<<<< HEAD
+msgid "Open media..."
+msgstr ""
+
+#: modules/gui/macosx/ConvertAndSave.m:156
+msgid "Choose Profile"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Open media..."
+ msgstr "ஊடகதà¯à®¤à¯ˆ திற"
+
+ #: modules/gui/macosx/ConvertAndSave.m:156
+ #, fuzzy
+ msgid "Choose Profile"
+ msgstr "தேரà¯à®µà¯ உளà¯à®³à¯€à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:157
msgid "Customize..."
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:158
++<<<<<<< HEAD
+msgid "Choose Destination"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Choose Destination"
+ msgstr "சேரà¯à®®à®¿à®Ÿà®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:159
msgid "Choose an output location"
@@@ -15507,7 -15889,7 +18220,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15518,12 -15900,14 +18235,23 @@@ msgid "Browse...
msgstr "கணà¯à®Ÿà¯†à®Ÿà¯à®•à¯à®•..."
#: modules/gui/macosx/ConvertAndSave.m:162
++<<<<<<< HEAD
+msgid "Setup Streaming..."
+msgstr ""
+
+#: modules/gui/macosx/ConvertAndSave.m:164
+msgid "Save as File"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Setup Streaming..."
+ msgstr "&ஓடை..."
+
+ #: modules/gui/macosx/ConvertAndSave.m:164
+ #, fuzzy
+ msgid "Save as File"
+ msgstr "சேமி கோபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:165
#: modules/gui/macosx/ConvertAndSave.m:416 modules/gui/macosx/output.m:134
@@@ -15533,36 -15917,43 +18261,74 @@@ msgstr "&ஓடை
#: modules/gui/macosx/ConvertAndSave.m:167
#: modules/gui/macosx/ConvertAndSave.m:193
++<<<<<<< HEAD
+msgid "Apply"
+msgstr ""
+
+#: modules/gui/macosx/ConvertAndSave.m:169
+msgid "Save as new Profile..."
+msgstr ""
+
+#: modules/gui/macosx/ConvertAndSave.m:170 modules/gui/qt4/ui/profiles.h:708
+msgid "Encapsulation"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Apply"
+ msgstr "&Apply"
+
+ #: modules/gui/macosx/ConvertAndSave.m:169
+ #, fuzzy
+ msgid "Save as new Profile..."
+ msgstr "பà¯à®¤à®¿à®¯ பாவனையாளரை செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
+
+ #: modules/gui/macosx/ConvertAndSave.m:170 modules/gui/qt4/ui/profiles.h:708
+ #, fuzzy
+ msgid "Encapsulation"
+ msgstr "பாரà¯à®µà¯ˆà®•à¯à®•à¯à®°à®¿à®¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:171
#: share/lua/http/dialogs/create_stream.html:160
#: modules/gui/qt4/ui/profiles.h:734
++<<<<<<< HEAD
+msgid "Video codec"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Video codec"
+ msgstr "நிகழà¯à®ªà®Ÿ கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:172
#: share/lua/http/dialogs/create_stream.html:178
#: modules/gui/qt4/ui/profiles.h:744
++<<<<<<< HEAD
+msgid "Audio codec"
+msgstr ""
+
+#: modules/gui/macosx/ConvertAndSave.m:176 modules/gui/qt4/ui/profiles.h:710
+msgid "Keep original video track"
+msgstr ""
+
+#: modules/gui/macosx/ConvertAndSave.m:179 modules/gui/qt4/ui/profiles.h:713
+msgid "Frame Rate"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio codec"
+ msgstr "ஒலித கோடகà¯à®•à®³à¯"
+
+ #: modules/gui/macosx/ConvertAndSave.m:176 modules/gui/qt4/ui/profiles.h:710
+ #, fuzzy
+ msgid "Keep original video track"
+ msgstr "அசல௠அளவà¯"
+
+ #: modules/gui/macosx/ConvertAndSave.m:179 modules/gui/qt4/ui/profiles.h:713
+ #, fuzzy
+ msgid "Frame Rate"
+ msgstr "வடிவம௠அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:181 modules/gui/qt4/ui/profiles.h:723
msgid ""
@@@ -15576,20 -15967,24 +18342,41 @@@ msgid "Scale
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:186 modules/gui/qt4/ui/profiles.h:736
++<<<<<<< HEAD
+msgid "Keep original audio track"
+msgstr ""
+
+#: modules/gui/macosx/ConvertAndSave.m:192 modules/gui/qt4/ui/profiles.h:747
+msgid "Overlay subtitles on the video"
+msgstr ""
+
+#: modules/gui/macosx/ConvertAndSave.m:195
+msgid "Stream Destination"
+msgstr ""
+
+#: modules/gui/macosx/ConvertAndSave.m:196
+msgid "Stream Announcement"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Keep original audio track"
+ msgstr "அசல௠அளவà¯"
+
+ #: modules/gui/macosx/ConvertAndSave.m:192 modules/gui/qt4/ui/profiles.h:747
+ #, fuzzy
+ msgid "Overlay subtitles on the video"
+ msgstr "நிகழà¯à®ªà®Ÿà®¤à¯à®¤à¯à®Ÿà®©à¯ ஊடகதà¯à®¤à®²à¯ˆà®ªà¯à®ªà¯ˆ காடà¯à®Ÿà¯"
+
+ #: modules/gui/macosx/ConvertAndSave.m:195
+ #, fuzzy
+ msgid "Stream Destination"
+ msgstr "சேரà¯à®®à®¿à®Ÿà®®à¯"
+
+ #: modules/gui/macosx/ConvertAndSave.m:196
+ #, fuzzy
+ msgid "Stream Announcement"
+ msgstr "ஓடை பெயரà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:198 modules/gui/macosx/open.m:195
#: modules/gui/macosx/output.m:137
@@@ -15649,12 -16044,14 +18436,23 @@@ msgid "
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:366
++<<<<<<< HEAD
+msgid "Save as new profile"
+msgstr ""
+
+#: modules/gui/macosx/ConvertAndSave.m:379
+msgid "Remove a profile"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Save as new profile"
+ msgstr "பà¯à®¤à®¿à®¯ பாவனையாளரை செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
+
+ #: modules/gui/macosx/ConvertAndSave.m:379
+ #, fuzzy
+ msgid "Remove a profile"
+ msgstr "பà¯à®¤à®¿à®¯ பாவனையாளரை செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:380
msgid "Select the profile you would like to remove:"
@@@ -15665,16 -16062,18 +18463,28 @@@ msgid "%@ stream to %@:%@
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:478
++<<<<<<< HEAD
+msgid "No Address given"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "No Address given"
+ msgstr "பà¯à®°à®µà®²à®°à¯ à®®à¯à®•à®µà®°à®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:480
msgid "In order to stream, a valid destination address is required."
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:485
++<<<<<<< HEAD
+msgid "No Channel Name given"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "No Channel Name given"
+ msgstr "அலைவரிசை பெயரà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:487
msgid ""
@@@ -15682,16 -16081,17 +18492,27 @@@
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:492
++<<<<<<< HEAD
+msgid "No SDP URL given"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "No SDP URL given"
+ msgstr "SDP சà¯à®Ÿà¯à®Ÿà®¿ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:494
msgid "A SDP export is requested, but no URL is provided."
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -15784,38 -16184,39 +18605,71 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ #, fuzzy
+ msgid "VLC media playback"
+ msgstr "VLC ஊடகஇயகà¯à®•à®¿"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "தொடரà¯à®¨à¯à®¤à¯"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "அகறà¯à®±à¯ பழைய விரà¯à®ªà¯à®ªà®¤à¯à®¤à¯‡à®°à¯à®µà¯à®•à®³à¯?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
- #, c-format
- msgid "VLC Debug Log (%s).rtf"
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "அகறà¯à®±à¯ பழைய விரà¯à®ªà¯à®ªà®¤à¯à®¤à¯‡à®°à¯à®µà¯à®•à®³à¯?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+ #, c-format
+ msgid "VLC Debug Log (%s).rtf"
msgstr ""
#: modules/gui/macosx/macosx.m:53
@@@ -15922,8 -16323,9 +18776,14 @@@ msgid "
msgstr ""
#: modules/gui/macosx/macosx.m:94 modules/gui/macosx/simple_prefs.m:361
++<<<<<<< HEAD
+msgid "Use the native fullscreen mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Use the native fullscreen mode"
+ msgstr "விலகà¯à®•à¯ à®®à¯à®´à¯à®¤à¯à®¤à®¿à®°à¯ˆ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:95
msgid ""
@@@ -15965,7 -16367,7 +18825,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "மூட௠தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
@@@ -15986,16 -16388,18 +18850,28 @@@ msgid "Shows the shuffle and repeat but
msgstr ""
#: modules/gui/macosx/macosx.m:118 modules/gui/macosx/MainMenu.m:342
++<<<<<<< HEAD
+msgid "Show Audio Effects Button"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Show Audio Effects Button"
+ msgstr "ஒலித விளைவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:119
msgid "Shows the audio effects button in the main window."
msgstr ""
#: modules/gui/macosx/macosx.m:121 modules/gui/macosx/MainMenu.m:344
++<<<<<<< HEAD
+msgid "Show Sidebar"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Show Sidebar"
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯ˆ காடà¯à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:122
msgid "Shows a sidebar in the main window listing media sources."
@@@ -16016,8 -16420,9 +18892,14 @@@ msgid "Do nothing
msgstr ""
#: modules/gui/macosx/macosx.m:130
++<<<<<<< HEAD
+msgid "Pause iTunes"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Pause iTunes"
+ msgstr "நிறà¯à®¤à¯à®¤à¯ மடà¯à®Ÿà¯à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:130
msgid "Pause and resume iTunes"
@@@ -16032,8 -16437,9 +18914,14 @@@ msgid "Mac OS X interface
msgstr "Mac OS X à®®à¯à®•à®ªà¯à®ªà¯"
#: modules/gui/macosx/macosx.m:146
++<<<<<<< HEAD
+msgid "Appearance"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Appearance"
+ msgstr "சரிசமமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:156
msgid "Behavior"
@@@ -16044,12 -16450,14 +18932,23 @@@ msgid "Apple Remote and media keys
msgstr ""
#: modules/gui/macosx/macosx.m:181
++<<<<<<< HEAD
+msgid "Video output"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:68
+msgid "Track Number"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Video output"
+ msgstr "நிகழà¯à®ªà®Ÿ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ சà¯à®Ÿà¯à®Ÿà®¿"
+
+ #: modules/gui/macosx/MainMenu.m:68
+ #, fuzzy
+ msgid "Track Number"
+ msgstr "சà¯à®µà®Ÿà¯ எணà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:70 modules/gui/macosx/playlist.m:165
#: modules/gui/macosx/wizard.m:347 modules/gui/qt4/dialogs/plugins.cpp:557
@@@ -16094,7 -16502,7 +18993,11 @@@ msgstr "மறை VLC
msgid "Hide Others"
msgstr "மறை மறà¯à®±"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "எலà¯à®²à®¾à®®à¯ காடà¯à®Ÿà¯"
@@@ -16135,8 -16543,9 +19038,14 @@@ msgid "Streaming/Exporting Wizard...
msgstr ""
#: modules/gui/macosx/MainMenu.m:328
++<<<<<<< HEAD
+msgid "Convert / Stream..."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Convert / Stream..."
+ msgstr "செயலà¯à®²à®¾à®•à¯à®•à¯/சேமி..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:331
msgid "Cut"
@@@ -16155,20 -16564,23 +19064,37 @@@ msgid "Select All
msgstr "தெரிவ௠எலà¯à®²à®¾à®®à¯"
#: modules/gui/macosx/MainMenu.m:337
++<<<<<<< HEAD
+msgid "View"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:346 modules/gui/macosx/MainMenu.m:347
+msgid "Playlist Table Columns"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "View"
+ msgstr "&பாரà¯à®µà¯ˆà®¯à®¿à®Ÿà¯"
+
+ #: modules/gui/macosx/MainMenu.m:346 modules/gui/macosx/MainMenu.m:347
+ #, fuzzy
+ msgid "Playlist Table Columns"
+ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ கோபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:349
msgid "Playback"
msgstr "பினà¯à®©à®©à®¿"
#: modules/gui/macosx/MainMenu.m:354 modules/gui/macosx/MainMenu.m:355
++<<<<<<< HEAD
+msgid "Playback Speed"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Playback Speed"
+ msgstr "பினà¯à®©à®©à®¿â€Ž வேகமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:359
#: modules/gui/macosx/TrackSynchronization.m:59
@@@ -16179,15 -16591,15 +19105,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "அகறà¯à®±à¯ பினà¯à®©à®©à®¿â€Ž"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "à®®à¯à®©à¯à®©à¯‹à®•à¯à®•à®¿à®¯ அடி"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "அகறà¯à®±à¯ பினà¯à®©à®©à®¿â€Ž"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "à®®à¯à®©à¯à®©à¯‹à®•à¯à®•à®¿à®¯ அடி"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "பினà¯à®©à¯‹à®•à¯à®•à®¿à®¯ அடி"
@@@ -16203,30 -16615,30 +19141,56 @@@ msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®¤à
msgid "Audio Device"
msgstr "ஒலித சாதனமà¯"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "அறை அளவà¯"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "வழகà¯à®•à®®à®¾à®© அளவà¯"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "இரடà¯à®Ÿà®¿à®ªà¯à®ªà¯ அளவà¯"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "திடிரனகைபà¯à®ªà®±à¯à®±à¯ "
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "அறை அளவà¯"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "வழகà¯à®•à®®à®¾à®© அளவà¯"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "இரடà¯à®Ÿà®¿à®ªà¯à®ªà¯ அளவà¯"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "திடிரனகைபà¯à®ªà®±à¯à®±à¯ "
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "à®®à¯à®´à¯à®¤à¯à®¤à®¿à®°à¯ˆ நிகழà¯à®ªà®Ÿ சாதனமà¯"
@@@ -16235,33 -16647,39 +19199,66 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
+msgid "Add Subtitle File..."
+msgstr ""
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
+ #, fuzzy
+ msgid "Add Subtitle File..."
+ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:415 modules/gui/macosx/MainMenu.m:416
msgid "Subtitles Track"
msgstr "தà¯à®£à¯ˆ உரை சà¯à®µà®Ÿà¯"
#: modules/gui/macosx/MainMenu.m:417
-#, fuzzy
++<<<<<<< HEAD
msgid "Text Size"
-msgstr "எழà¯à®¤à¯à®¤à¯à®±à¯ அளவà¯"
+msgstr ""
#: modules/gui/macosx/MainMenu.m:418
-#, fuzzy
msgid "Text Color"
-msgstr "எழà¯à®¤à¯à®¤à¯à®°à¯ நிறமà¯"
+msgstr ""
#: modules/gui/macosx/MainMenu.m:419
-#, fuzzy
msgid "Outline Thickness"
-msgstr "சà¯à®°à¯à®•à¯à®•à®®à®¾à®©"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:421 modules/gui/macosx/MainMenu.m:422
+msgid "Background Opacity"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:423
+msgid "Background Color"
+msgstr ""
++=======
++#, fuzzy
++msgid "Text Size"
++msgstr "எழà¯à®¤à¯à®¤à¯à®±à¯ அளவà¯"
++
++#: modules/gui/macosx/MainMenu.m:418
++#, fuzzy
++msgid "Text Color"
++msgstr "எழà¯à®¤à¯à®¤à¯à®°à¯ நிறமà¯"
++
++#: modules/gui/macosx/MainMenu.m:419
++#, fuzzy
++msgid "Outline Thickness"
++msgstr "சà¯à®°à¯à®•à¯à®•à®®à®¾à®©"
+
+ #: modules/gui/macosx/MainMenu.m:421 modules/gui/macosx/MainMenu.m:422
+ #, fuzzy
+ msgid "Background Opacity"
+ msgstr "பினà¯à®ªà¯à®± தோறà¯à®±à®®à¯"
+
+ #: modules/gui/macosx/MainMenu.m:423
+ #, fuzzy
+ msgid "Background Color"
+ msgstr "பினà¯à®ªà¯à®± தோறà¯à®±à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:425
msgid "Transparent"
@@@ -16284,16 -16702,19 +19281,32 @@@ msgid "Player...
msgstr "இயகà¯à®•à®¿..."
#: modules/gui/macosx/MainMenu.m:436
++<<<<<<< HEAD
+msgid "Main Window..."
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:437
+msgid "Audio Effects..."
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:438
+msgid "Video Effects..."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Main Window..."
+ msgstr "சாரள சிறிதாகà¯à®•à¯"
+
+ #: modules/gui/macosx/MainMenu.m:437
+ #, fuzzy
+ msgid "Audio Effects..."
+ msgstr "ஒலித விளைவà¯"
+
+ #: modules/gui/macosx/MainMenu.m:438
+ #, fuzzy
+ msgid "Video Effects..."
+ msgstr "நிகழà¯à®ªà®Ÿ விளைவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/MainMenu.m:439
msgid "Bookmarks..."
@@@ -16408,8 -16829,9 +19421,14 @@@ msgid "INTERNET
msgstr ""
#: modules/gui/macosx/open.m:57
++<<<<<<< HEAD
+msgid "No device is selected"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "No device is selected"
+ msgstr "ஒலிதசாதனம௠ஒனà¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:58
msgid ""
@@@ -16447,8 -16869,9 +19466,14 @@@ msgid "Capture
msgstr "கைபà¯à®ªà®±à¯à®±à¯ "
#: modules/gui/macosx/open.m:136 modules/gui/macosx/open.m:362
++<<<<<<< HEAD
+msgid "Choose a file"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Choose a file"
+ msgstr "தேரà¯à®µà¯ உளà¯à®³à¯€à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:139
msgid "Click to select a file for playback"
@@@ -16463,7 -16886,7 +19488,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "தேரà¯à®µà¯..."
@@@ -16475,28 -16898,33 +19504,55 @@@ msgid "
msgstr ""
#: modules/gui/macosx/open.m:149
++<<<<<<< HEAD
+msgid "Custom playback"
+msgstr ""
+
+#: modules/gui/macosx/open.m:157
+msgid "Open VIDEO_TS folder"
+msgstr ""
+
+#: modules/gui/macosx/open.m:158
+msgid "Open BDMV folder"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Custom playback"
+ msgstr "பினà¯à®©à®©à®¿â€Ž தோலà¯à®µà®¿"
+
+ #: modules/gui/macosx/open.m:157
+ #, fuzzy
+ msgid "Open VIDEO_TS folder"
+ msgstr "உறையை திற"
+
+ #: modules/gui/macosx/open.m:158
+ #, fuzzy
+ msgid "Open BDMV folder"
+ msgstr "உறையை திற"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:159
msgid "Insert Disc"
msgstr ""
#: modules/gui/macosx/open.m:167
++<<<<<<< HEAD
+msgid "Disable DVD menus"
+msgstr ""
+
+#: modules/gui/macosx/open.m:171
+msgid "Enable DVD menus"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Disable DVD menus"
+ msgstr "DVD வகைபà¯à®ªà®Ÿà¯à®Ÿà®¿à®•à®³à¯"
+
+ #: modules/gui/macosx/open.m:171
+ #, fuzzy
+ msgid "Enable DVD menus"
+ msgstr "DVD வகைபà¯à®ªà®Ÿà¯à®Ÿà®¿à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:184
msgid "IP Address"
@@@ -16547,8 -16975,9 +19603,14 @@@ msgstr "
#: modules/gui/macosx/open.m:206 modules/gui/macosx/open.m:513
#: modules/gui/macosx/open.m:1396
++<<<<<<< HEAD
+msgid "Input Devices"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Input Devices"
+ msgstr "சாதனமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:209
msgid ""
@@@ -16557,16 -16986,19 +19619,32 @@@
msgstr ""
#: modules/gui/macosx/open.m:212
++<<<<<<< HEAD
+msgid "Subscreen left"
+msgstr ""
+
+#: modules/gui/macosx/open.m:213
+msgid "Subscreen top"
+msgstr ""
+
+#: modules/gui/macosx/open.m:217
+msgid "Capture Audio"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subscreen left"
+ msgstr "தà¯à®£à¯ˆà®¤à®¿à®°à¯ˆ இடதà¯:"
+
+ #: modules/gui/macosx/open.m:213
+ #, fuzzy
+ msgid "Subscreen top"
+ msgstr "தà¯à®£à¯ˆà®¤à®¿à®°à¯ˆ மேலே:"
+
+ #: modules/gui/macosx/open.m:217
+ #, fuzzy
+ msgid "Capture Audio"
+ msgstr "கைபà¯à®ªà®±à¯à®±à¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:218
msgid "Current channel:"
@@@ -16611,16 -17043,18 +19689,28 @@@ msgid "Image height
msgstr "உரà¯à®µ உயரமà¯"
#: modules/gui/macosx/open.m:361
++<<<<<<< HEAD
+msgid "Add Subtitle File:"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Add Subtitle File:"
+ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:366
msgid "Click to setup subtitle playback in full detail."
msgstr ""
#: modules/gui/macosx/open.m:368
++<<<<<<< HEAD
+msgid "Click to select a subtitle file."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Click to select a subtitle file."
+ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯à®•à®³à¯ˆ தெரிவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:369
msgid "Override parameters"
@@@ -16631,17 -17065,19 +19721,31 @@@ msgid "FPS
msgstr "FPS"
#: modules/gui/macosx/open.m:374
++<<<<<<< HEAD
+msgid "Subtitle encoding"
+msgstr ""
+
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #, fuzzy
+ msgid "Subtitle encoding"
+ msgstr "தà¯à®£à¯ˆ உரை கோடகà¯à®•à®³à¯"
+
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "எழà¯à®¤à¯à®¤à¯à®±à¯ அளவà¯"
#: modules/gui/macosx/open.m:378
++<<<<<<< HEAD
+msgid "Subtitle alignment"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle alignment"
+ msgstr "நிகழà¯à®ªà®Ÿ வரிசைபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:381
msgid "Click to dismiss the subtitle setup dialog."
@@@ -16661,9 -17097,9 +19765,15 @@@ msgid "Open File
msgstr "கோபà¯à®ªà¯à®•à®³à¯ˆ திற"
#: modules/gui/macosx/open.m:983
++<<<<<<< HEAD
+#, c-format
+msgid "%i tracks"
+msgstr ""
++=======
+ #, fuzzy, c-format
+ msgid "%i tracks"
+ msgstr "ஒலிதம௠சà¯à®µà®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/open.m:1483
msgid "Composite input"
@@@ -16768,8 -17204,9 +19878,14 @@@ msgid "XML Shareable Playlist Format (X
msgstr ""
#: modules/gui/macosx/playlist.m:536 modules/gui/qt4/dialogs_provider.cpp:582
++<<<<<<< HEAD
+msgid "HTML playlist"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "HTML playlist"
+ msgstr "HTML தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/playlist.m:715
msgid "Save Playlist"
@@@ -16863,18 -17300,19 +19979,32 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "விரà¯à®ªà¯à®ªà®¤à¯à®¤à¯‡à®°à¯à®µà¯à®•à®³à¯"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "மீணà¯à®Ÿà¯à®®à¯ செயà¯(All)"
#: modules/gui/macosx/prefs.m:210
++<<<<<<< HEAD
+msgid "Show Basic"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Show Basic"
+ msgstr "தகவலà¯à®•à®³à¯ˆ காடà¯à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/prefs_widgets.m:1149
msgid "Select a directory"
@@@ -16909,12 -17347,14 +20039,23 @@@ msgstr "நிகழà¯à®ªà®Ÿ அமை
#: modules/gui/macosx/simple_prefs.m:275
#: modules/gui/qt4/components/simple_preferences.cpp:226
#: modules/gui/qt4/components/simple_preferences.cpp:840
++<<<<<<< HEAD
+msgid "Subtitle & On Screen Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:277
+msgid "Input & Codec Settings"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle & On Screen Display Settings"
+ msgstr "தà¯à®£à¯ˆ உரை & On Screen Display அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #: modules/gui/macosx/simple_prefs.m:277
+ #, fuzzy
+ msgid "Input & Codec Settings"
+ msgstr "உளà¯à®³à¯€à®Ÿà¯ & Codecs அமைபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/simple_prefs.m:311
msgid "General Audio"
@@@ -17004,16 -17444,18 +20145,28 @@@ msgid "Note that these are system-wide
msgstr ""
#: modules/gui/macosx/simple_prefs.m:356
++<<<<<<< HEAD
+msgid "Interface style"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Interface style"
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯ மாடà¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/simple_prefs.m:357
msgid "Dark"
msgstr ""
#: modules/gui/macosx/simple_prefs.m:358
++<<<<<<< HEAD
+msgid "Bright"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Bright"
+ msgstr "பிரகாசமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/simple_prefs.m:359
msgid "Album art download policy"
@@@ -17042,132 -17484,134 +20195,252 @@@ msgstr "
#: modules/gui/macosx/simple_prefs.m:372 modules/lua/vlc.c:96
#: modules/lua/vlc.c:103
++<<<<<<< HEAD
+msgid "Lua HTTP"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "பாரà¯à®µà¯ˆ அமைபà¯à®ªà¯à®•à®³à¯"
+
+#: modules/gui/macosx/simple_prefs.m:380
+#: modules/gui/qt4/ui/sprefs_subtitles.h:297
+msgid "Font color"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #, fuzzy
+ msgid "Lua HTTP"
+ msgstr "HTTP"
+
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "பாரà¯à®µà¯ˆ அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #: modules/gui/macosx/simple_prefs.m:379
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:297
+ #, fuzzy
+ msgid "Font color"
+ msgstr "எழà¯à®¤à¯à®¤à¯à®°à¯ நிறமà¯"
+
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "எழà¯à®¤à¯à®¤à¯à®°à¯"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
+#: modules/gui/qt4/ui/sprefs_subtitles.h:292
+msgid "Preferred subtitle language"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "செயலà¯à®ªà®Ÿ வை OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ #, fuzzy
+ msgid "Subtitle languages"
+ msgstr "தà¯à®£à¯ˆ உரை மொழி"
+
+ #: modules/gui/macosx/simple_prefs.m:383
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:292
+ #, fuzzy
+ msgid "Preferred subtitle language"
+ msgstr "விரà¯à®ªà¯à®ª ஒலிதமொழி"
+
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "செயலà¯à®ªà®Ÿ வை OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
+#: modules/gui/qt4/ui/sprefs_subtitles.h:299
+msgid "Outline color"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ #, fuzzy
+ msgid "Force bold"
+ msgstr "வறà¯à®ªà¯à®ªà¯à®±à¯à®¤à¯à®¤à¯ IPv6"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:299
+ #, fuzzy
+ msgid "Outline color"
+ msgstr "சà¯à®°à¯à®•à¯à®•à®®à®¾à®©"
+
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "காடà¯à®šà®¿"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "நிகழà¯à®ªà®Ÿ திடிரனகைபà¯à®ªà®±à¯à®±à¯"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "உறை"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "வடிவூடà¯à®Ÿà®®à¯"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "நிகழà¯à®ªà®Ÿ திடிரனகைபà¯à®ªà®±à¯à®±à¯"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "உறை"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "வடிவூடà¯à®Ÿà®®à¯"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Reset விரà¯à®ªà¯à®ªà®¤à¯à®¤à¯‡à®°à¯à®µà¯à®•à®³à¯"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17180,35 -17624,35 +20453,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "தேரà¯à®µà¯"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "தேரà¯à®µà¯"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -17223,8 -17667,9 +20526,14 @@@ msgstr "ஒலிதமà¯/நிகழ
#: modules/gui/macosx/TrackSynchronization.m:62
#: modules/gui/qt4/components/extended_panels.cpp:1468
++<<<<<<< HEAD
+msgid "Audio track synchronization:"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio track synchronization:"
+ msgstr "ஒலிதம௠சà¯à®µà®Ÿà¯à®•à®³à¯: %s "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/TrackSynchronization.m:63
#: modules/gui/macosx/TrackSynchronization.m:67
@@@ -17242,17 -17687,19 +20551,29 @@@ msgstr "தà¯à®£à¯ˆ உரை/நிà®
#: modules/gui/macosx/TrackSynchronization.m:66
#: modules/gui/qt4/components/extended_panels.cpp:1480
++<<<<<<< HEAD
+msgid "Subtitle track synchronization:"
+msgstr ""
-
++=======
+ #, fuzzy
+ msgid "Subtitle track synchronization:"
+ msgstr "தà¯à®£à¯ˆ உரை சà¯à®µà®Ÿà¯: %s"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+
#: modules/gui/macosx/TrackSynchronization.m:68
msgid "A positive value means that the subtitles are ahead of the video"
msgstr ""
#: modules/gui/macosx/TrackSynchronization.m:69
#: modules/gui/qt4/components/extended_panels.cpp:1487
++<<<<<<< HEAD
+msgid "Subtitle speed:"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle speed:"
+ msgstr "தà¯à®£à¯ˆà®‰à®°à¯ˆà®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/TrackSynchronization.m:70
msgid "fps"
@@@ -17260,8 -17707,9 +20581,14 @@@ msgstr "
#: modules/gui/macosx/TrackSynchronization.m:71
#: modules/gui/qt4/components/extended_panels.cpp:1501
++<<<<<<< HEAD
+msgid "Subtitle duration factor:"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle duration factor:"
+ msgstr "தà¯à®£à¯ˆ உரை விவரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/TrackSynchronization.m:79
#: modules/gui/qt4/components/extended_panels.cpp:1612
@@@ -17296,8 -17744,9 +20623,14 @@@ msgstr "
#: modules/gui/macosx/VideoEffects.m:83
#: modules/gui/qt4/ui/video_effects.h:1355
++<<<<<<< HEAD
+msgid "Geometry"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Geometry"
+ msgstr "நிகழà¯à®ªà®Ÿà®®à¯ நினைவகமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:84 modules/gui/macosx/VideoEffects.m:133
#: modules/gui/macosx/VideoEffects.m:148 modules/gui/macosx/VideoEffects.m:151
@@@ -17309,13 -17758,15 +20642,25 @@@ msgid "Color
msgstr "நிறமà¯"
#: modules/gui/macosx/VideoEffects.m:89
++<<<<<<< HEAD
+msgid "Image Adjust"
+msgstr ""
+
+#: modules/gui/macosx/VideoEffects.m:93
+#: modules/gui/qt4/ui/video_effects.h:1305
+msgid "Brightness Threshold"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Image Adjust"
+ msgstr "உரà¯à®µ சரியாகà¯à®•à®²à¯"
+
+ #: modules/gui/macosx/VideoEffects.m:93
+ #: modules/gui/qt4/ui/video_effects.h:1305
+ #, fuzzy
+ msgid "Brightness Threshold"
+ msgstr "பிரகாசமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:97 modules/video_filter/sharpen.c:67
#: modules/gui/qt4/ui/video_effects.h:1309
@@@ -17325,8 -17776,9 +20670,14 @@@ msgstr "
#: modules/gui/macosx/VideoEffects.m:98
#: modules/gui/qt4/ui/video_effects.h:1310
#: modules/gui/qt4/ui/video_effects.h:1397
++<<<<<<< HEAD
+msgid "Sigma"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Sigma"
+ msgstr "சிறிய"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:99
#: modules/gui/qt4/ui/video_effects.h:1311
@@@ -17345,8 -17797,9 +20696,14 @@@ msgstr "
#: modules/gui/macosx/VideoEffects.m:102 modules/video_filter/grain.c:53
#: modules/gui/qt4/ui/video_effects.h:1314
++<<<<<<< HEAD
+msgid "Variance"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Variance"
+ msgstr "சரிசமமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:107
#: modules/gui/qt4/ui/video_effects.h:1322
@@@ -17384,27 -17837,31 +20741,51 @@@ msgid "Flip vertically
msgstr ""
#: modules/gui/macosx/VideoEffects.m:122
++<<<<<<< HEAD
+msgid "Magnification/Zoom"
+msgstr ""
+
+#: modules/gui/macosx/VideoEffects.m:123
+#: modules/gui/qt4/ui/video_effects.h:1351
+msgid "Puzzle game"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Magnification/Zoom"
+ msgstr "உரà¯à®µà®ªà¯†à®°à¯à®•à¯à®•à®®à¯"
+
+ #: modules/gui/macosx/VideoEffects.m:123
+ #: modules/gui/qt4/ui/video_effects.h:1351
+ #, fuzzy
+ msgid "Puzzle game"
+ msgstr "நோடி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:124 modules/gui/macosx/VideoEffects.m:129
#: share/lua/http/dialogs/mosaic_window.html:96
#: modules/gui/qt4/ui/video_effects.h:1346
#: modules/gui/qt4/ui/video_effects.h:1352
++<<<<<<< HEAD
+msgid "Rows"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Rows"
+ msgstr "கணà¯à®Ÿà¯†à®Ÿà¯à®•à¯à®•"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:125 modules/gui/macosx/VideoEffects.m:130
#: share/lua/http/dialogs/mosaic_window.html:114
#: modules/gui/qt4/ui/video_effects.h:1347
#: modules/gui/qt4/ui/video_effects.h:1353
++<<<<<<< HEAD
+msgid "Columns"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Columns"
+ msgstr "ஆணைகளà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:126 modules/video_filter/clone.c:57
#: modules/gui/qt4/ui/video_effects.h:1393
@@@ -17418,8 -17875,9 +20799,14 @@@ msgstr "
#: modules/gui/macosx/VideoEffects.m:128
#: modules/gui/qt4/ui/video_effects.h:1345
++<<<<<<< HEAD
+msgid "Wall"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Wall"
+ msgstr "எலà¯à®²à®¾à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:132 modules/video_filter/colorthres.c:70
#: modules/gui/qt4/ui/video_effects.h:1336
@@@ -17433,8 -17891,9 +20820,14 @@@ msgstr "
#: modules/gui/macosx/VideoEffects.m:137
#: modules/gui/qt4/ui/video_effects.h:1342
++<<<<<<< HEAD
+msgid "Intensity"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Intensity"
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:139 modules/gui/macosx/VideoEffects.m:142
#: modules/video_filter/gradient.c:76 modules/video_filter/gradient.c:82
@@@ -17480,8 -17939,9 +20873,14 @@@ msgstr "
#: modules/gui/macosx/VideoEffects.m:156
#: modules/gui/qt4/ui/video_effects.h:1388
++<<<<<<< HEAD
+msgid "Factor"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Factor"
+ msgstr "விரைவாக"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:157
#: modules/video_filter/motiondetect.c:49
@@@ -17490,8 -17950,9 +20889,14 @@@ msgstr "
#: modules/gui/macosx/VideoEffects.m:158
#: modules/gui/qt4/ui/video_effects.h:1395
++<<<<<<< HEAD
+msgid "Water effect"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Water effect"
+ msgstr "எழà¯à®¤à¯à®¤à¯à®±à¯ விளைவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:161 modules/video_filter/anaglyph.c:73
msgid "Anaglyph"
@@@ -17514,8 -17975,9 +20919,14 @@@ msgstr "
#: modules/gui/macosx/VideoEffects.m:186
#: modules/gui/qt4/ui/video_effects.h:1357
++<<<<<<< HEAD
+msgid "Logo"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Logo"
+ msgstr "[மீணà¯à®Ÿà¯à®®à¯ மீணà¯à®Ÿà¯à®®à¯]"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/VideoEffects.m:207
#: modules/stream_out/mosaic_bridge.c:128 modules/video_filter/mosaic.c:87
@@@ -17524,8 -17986,9 +20935,14 @@@ msgid "Transparency
msgstr "தெளà¯à®³à®¤à¯à®¤à¯†à®³à®¿à®¨à¯à®¤"
#: modules/gui/macosx/VideoEffects.m:236
++<<<<<<< HEAD
+msgid "Organize profiles..."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Organize profiles..."
+ msgstr "சேமி கோபà¯à®ªà¯..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:116
msgid "MPEG-1 Video codec (usable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
@@@ -17985,8 -18448,9 +21402,14 @@@ msgid "no
msgstr "இலà¯à®²à¯ˆ"
#: modules/gui/macosx/wizard.m:1315
++<<<<<<< HEAD
+msgid "yes: from %@ to %@"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "yes: from %@ to %@"
+ msgstr "ஆமà¯: %@ @ %@ kb/s"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:1325 modules/gui/macosx/wizard.m:1343
msgid "yes: %@ @ %@ kb/s"
@@@ -18265,32 -18729,34 +21688,63 @@@ msgid " Source : %s
msgstr "மூலம௠: %s"
#: modules/gui/ncurses.c:1094
++<<<<<<< HEAD
+#, c-format
+msgid " Position : %s/%s"
+msgstr ""
+
+#: modules/gui/ncurses.c:1099
+msgid " Volume : Mute"
+msgstr ""
+
+#: modules/gui/ncurses.c:1100
+#, c-format
+msgid " Volume : %3ld%%"
+msgstr ""
+
+#: modules/gui/ncurses.c:1100
+msgid " Volume : ----"
+msgstr ""
+
+#: modules/gui/ncurses.c:1106
+#, c-format
+msgid " Title : %<PRId64>/%d"
+msgstr ""
+
+#: modules/gui/ncurses.c:1112
+#, c-format
+msgid " Chapter : %<PRId64>/%d"
+msgstr ""
++=======
+ #, fuzzy, c-format
+ msgid " Position : %s/%s"
+ msgstr "நிலை"
+
+ #: modules/gui/ncurses.c:1099
+ #, fuzzy
+ msgid " Volume : Mute"
+ msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®®à¯ : %i%%"
+
+ #: modules/gui/ncurses.c:1100
+ #, fuzzy, c-format
+ msgid " Volume : %3ld%%"
+ msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®®à¯ : %i%%"
+
+ #: modules/gui/ncurses.c:1100
+ #, fuzzy
+ msgid " Volume : ----"
+ msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®®à¯ : %i%%"
+
+ #: modules/gui/ncurses.c:1106
+ #, fuzzy, c-format
+ msgid " Title : %<PRId64>/%d"
+ msgstr "தலைபà¯à®ªà¯ :%d/%d"
+
+ #: modules/gui/ncurses.c:1112
+ #, fuzzy, c-format
+ msgid " Chapter : %<PRId64>/%d"
+ msgstr "அதà¯à®¤à®¿à®¯à®¾à®¯à®®à¯ : %d/%d"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:1117
msgid " Source: <no current item> "
@@@ -18341,12 -18807,14 +21795,23 @@@ msgid "
msgstr ""
#: modules/gui/qt4/components/controller.hpp:116
++<<<<<<< HEAD
+msgid "Previous / Backward"
+msgstr ""
+
+#: modules/gui/qt4/components/controller.hpp:116
+msgid "Next / Forward"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Previous / Backward"
+ msgstr "à®®à¯à®¨à¯à®¤à¯ˆà®¯ அதà¯à®¤à®¿à®¯à®¾à®¯à®®à¯"
+
+ #: modules/gui/qt4/components/controller.hpp:116
+ #, fuzzy
+ msgid "Next / Forward"
+ msgstr "à®®à¯à®©à¯à®©à¯‹à®•à¯à®•à®¿à®¯ அடி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "De-Fullscreen"
@@@ -18379,12 -18847,14 +21844,23 @@@ msgid "Step forward
msgstr "à®®à¯à®©à¯à®©à¯‹à®•à¯à®•à®¿à®¯ அடி"
#: modules/gui/qt4/components/controller.hpp:120
++<<<<<<< HEAD
+msgid "Loop / Repeat"
+msgstr ""
+
+#: modules/gui/qt4/components/controller.hpp:121
+msgid "Open subtitles"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Loop / Repeat"
+ msgstr "மீணà¯à®Ÿà¯à®®à¯ செயà¯à®¯à®¾à®¤à¯"
+
+ #: modules/gui/qt4/components/controller.hpp:121
+ #, fuzzy
+ msgid "Open subtitles"
+ msgstr "தà¯à®£à¯ˆà®‰à®°à¯ˆà®•à®³à¯ˆ திற..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:121
msgid "Dock fullscreen controller"
@@@ -18419,8 -18889,9 +21895,14 @@@ msgid "Show extended settings
msgstr "நீடà¯à®Ÿà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ அமைபà¯à®ªà¯à®•à®³à¯ˆ காடà¯à®Ÿà¯"
#: modules/gui/qt4/components/controller.hpp:128
++<<<<<<< HEAD
+msgid "Toggle playlist"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Toggle playlist"
+ msgstr "தà¯à®Ÿà¯ˆ படà¯à®Ÿà®¿à®¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:129
msgid "Take a snapshot"
@@@ -18452,8 -18923,9 +21934,14 @@@ msgstr "
#: modules/gui/qt4/components/controller.hpp:134
#: modules/gui/qt4/components/open_panels.cpp:252
-#, fuzzy
++<<<<<<< HEAD
+msgid "Open subtitle file"
+msgstr ""
++=======
++#, fuzzy
+ msgid "Open subtitle file"
+ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯à®•à®³à¯ˆ திற"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:135
msgid "Dock/undock fullscreen controller to/from bottom of screen"
@@@ -18488,8 -18960,9 +21976,14 @@@ msgid "Stop the A to B loop
msgstr ""
#: modules/gui/qt4/components/controller_widget.cpp:274
++<<<<<<< HEAD
+msgid "Aspect Ratio"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Aspect Ratio"
+ msgstr "&தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:423
#: modules/video_filter/logo.c:48
@@@ -18624,12 -19097,14 +22118,23 @@@ msgid "
msgstr ""
#: modules/gui/qt4/components/extended_panels.cpp:1440
++<<<<<<< HEAD
+msgid "(Hastened)"
+msgstr ""
+
+#: modules/gui/qt4/components/extended_panels.cpp:1442
+msgid "(Delayed)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "(Hastened)"
+ msgstr "விரைவாக (fine)"
+
+ #: modules/gui/qt4/components/extended_panels.cpp:1442
+ #, fuzzy
+ msgid "(Delayed)"
+ msgstr "தாமதமாக"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1529
msgid "Force update of this dialog's values"
@@@ -18736,8 -19211,9 +22241,14 @@@ msgid "buffers
msgstr ""
#: modules/gui/qt4/components/info_panels.cpp:609
++<<<<<<< HEAD
+msgid "Last 60 seconds"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Last 60 seconds"
+ msgstr "காலம௠in ms"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/info_panels.cpp:610
msgid "Overall"
@@@ -18775,8 -19251,9 +22286,14 @@@ msgstr "
#: modules/gui/qt4/components/interface_widgets.cpp:743
#: modules/gui/qt4/dialogs/toolbar.cpp:461
++<<<<<<< HEAD
+msgid "Elapsed time"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Elapsed time"
+ msgstr "பà¯à®¤à¯à®¤à¯à®£à®°à¯à®µà¯ நேரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/interface_widgets.cpp:747
#: modules/gui/qt4/dialogs/toolbar.cpp:465
@@@ -18862,8 -19339,9 +22379,14 @@@ msgid "Bandwidth
msgstr ""
#: modules/gui/qt4/components/open_panels.cpp:1021
++<<<<<<< HEAD
+msgid "TV - analog"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "TV - analog"
+ msgstr "செயலிளகà¯à®• செயà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/open_panels.cpp:1024
msgid "Device name"
@@@ -18887,16 -19365,19 +22410,32 @@@ msgid "Double click to get media inform
msgstr ""
#: modules/gui/qt4/components/playlist/playlist.cpp:120
++<<<<<<< HEAD
+msgid "Change playlistview"
+msgstr ""
+
+#: modules/gui/qt4/components/playlist/playlist.cpp:130
+msgid "Search the playlist"
+msgstr ""
+
+#: modules/gui/qt4/components/playlist/playlist_model.cpp:377
+msgid "unknown"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Change playlistview"
+ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ சேமி"
+
+ #: modules/gui/qt4/components/playlist/playlist.cpp:130
+ #, fuzzy
+ msgid "Search the playlist"
+ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ தேடலà¯"
+
+ #: modules/gui/qt4/components/playlist/playlist_model.cpp:377
+ #, fuzzy
+ msgid "unknown"
+ msgstr "தெரியாத வகை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/selector.cpp:250
msgid "My Computer"
@@@ -18907,12 -19388,14 +22446,23 @@@ msgid "Devices
msgstr "சாதனமà¯"
#: modules/gui/qt4/components/playlist/selector.cpp:252
++<<<<<<< HEAD
+msgid "Local Network"
+msgstr ""
+
+#: modules/gui/qt4/components/playlist/selector.cpp:253
+msgid "Internet"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Local Network"
+ msgstr "பிணையமà¯"
+
+ #: modules/gui/qt4/components/playlist/selector.cpp:253
+ #, fuzzy
+ msgid "Internet"
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/selector.cpp:454
msgid "Remove this podcast subscription"
@@@ -18951,20 -19434,24 +22501,41 @@@ msgid "Descending
msgstr ""
#: modules/gui/qt4/components/playlist/standardpanel.cpp:260
++<<<<<<< HEAD
+msgid "Display size"
+msgstr ""
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:261
+msgid "Increase"
+msgstr ""
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:262
+msgid "Decrease"
+msgstr ""
+
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:281
+msgid "Playlist View Mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Display size"
+ msgstr "DVD சாதனமà¯"
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:261
+ #, fuzzy
+ msgid "Increase"
+ msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®¤à¯ˆ à®à®±à¯à®±à¯"
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:262
+ #, fuzzy
+ msgid "Decrease"
+ msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®¤à¯ˆ இறகà¯à®•à¯"
+
+ #: modules/gui/qt4/components/playlist/standardpanel.cpp:281
+ #, fuzzy
+ msgid "Playlist View Mode"
+ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ கோபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/playlist/standardpanel.cpp:510
msgid ""
@@@ -18977,16 -19464,19 +22548,32 @@@ msgid "Icons
msgstr ""
#: modules/gui/qt4/components/playlist/standardpanel.hpp:157
++<<<<<<< HEAD
+msgid "Detailed List"
+msgstr ""
+
+#: modules/gui/qt4/components/playlist/standardpanel.hpp:158
+msgid "List"
+msgstr ""
+
+#: modules/gui/qt4/components/playlist/standardpanel.hpp:159
+msgid "PictureFlow"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Detailed List"
+ msgstr "தà¯à®Ÿà¯ˆ படà¯à®Ÿà®¿à®¯à®²à¯"
+
+ #: modules/gui/qt4/components/playlist/standardpanel.hpp:158
+ #, fuzzy
+ msgid "List"
+ msgstr "படà¯à®Ÿà®¿à®¯à®²à¯ ID"
+
+ #: modules/gui/qt4/components/playlist/standardpanel.hpp:159
+ #, fuzzy
+ msgid "PictureFlow"
+ msgstr "சிதà¯à®¤à®¿à®°à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:304
msgid "Select File"
@@@ -19007,16 -19497,18 +22594,28 @@@ msgid "Any field
msgstr ""
#: modules/gui/qt4/components/preferences_widgets.cpp:1140
++<<<<<<< HEAD
+msgid "Actions"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Actions"
+ msgstr "à®’à®°à¯à®™à¯à®•à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1147
msgid "Hotkey"
msgstr "à®®à¯à®•à¯à®•à®¿à®¯ விசை"
#: modules/gui/qt4/components/preferences_widgets.cpp:1148
++<<<<<<< HEAD
+msgid "Application level hotkey"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Application level hotkey"
+ msgstr "à®’à®°à¯à®™à¯à®•à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1149
#: modules/gui/qt4/components/preferences_widgets.cpp:1409
@@@ -19035,8 -19527,9 +22634,14 @@@ msgid "
msgstr ""
#: modules/gui/qt4/components/preferences_widgets.cpp:1410
++<<<<<<< HEAD
+msgid "Hotkey change"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Hotkey change"
+ msgstr "à®®à¯à®•à¯à®•à®¿à®¯ விசை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1414
msgid "Press the new key or combination for "
@@@ -19055,8 -19548,9 +22660,14 @@@ msgid "Warning: <b>%1</b> is already a
msgstr ""
#: modules/gui/qt4/components/preferences_widgets.cpp:1493
++<<<<<<< HEAD
+msgid "Key or combination: "
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Key or combination: "
+ msgstr "தகவலà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:1502
msgid "Key: "
@@@ -19097,8 -19591,9 +22708,14 @@@ msgid "System's default
msgstr ""
#: modules/gui/qt4/components/simple_preferences.cpp:1242
++<<<<<<< HEAD
+msgid "File associations"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "File associations"
+ msgstr "File Selection"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:1251
#: modules/gui/qt4/dialogs_provider.hpp:42
@@@ -19146,20 -19641,20 +22763,36 @@@ msgstr "
msgid "Create a new profile"
msgstr "பà¯à®¤à®¿à®¯ பாவனையாளரை செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "உரà¯à®µà®¾à®•à¯à®•à¯"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -19308,8 -19803,9 +22941,14 @@@ msgid "&Start
msgstr "&தொடகà¯à®•à®®à¯ "
#: modules/gui/qt4/dialogs/convert.cpp:132
++<<<<<<< HEAD
+msgid "Containers (*"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Containers (*"
+ msgstr "தொடரà¯à®¨à¯à®¤à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/errors.cpp:40
msgid "Errors"
@@@ -19340,8 -19836,9 +22979,14 @@@ msgid "v4l2 controls
msgstr "v4l2 அமைபà¯à®ªà¯à®•à®³à¯"
#: modules/gui/qt4/dialogs/extended.cpp:101
++<<<<<<< HEAD
+msgid "&Write changes to config"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "&Write changes to config"
+ msgstr "File Selection"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:61
#: modules/gui/qt4/dialogs/firstrun.cpp:69
@@@ -19366,12 -19863,14 +23011,23 @@@ msgid "Network Access Policy
msgstr ""
#: modules/gui/qt4/dialogs/firstrun.cpp:98
++<<<<<<< HEAD
+msgid "Automatically retrieve media info"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/firstrun.cpp:103
+msgid "Regularly check for VLC updates"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Automatically retrieve media info"
+ msgstr "தானாக பà¯à®¤à¯à®ªà¯à®ªà®¿à®•à¯à®• சோதனை"
+
+ #: modules/gui/qt4/dialogs/firstrun.cpp:103
+ #, fuzzy
+ msgid "Regularly check for VLC updates"
+ msgstr "பà¯à®¤à¯à®ªà¯à®ªà®¿à®•à¯à®• சோதனை..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/gototime.cpp:42
msgid "Go to Time"
@@@ -19398,8 -19897,9 +23054,14 @@@ msgid "&Yes
msgstr "&ஆமà¯"
#: modules/gui/qt4/dialogs/help.cpp:219
++<<<<<<< HEAD
+msgid "&No"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "&No"
+ msgstr "&செலà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:222 modules/gui/qt4/ui/update.h:147
msgid "VLC media player updates"
@@@ -19418,24 -19918,27 +23080,42 @@@ msgid "An error occurred while checkin
msgstr ""
#: modules/gui/qt4/dialogs/mediainfo.cpp:52
++<<<<<<< HEAD
+msgid "Current Media Information"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Current Media Information"
+ msgstr "ஊடக தகவலà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/mediainfo.cpp:63
msgid "&General"
msgstr "&பொதà¯"
#: modules/gui/qt4/dialogs/mediainfo.cpp:65
++<<<<<<< HEAD
+msgid "&Metadata"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "&Metadata"
+ msgstr "பெரà¯à®¤à®°à®µà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/mediainfo.cpp:67
msgid "Co&dec"
msgstr ""
#: modules/gui/qt4/dialogs/mediainfo.cpp:71
++<<<<<<< HEAD
+msgid "S&tatistics"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "S&tatistics"
+ msgstr "பà¯à®³à¯à®³à®¿ விபரஙà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/mediainfo.cpp:77
msgid "&Save Metadata"
@@@ -19468,8 -19971,9 +23148,14 @@@ msgid "Update the tree
msgstr ""
#: modules/gui/qt4/dialogs/messages.cpp:332
++<<<<<<< HEAD
+msgid "Clear the messages"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Clear the messages"
+ msgstr "நிற செயà¯à®¤à®¿à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/open.cpp:78 modules/gui/qt4/menus.cpp:915
msgid "Open Media"
@@@ -19510,12 -20014,14 +23196,23 @@@ msgid "&Stream
msgstr "&ஓடை"
#: modules/gui/qt4/dialogs/open.cpp:121
++<<<<<<< HEAD
+msgid "C&onvert"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/open.cpp:205
+msgid "C&onvert / Save"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "C&onvert"
+ msgstr "செயலà¯à®²à®¾à®•à¯à®•à¯"
+
+ #: modules/gui/qt4/dialogs/open.cpp:205
+ #, fuzzy
+ msgid "C&onvert / Save"
+ msgstr "&செயலà¯à®²à®¾à®•à¯à®•à¯ /சேமி "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/openurl.cpp:47
msgid "Open URL"
@@@ -19553,8 -20059,9 +23250,14 @@@ msgid "&Search:
msgstr "&தேடà¯:"
#: modules/gui/qt4/dialogs/plugins.cpp:209
++<<<<<<< HEAD
+msgid "Get more extensions from"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Get more extensions from"
+ msgstr "AAC நீடிபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/plugins.cpp:239
msgid "More information..."
@@@ -19613,16 -20120,19 +23316,32 @@@ msgid "Only show modules related to cur
msgstr ""
#: modules/gui/qt4/dialogs/preferences.cpp:201
++<<<<<<< HEAD
+msgid "Advanced Preferences"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/preferences.cpp:222
+msgid "Simple Preferences"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/preferences.cpp:306
+msgid "Cannot save Configuration"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Advanced Preferences"
+ msgstr "விரà¯à®ªà¯à®ªà®¤à¯à®¤à¯‡à®°à¯à®µà¯à®•à®³à¯"
+
+ #: modules/gui/qt4/dialogs/preferences.cpp:222
+ #, fuzzy
+ msgid "Simple Preferences"
+ msgstr "விரà¯à®ªà¯à®ªà®¤à¯à®¤à¯‡à®°à¯à®µà¯à®•à®³à¯"
+
+ #: modules/gui/qt4/dialogs/preferences.cpp:306
+ #, fuzzy
+ msgid "Cannot save Configuration"
+ msgstr "&VLM வடிவமைபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:307
msgid "Preferences file could not be saved"
@@@ -19645,16 -20155,19 +23364,32 @@@ msgid "Open playlist...
msgstr "திற தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯..."
#: modules/gui/qt4/dialogs_provider.cpp:579
++<<<<<<< HEAD
+msgid "XSPF playlist"
+msgstr ""
+
+#: modules/gui/qt4/dialogs_provider.cpp:580
+msgid "M3U playlist"
+msgstr ""
+
+#: modules/gui/qt4/dialogs_provider.cpp:581
+msgid "M3U8 playlist"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "XSPF playlist"
+ msgstr "XSPF தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ இறகà¯à®•à¯à®®à®¤à®¿"
+
+ #: modules/gui/qt4/dialogs_provider.cpp:580
+ #, fuzzy
+ msgid "M3U playlist"
+ msgstr "M3U தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ இறகà¯à®•à¯à®®à®¤à®¿"
+
+ #: modules/gui/qt4/dialogs_provider.cpp:581
+ #, fuzzy
+ msgid "M3U8 playlist"
+ msgstr "M3U8 தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ இறகà¯à®•à¯à®®à®¤à®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs_provider.cpp:599
msgid "Save playlist as..."
@@@ -19669,8 -20182,9 +23404,14 @@@ msgid "Media Files
msgstr "ஊடக கோபà¯à®ªà¯à®•à®³à¯"
#: modules/gui/qt4/dialogs_provider.hpp:44
++<<<<<<< HEAD
+msgid "Subtitle Files"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle Files"
+ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs_provider.hpp:45
msgid "All Files"
@@@ -19760,8 -20274,9 +23501,14 @@@ msgid "Select profile:
msgstr ""
#: modules/gui/qt4/dialogs/toolbar.cpp:159
++<<<<<<< HEAD
+msgid "New profile"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "New profile"
+ msgstr "சிற௠வாழà¯à®•à¯à®•à¯ˆà®•à¯ கà¯à®±à®¿à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/toolbar.cpp:162
msgid "Delete the current profile"
@@@ -19808,16 -20323,19 +23555,32 @@@ msgid "Advanced Buttons
msgstr ""
#: modules/gui/qt4/dialogs/toolbar.cpp:449
++<<<<<<< HEAD
+msgid "Playback Buttons"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/toolbar.cpp:453
+msgid "Aspect ratio selector"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/toolbar.cpp:457
+msgid "Speed selector"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Playback Buttons"
+ msgstr "பினà¯à®©à®©à®¿"
+
+ #: modules/gui/qt4/dialogs/toolbar.cpp:453
+ #, fuzzy
+ msgid "Aspect ratio selector"
+ msgstr "தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯: %s"
+
+ #: modules/gui/qt4/dialogs/toolbar.cpp:457
+ #, fuzzy
+ msgid "Speed selector"
+ msgstr "கோபà¯à®ªà®•à®¤à¯à®¤à¯ˆ தெரிவ௠செயà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/vlm.cpp:73
msgid "Broadcast"
@@@ -19909,12 -20427,14 +23672,23 @@@ msgid "&Video
msgstr "&நிகழà¯à®ªà®Ÿà®®à¯"
#: modules/gui/qt4/menus.cpp:333 modules/gui/qt4/menus.cpp:1052
++<<<<<<< HEAD
+msgid "Subti&tle"
+msgstr ""
+
+#: modules/gui/qt4/menus.cpp:335 modules/gui/qt4/menus.cpp:1068
+msgid "T&ools"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subti&tle"
+ msgstr "தà¯à®£à¯ˆ உரை"
+
+ #: modules/gui/qt4/menus.cpp:335 modules/gui/qt4/menus.cpp:1068
+ #, fuzzy
+ msgid "T&ools"
+ msgstr "&கரà¯à®µà®¿à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:338 modules/gui/qt4/menus.cpp:1103
msgid "V&iew"
@@@ -19925,12 -20445,14 +23699,23 @@@ msgid "&Help
msgstr "&உதவி"
#: modules/gui/qt4/menus.cpp:353
++<<<<<<< HEAD
+msgid "Open &File..."
+msgstr ""
+
+#: modules/gui/qt4/menus.cpp:355
+msgid "&Open Multiple Files..."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Open &File..."
+ msgstr "கோபà¯à®ªà¯à®•à®³à¯ˆ திற..."
+
+ #: modules/gui/qt4/menus.cpp:355
+ #, fuzzy
+ msgid "&Open Multiple Files..."
+ msgstr "&கோபà¯à®ªà¯à®•à®³à¯ˆ திற..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:359 modules/gui/qt4/menus.cpp:920
msgid "Open &Disc..."
@@@ -19949,16 -20471,18 +23734,28 @@@ msgid "Open &Location from clipboard
msgstr ""
#: modules/gui/qt4/menus.cpp:371
++<<<<<<< HEAD
+msgid "Open &Recent Media"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Open &Recent Media"
+ msgstr "&அணà¯à®®à¯ˆà®¯à®¿à®²à¯ நிகழà¯à®¨à¯à®¤ ஊடகமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:381
msgid "Conve&rt / Save..."
msgstr "செயலà¯à®²à®¾à®•à¯à®•à¯/சேமி..."
#: modules/gui/qt4/menus.cpp:383
++<<<<<<< HEAD
+msgid "&Stream..."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "&Stream..."
+ msgstr "ஓடை..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:388
msgid "Quit at the end of playlist"
@@@ -20013,8 -20537,9 +23810,14 @@@ msgid "Docked Playlist
msgstr ""
#: modules/gui/qt4/menus.cpp:496
++<<<<<<< HEAD
+msgid "Mi&nimal Interface"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Mi&nimal Interface"
+ msgstr "தோல௠மà¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:497
msgid "Ctrl+H"
@@@ -20029,24 -20554,28 +23832,46 @@@ msgid "&Advanced Controls
msgstr "&மேமà¯à®ªà®Ÿà¯à®Ÿ அமைபà¯à®ªà¯à®•à®³à¯"
#: modules/gui/qt4/menus.cpp:520
++<<<<<<< HEAD
+msgid "Status Bar"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Status Bar"
+ msgstr "நிலமை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:525
msgid "Visualizations selector"
msgstr ""
#: modules/gui/qt4/menus.cpp:583
++<<<<<<< HEAD
+msgid "&Increase Volume"
+msgstr ""
+
+#: modules/gui/qt4/menus.cpp:586
+msgid "&Decrease Volume"
+msgstr ""
+
+#: modules/gui/qt4/menus.cpp:589
+msgid "&Mute"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "&Increase Volume"
+ msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®¤à¯ˆ à®à®±à¯à®±à¯"
+
+ #: modules/gui/qt4/menus.cpp:586
+ #, fuzzy
+ msgid "&Decrease Volume"
+ msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®¤à¯ˆ இறகà¯à®•à¯"
+
+ #: modules/gui/qt4/menus.cpp:589
+ #, fuzzy
+ msgid "&Mute"
+ msgstr "சதà¯à®¤à®¤à¯à®¤à¯ˆ கà¯à®±à¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:606
msgid "Audio &Track"
@@@ -20065,12 -20594,14 +23890,23 @@@ msgid "&Visualizations
msgstr "&பாரà¯à®µà¯ˆà®•à¯à®•à®³à¯"
#: modules/gui/qt4/menus.cpp:637
++<<<<<<< HEAD
+msgid "Add &Subtitle File..."
+msgstr ""
+
+#: modules/gui/qt4/menus.cpp:639
+msgid "Sub &Track"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Add &Subtitle File..."
+ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯"
+
+ #: modules/gui/qt4/menus.cpp:639
+ #, fuzzy
+ msgid "Sub &Track"
+ msgstr "ஒலிதம௠&சà¯à®µà®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:662
msgid "Video &Track"
@@@ -20081,16 -20612,19 +23917,32 @@@ msgid "&Fullscreen
msgstr "&à®®à¯à®´à¯à®¤à¯à®¤à®¿à®°à¯ˆ"
#: modules/gui/qt4/menus.cpp:667
++<<<<<<< HEAD
+msgid "Always Fit &Window"
+msgstr ""
+
+#: modules/gui/qt4/menus.cpp:668
+msgid "Always &on Top"
+msgstr ""
+
+#: modules/gui/qt4/menus.cpp:669
+msgid "Set as Wall&paper"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Always Fit &Window"
+ msgstr "எபà¯à®ªà¯‹à®¤à¯à®®à¯ &மேலே"
+
+ #: modules/gui/qt4/menus.cpp:668
+ #, fuzzy
+ msgid "Always &on Top"
+ msgstr "எபà¯à®ªà¯‹à®¤à¯à®®à¯ &மேலே"
+
+ #: modules/gui/qt4/menus.cpp:669
+ #, fuzzy
+ msgid "Set as Wall&paper"
+ msgstr "DirectX சà¯à®µà®°à¯ தாளà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:673
msgid "&Zoom"
@@@ -20117,8 -20651,9 +23969,14 @@@ msgid "&Post processing
msgstr ""
#: modules/gui/qt4/menus.cpp:685
++<<<<<<< HEAD
+msgid "Take &Snapshot"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Take &Snapshot"
+ msgstr "நிகழà¯à®ªà®Ÿ திடிரனகைபà¯à®ªà®±à¯à®±à¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:708
msgid "T&itle"
@@@ -20133,8 -20668,9 +23991,14 @@@ msgid "&Program
msgstr "&நிகழà¯à®šà¯à®šà®¿"
#: modules/gui/qt4/menus.cpp:715
++<<<<<<< HEAD
+msgid "&Manage"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "&Manage"
+ msgstr "நிகழà¯à®ªà®Ÿ நிரà¯à®µà®¾à®•à®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:771
msgid "&Help..."
@@@ -20181,8 -20717,9 +24045,14 @@@ msgid "Jump Bac&kward
msgstr "பினà¯à®©à¯‹à®•à¯à®•à®¿à®¯ தாவà¯"
#: modules/gui/qt4/menus.cpp:907
++<<<<<<< HEAD
+msgid "Ctrl+T"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Ctrl+T"
+ msgstr "Ctrl+L"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:922
msgid "Open &Network..."
@@@ -20197,16 -20734,19 +24067,32 @@@ msgid "&Playback
msgstr "&பினà¯à®©à®©à®¿"
#: modules/gui/qt4/menus.cpp:1147
++<<<<<<< HEAD
+msgid "&Hide VLC media player in taskbar"
+msgstr ""
+
+#: modules/gui/qt4/menus.cpp:1153
+msgid "Sho&w VLC media player"
+msgstr ""
+
+#: modules/gui/qt4/menus.cpp:1164
+msgid "&Open Media"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "&Hide VLC media player in taskbar"
+ msgstr "VLC ஊடகஇயகà¯à®•à®¿ பà¯à®¤à¯à®ªà¯à®ªà®¿"
+
+ #: modules/gui/qt4/menus.cpp:1153
+ #, fuzzy
+ msgid "Sho&w VLC media player"
+ msgstr "VLC ஊடகஇயகà¯à®•à®¿ காடà¯à®Ÿà¯"
+
+ #: modules/gui/qt4/menus.cpp:1164
+ #, fuzzy
+ msgid "&Open Media"
+ msgstr "ஊடகதà¯à®¤à¯ˆ திற"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:1628
msgid "&Clear"
@@@ -20381,8 -20921,9 +24267,14 @@@ msgid "Expanding background cone or art
msgstr ""
#: modules/gui/qt4/qt4.cpp:161
++<<<<<<< HEAD
+msgid "Background art fits window's size"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Background art fits window's size"
+ msgstr "பினà¯à®ªà¯à®± தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:163
msgid "Ignore keyboard volume buttons."
@@@ -20397,24 -20938,27 +24289,42 @@@ msgid "
msgstr ""
#: modules/gui/qt4/qt4.cpp:184
++<<<<<<< HEAD
+msgid "Never"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Never"
+ msgstr "சரிசெயà¯à®¯ தேவைஇலà¯à®²à¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:184
msgid "When minimized"
msgstr ""
#: modules/gui/qt4/qt4.cpp:184
++<<<<<<< HEAD
+msgid "Always"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Always"
+ msgstr "எபà¯à®ªà¯‹à®¤à¯à®®à¯ சரிசெயà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/qt4.cpp:189
msgid "Qt interface"
msgstr "QT à®®à¯à®•à®ªà¯à®ªà¯"
#: modules/gui/qt4/util/customwidgets.cpp:80
++<<<<<<< HEAD
+msgid "errors"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "errors"
+ msgstr "வழà¯à®•à¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/util/customwidgets.cpp:81
msgid "warnings"
@@@ -20550,8 -21094,9 +24460,14 @@@ msgid "Source directory
msgstr "மூல கோபà¯à®ªà®•à®®à¯"
#: modules/lua/vlc.c:58
++<<<<<<< HEAD
+msgid "Directory index"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Directory index"
+ msgstr "நேரடியாக காடà¯à®Ÿà¯ உளà¯à®³à¯€à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:59
msgid "Allow to build directory index"
@@@ -20577,8 -21122,9 +24493,14 @@@ msgid "
msgstr ""
#: modules/lua/vlc.c:75
++<<<<<<< HEAD
+msgid "CLI input"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "CLI input"
+ msgstr "TCP உளà¯à®³à¯€à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:76
msgid ""
@@@ -20592,16 -21138,18 +24514,28 @@@ msgid "Lua
msgstr ""
#: modules/lua/vlc.c:85
++<<<<<<< HEAD
+msgid "Lua interpreter"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Lua interpreter"
+ msgstr "Lua à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:106
msgid "Lua CLI"
msgstr ""
#: modules/lua/vlc.c:110
++<<<<<<< HEAD
+msgid "Command-line interface"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Command-line interface"
+ msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ à®®à¯à®•à®ªà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/lua/vlc.c:119 modules/lua/vlc.c:130
msgid "Lua Telnet"
@@@ -20735,8 -21283,9 +24669,14 @@@ msgid "GNU TLS transport layer security
msgstr ""
#: modules/misc/gnutls.c:79
++<<<<<<< HEAD
+msgid "GNU TLS server"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "GNU TLS server"
+ msgstr "HTTP வழஙà¯à®•à®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/gnutls.c:269
#, c-format
@@@ -20769,8 -21318,9 +24709,14 @@@ msgid "Abort
msgstr ""
#: modules/misc/gnutls.c:295
++<<<<<<< HEAD
+msgid "View certificate"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "View certificate"
+ msgstr "சானà¯à®±à®¿à®¤à®´à¯ கோபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/gnutls.c:312
#, c-format
@@@ -20794,8 -21344,9 +24740,14 @@@ msgid "Playing some media.
msgstr ""
#: modules/misc/inhibit/dbus.c:232
++<<<<<<< HEAD
+msgid "Power"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Power"
+ msgstr "மெதà¯à®µà®¾à®•"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/inhibit/dbus.c:233
msgid "Inhibits power suspend and session idle timeout."
@@@ -21240,8 -21791,9 +25192,14 @@@ msgid "Growl Notification Plugin
msgstr ""
#: modules/notify/growl.m:282
++<<<<<<< HEAD
+msgid "New input playing"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "New input playing"
+ msgstr "இபà¯à®ªà¯‹ ஒடà¯à®µà®¤à¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/notify/growl.m:305
msgid "Now playing"
@@@ -21337,12 -21889,14 +25295,23 @@@ msgid "My Pictures
msgstr "எமத௠சிதà¯à®¤à®¿à®°à®®à¯"
#: modules/services_discovery/mtp.c:43
++<<<<<<< HEAD
+msgid "MTP devices"
+msgstr ""
+
+#: modules/services_discovery/mtp.c:189
+msgid "MTP Device"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "MTP devices"
+ msgstr "DVD சாதனமà¯"
+
+ #: modules/services_discovery/mtp.c:189
+ #, fuzzy
+ msgid "MTP Device"
+ msgstr "சாதனமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/os2drive.c:43
#: modules/services_discovery/os2drive.c:44
@@@ -21377,8 -21931,9 +25346,14 @@@ msgid "Audio capture
msgstr "ஒலித கைபà¯à®ªà®±à¯à®±à¯"
#: modules/services_discovery/pulse.c:43
++<<<<<<< HEAD
+msgid "Audio capture (PulseAudio)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio capture (PulseAudio)"
+ msgstr "ஒலித கைபà¯à®ªà®±à¯à®±à¯ (ALSA)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/pulse.c:186 modules/stream_out/es.c:85
msgid "Generic"
@@@ -21483,16 -22038,18 +25458,28 @@@ msgstr "
#: modules/services_discovery/xcb_apps.c:49
#: modules/services_discovery/xcb_apps.c:86
#: modules/services_discovery/xcb_apps.c:151
++<<<<<<< HEAD
+msgid "Screen capture"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Screen capture"
+ msgstr "திரை உளà¯à®³à¯€à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/xcb_apps.c:152
msgid "Your window manager does not provide a list of applications."
msgstr ""
#: modules/services_discovery/xcb_apps.c:275
++<<<<<<< HEAD
+msgid "Applications"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Applications"
+ msgstr "à®’à®°à¯à®™à¯à®•à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/services_discovery/xcb_apps.c:351
#: modules/video_output/msw/direct3d.c:202
@@@ -21501,21 -22058,24 +25488,39 @@@ msgstr "மேசைதà¯à®¤à®³à®®à¯
#: modules/stream_filter/dash/dash.cpp:51
#: modules/stream_filter/dash/dash.cpp:52
++<<<<<<< HEAD
+msgid "Preferred Width"
+msgstr ""
+
+#: modules/stream_filter/dash/dash.cpp:54
+#: modules/stream_filter/dash/dash.cpp:55
+msgid "Preferred Height"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Preferred Width"
+ msgstr "விரà¯à®ªà¯à®ª ஒலிதமொழி"
+
+ #: modules/stream_filter/dash/dash.cpp:54
+ #: modules/stream_filter/dash/dash.cpp:55
+ #, fuzzy
+ msgid "Preferred Height"
+ msgstr "எலà¯à®²à¯ˆ உயரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/dash/dash.cpp:57
msgid "Buffer Size (Seconds)"
msgstr ""
#: modules/stream_filter/dash/dash.cpp:58
++<<<<<<< HEAD
+msgid "Buffer size in seconds"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Buffer size in seconds"
+ msgstr "காலம௠in ms"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_filter/dash/dash.cpp:61
msgid "DASH"
@@@ -21546,8 -22106,9 +25551,14 @@@ msgid "Internal stream record
msgstr ""
#: modules/stream_filter/smooth/smooth.c:61
++<<<<<<< HEAD
+msgid "Smooth Streaming"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Smooth Streaming"
+ msgstr "ஓடை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/autodel.c:46
msgid "Autodel"
@@@ -21668,8 -22229,9 +25679,14 @@@ msgid "
msgstr ""
#: modules/stream_out/delay.c:55
++<<<<<<< HEAD
+msgid "Delay a stream"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Delay a stream"
+ msgstr "தேரà¯à®µà¯ ஓடை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/description.c:54
msgid "Description stream output"
@@@ -21684,8 -22246,9 +25701,14 @@@ msgid "Enable/disable video rendering.
msgstr ""
#: modules/stream_out/display.c:44
++<<<<<<< HEAD
+msgid "Delay (ms)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Delay (ms)"
+ msgstr "தாமத நேரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:45
msgid "Introduces a delay in the display of the stream."
@@@ -21805,8 -22368,9 +25828,14 @@@ msgid "Specify the page containing the
msgstr ""
#: modules/stream_out/langfromtelx.c:51
++<<<<<<< HEAD
+msgid "Row"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Row"
+ msgstr "கணà¯à®Ÿà¯†à®Ÿà¯à®•à¯à®•"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/langfromtelx.c:53
msgid "Specify the row containing the language"
@@@ -21972,8 -22536,9 +26001,14 @@@ msgid "
msgstr ""
#: modules/stream_out/rtp.c:96
++<<<<<<< HEAD
+msgid "Session category"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Session category"
+ msgstr "பகà¯à®¤à®¿ பெயரà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/rtp.c:98
msgid ""
@@@ -22115,8 -22680,9 +26150,14 @@@ msgid "Specify an ISO-639 code (three c
msgstr ""
#: modules/stream_out/setid.c:61
++<<<<<<< HEAD
+msgid "Set ID"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Set ID"
+ msgstr "படà¯à®Ÿà®¿à®¯à®²à¯ ID"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/setid.c:62
msgid "Set ES id"
@@@ -22387,8 -22953,9 +26428,14 @@@ msgid "
msgstr ""
#: modules/stream_out/transcode/transcode.c:107
++<<<<<<< HEAD
+msgid "Subtitle encoder"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subtitle encoder"
+ msgstr "தà¯à®£à¯ˆ உரை கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:109
msgid ""
@@@ -22397,8 -22964,9 +26444,14 @@@
msgstr ""
#: modules/stream_out/transcode/transcode.c:111
++<<<<<<< HEAD
+msgid "Destination subtitle codec"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Destination subtitle codec"
+ msgstr "சேரà¯à®®à®¿à®Ÿà®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:113
msgid "This is the subtitle codec that will be used."
@@@ -22462,45 -23030,46 +26515,82 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ #, fuzzy
+ msgid "Text opacity"
+ msgstr "சà¯à®°à¯à®•à¯à®•à®®à®¾à®©"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22509,93 -23078,99 +26599,179 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ #, fuzzy
+ msgid "Background opacity"
+ msgstr "பினà¯à®ªà¯à®± தோறà¯à®±à®®à¯"
+
+ #: modules/text_renderer/freetype.c:181
+ #, fuzzy
+ msgid "Background color"
+ msgstr "பினà¯à®ªà¯à®± தோறà¯à®±à®®à¯"
+
+ #: modules/text_renderer/freetype.c:183
+ #, fuzzy
+ msgid "Outline opacity"
+ msgstr "சà¯à®°à¯à®•à¯à®•à®®à®¾à®©"
+
+ #: modules/text_renderer/freetype.c:187
+ #, fuzzy
+ msgid "Shadow opacity"
+ msgstr "நிழலà¯"
+
+ #: modules/text_renderer/freetype.c:188
+ #, fuzzy
+ msgid "Shadow color"
+ msgstr "நிழலà¯"
+
+ #: modules/text_renderer/freetype.c:189
+ #, fuzzy
+ msgid "Shadow angle"
+ msgstr "நிழலà¯"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "சிறிய"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "சிறிய"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "அதிகமà¯"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "அதிகமாக"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -22623,8 -23198,9 +26799,14 @@@ msgid "
msgstr ""
#: modules/text_renderer/tdummy.c:36
++<<<<<<< HEAD
+msgid "Dummy font renderer"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Dummy font renderer"
+ msgstr "ஒனà¯à®±à¯à®•à¯à®•à¯à®®à¯à®¤à®µà®¾à®¤ à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:60
msgid "Filename for the font you want to use"
@@@ -22751,8 -23327,9 +26933,14 @@@ msgid "Alpha mask
msgstr ""
#: modules/video_filter/anaglyph.c:39
++<<<<<<< HEAD
+msgid "Color scheme"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Color scheme"
+ msgstr "எழà¯à®¤à¯à®¤à¯à®±à¯ விளைவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/anaglyph.c:40
msgid "Define the glasses' color scheme"
@@@ -22763,8 -23340,9 +26951,14 @@@ msgid "Convert 3D picture to anaglyph i
msgstr ""
#: modules/video_filter/antiflicker.c:50
++<<<<<<< HEAD
+msgid "Window size"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Window size"
+ msgstr "நிகழà¯à®ªà®Ÿ அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/antiflicker.c:51
msgid "Number of frames (0 to 100)"
@@@ -22779,8 -23357,9 +26973,14 @@@ msgid "Number of frames consider for sm
msgstr ""
#: modules/video_filter/antiflicker.c:66
++<<<<<<< HEAD
+msgid "antiflicker video filter"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "antiflicker video filter"
+ msgstr "சà¯à®´à®²à¯ ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/antiflicker.c:67
msgid "antiflicker"
@@@ -22803,8 -23382,9 +27003,14 @@@ msgid "
msgstr ""
#: modules/video_filter/atmo/atmo.cpp:134
++<<<<<<< HEAD
+msgid "Device type"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Device type"
+ msgstr "சாதனம௠வகை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:135
msgid ""
@@@ -23124,8 -23704,9 +27330,14 @@@ msgstr "
#: modules/video_filter/atmo/atmo.cpp:280
#: modules/gui/qt4/ui/video_effects.h:1385
++<<<<<<< HEAD
+msgid "Filter smoothness (%)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Filter smoothness (%)"
+ msgstr " ஊரவை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/atmo/atmo.cpp:281
msgid "Filter Smoothness"
@@@ -23300,10 -23881,11 +27512,16 @@@ msgid "MoMoLight options
msgstr ""
#: modules/video_filter/atmo/atmo.cpp:439
++<<<<<<< HEAD
+msgid "fnordlicht options"
+msgstr ""
-
- #: modules/video_filter/atmo/atmo.cpp:481
++=======
+ #, fuzzy
+ msgid "fnordlicht options"
+ msgstr "விரà¯à®ªà¯à®ªà®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+
+ #: modules/video_filter/atmo/atmo.cpp:481
msgid "Zone Layout for the build-in Atmo"
msgstr ""
@@@ -23339,8 -23921,9 +27557,14 @@@ msgid "X coordinate
msgstr "X à®’à®°à¯à®™à¯à®•à®¿à®£à¯ˆà®¤à¯à®¤à®²à¯"
#: modules/video_filter/audiobargraph_v.c:52
++<<<<<<< HEAD
+msgid "X coordinate of the bargraph."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "X coordinate of the bargraph."
+ msgstr "தெளà¯à®³à®¤à¯à®¤à¯†à®³à®¿à®¨à¯à®¤"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/audiobargraph_v.c:53 modules/video_filter/erase.c:60
#: modules/video_filter/logo.c:61
@@@ -23348,12 -23931,14 +27572,23 @@@ msgid "Y coordinate
msgstr "Y à®’à®°à¯à®™à¯à®•à®¿à®£à¯ˆà®¤à¯à®¤à®²à¯"
#: modules/video_filter/audiobargraph_v.c:54
++<<<<<<< HEAD
+msgid "Y coordinate of the bargraph."
+msgstr ""
+
+#: modules/video_filter/audiobargraph_v.c:55
+msgid "Transparency of the bargraph"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Y coordinate of the bargraph."
+ msgstr "தெளà¯à®³à®¤à¯à®¤à¯†à®³à®¿à®¨à¯à®¤"
+
+ #: modules/video_filter/audiobargraph_v.c:55
+ #, fuzzy
+ msgid "Transparency of the bargraph"
+ msgstr "தெளà¯à®³à®¤à¯à®¤à¯†à®³à®¿à®¨à¯à®¤"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/audiobargraph_v.c:56
msgid ""
@@@ -23362,8 -23947,9 +27597,14 @@@
msgstr ""
#: modules/video_filter/audiobargraph_v.c:58
++<<<<<<< HEAD
+msgid "Bargraph position"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Bargraph position"
+ msgstr "சினà¯à®©à®®à¯ நிலை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/audiobargraph_v.c:60
msgid ""
@@@ -23373,8 -23959,9 +27614,14 @@@
msgstr ""
#: modules/video_filter/audiobargraph_v.c:63
++<<<<<<< HEAD
+msgid "Alarm"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Alarm"
+ msgstr "அலà¯à®šà®¾"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/audiobargraph_v.c:64
msgid "Signals a silence and displays and alert (0=no alarm, 1=alarm)."
@@@ -23391,28 -23978,34 +27638,59 @@@ msgstr "
#: modules/video_filter/audiobargraph_v.c:88
#: modules/video_filter/audiobargraph_v.c:106
++<<<<<<< HEAD
+msgid "Audio Bar Graph Video sub source"
+msgstr ""
+
+#: modules/video_filter/audiobargraph_v.c:89
+msgid "Audio Bar Graph Video"
+msgstr ""
+
+#: modules/video_filter/ball.c:98
+msgid "Ball color"
+msgstr ""
+
+#: modules/video_filter/ball.c:100
+msgid "Edge visible"
+msgstr ""
+
+#: modules/video_filter/ball.c:101
+msgid "Set edge visibility."
+msgstr ""
+
+#: modules/video_filter/ball.c:103
+msgid "Ball speed"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio Bar Graph Video sub source"
+ msgstr "ஒலிதமà¯/நிகழà¯à®ªà®Ÿà®®à¯"
+
+ #: modules/video_filter/audiobargraph_v.c:89
+ #, fuzzy
+ msgid "Audio Bar Graph Video"
+ msgstr "ஒலிதமà¯/நிகழà¯à®ªà®Ÿà®®à¯"
+
+ #: modules/video_filter/ball.c:98
+ #, fuzzy
+ msgid "Ball color"
+ msgstr "எழà¯à®¤à¯à®¤à¯à®°à¯ நிறமà¯"
+
+ #: modules/video_filter/ball.c:100
+ #, fuzzy
+ msgid "Edge visible"
+ msgstr "இயஙà¯à®•à®šà¯ செயà¯à®¯à®¾à®¤à¯‡"
+
+ #: modules/video_filter/ball.c:101
+ #, fuzzy
+ msgid "Set edge visibility."
+ msgstr "இயஙà¯à®•à®šà¯ செயà¯à®¯à®¾à®¤à¯‡"
+
+ #: modules/video_filter/ball.c:103
+ #, fuzzy
+ msgid "Ball speed"
+ msgstr "பினà¯à®©à®©à®¿â€Ž வேகமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/ball.c:104
msgid ""
@@@ -23421,8 -24014,9 +27699,14 @@@
msgstr ""
#: modules/video_filter/ball.c:107
++<<<<<<< HEAD
+msgid "Ball size"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Ball size"
+ msgstr "அறை அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/ball.c:108
msgid ""
@@@ -23443,12 -24037,14 +27727,23 @@@ msgid "Augmented reality ball game
msgstr ""
#: modules/video_filter/ball.c:123
++<<<<<<< HEAD
+msgid "Ball video filter"
+msgstr ""
+
+#: modules/video_filter/ball.c:124
+msgid "Ball"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Ball video filter"
+ msgstr "நகலி நிகழà¯à®ªà®Ÿ சலà¯à®²à®Ÿà¯ˆ"
+
+ #: modules/video_filter/ball.c:124
+ #, fuzzy
+ msgid "Ball"
+ msgstr "எலà¯à®²à®¾à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/blendbench.c:52
msgid "Number of time to blend"
@@@ -23669,8 -24265,9 +27964,14 @@@ msgid "Color threshold filter
msgstr ""
#: modules/video_filter/colorthres.c:79
++<<<<<<< HEAD
+msgid "Saturation threshold"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Saturation threshold"
+ msgstr " ஊரவை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/colorthres.c:81
msgid "Similarity threshold"
@@@ -23758,24 -24355,28 +28059,46 @@@ msgid "Latest
msgstr ""
#: modules/video_filter/deinterlace/algo_phosphor.h:46
++<<<<<<< HEAD
+msgid "AltLine"
+msgstr ""
+
+#: modules/video_filter/deinterlace/algo_phosphor.h:48
+msgid "Upconvert"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "AltLine"
+ msgstr "à®à®•à®ªà®°à®¿à®®à®¾à®£"
+
+ #: modules/video_filter/deinterlace/algo_phosphor.h:48
+ #, fuzzy
+ msgid "Upconvert"
+ msgstr "செயலà¯à®²à®¾à®•à¯à®•à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/algo_phosphor.h:56
msgid "Low"
msgstr ""
#: modules/video_filter/deinterlace/algo_phosphor.h:57
++<<<<<<< HEAD
+msgid "Medium"
+msgstr ""
+
+#: modules/video_filter/deinterlace/algo_phosphor.h:58
+msgid "High"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Medium"
+ msgstr "&ஊடகமà¯"
+
+ #: modules/video_filter/deinterlace/algo_phosphor.h:58
+ #, fuzzy
+ msgid "High"
+ msgstr "உயரமானதà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:55
msgid "Streaming deinterlace mode"
@@@ -23911,16 -24512,18 +28234,28 @@@ msgid "Radius in pixels
msgstr ""
#: modules/video_filter/gradfun.c:54
++<<<<<<< HEAD
+msgid "Strength"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Strength"
+ msgstr "ஓடை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/gradfun.c:55
msgid "Strength used to modify the value of a pixel"
msgstr ""
#: modules/video_filter/gradfun.c:58
++<<<<<<< HEAD
+msgid "Gradfun video filter"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Gradfun video filter"
+ msgstr "அழி நிகழà¯à®ªà®Ÿ சலà¯à®²à®Ÿà¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/gradfun.c:59
msgid "Gradfun"
@@@ -23969,8 -24572,9 +28304,14 @@@ msgid "Variance of the gaussian noise
msgstr ""
#: modules/video_filter/grain.c:58
++<<<<<<< HEAD
+msgid "Minimal period"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Minimal period"
+ msgstr "சினà¯&னபாரà¯à®µà¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/grain.c:59
msgid "Minimal period of the noise grain in pixel"
@@@ -24132,8 -24736,9 +28473,14 @@@ msgid "
msgstr ""
#: modules/video_filter/marq.c:104
++<<<<<<< HEAD
+msgid "Text file"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Text file"
+ msgstr "உரà¯à®µ கோபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:105
msgid "File to read the marquee text from."
@@@ -24747,8 -25352,9 +29094,14 @@@ msgid "Posterize level (number of color
msgstr ""
#: modules/video_filter/posterize.c:67
++<<<<<<< HEAD
+msgid "Posterize video filter"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Posterize video filter"
+ msgstr "சà¯à®´à®²à¯ ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/posterize.c:69
msgid "Posterize video by lowering the number of colors"
@@@ -24799,24 -25405,28 +29152,46 @@@ msgid "Number of puzzle columns
msgstr ""
#: modules/video_filter/puzzle.c:55
++<<<<<<< HEAD
+msgid "Game mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Game mode"
+ msgstr "கைபà¯à®ªà®±à¯à®±à¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:56
msgid "Select game mode variation from jigsaw puzzle to sliding puzzle."
msgstr ""
#: modules/video_filter/puzzle.c:57
++<<<<<<< HEAD
+msgid "Border"
+msgstr ""
+
+#: modules/video_filter/puzzle.c:58
+msgid "Unshuffled Border width."
+msgstr ""
+
+#: modules/video_filter/puzzle.c:59
+msgid "Small preview"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Border"
+ msgstr "எலà¯à®²à¯ˆ அகலமà¯"
+
+ #: modules/video_filter/puzzle.c:58
+ #, fuzzy
+ msgid "Unshuffled Border width."
+ msgstr "எலà¯à®²à¯ˆ அகலமà¯"
+
+ #: modules/video_filter/puzzle.c:59
+ #, fuzzy
+ msgid "Small preview"
+ msgstr "பினà¯à®©à®©à®¿â€Ž வேகமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:60
msgid "Show small preview."
@@@ -24839,24 -25449,27 +29214,42 @@@ msgid "Size of the curve along the piec
msgstr ""
#: modules/video_filter/puzzle.c:65
++<<<<<<< HEAD
+msgid "Auto shuffle"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Auto shuffle"
+ msgstr "தானாக"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:66
msgid "Auto shuffle delay during game"
msgstr ""
#: modules/video_filter/puzzle.c:67
++<<<<<<< HEAD
+msgid "Auto solve"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Auto solve"
+ msgstr "தானாக தொடகà¯à®•à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:68
msgid "Auto solve delay during game"
msgstr ""
#: modules/video_filter/puzzle.c:69
++<<<<<<< HEAD
+msgid "Rotation"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Rotation"
+ msgstr "மதிபà¯à®ªà®¿à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/puzzle.c:70
msgid "Rotation parameter: none;180;90-270;mirror"
@@@ -24915,8 -25528,9 +29308,14 @@@ msgid "VNC Port
msgstr "VNC .வாசலà¯"
#: modules/video_filter/remoteosd.c:76
++<<<<<<< HEAD
+msgid "VNC port number."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "VNC port number."
+ msgstr "VNC வலை வாசலà¯."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/remoteosd.c:78
msgid "VNC Password"
@@@ -25177,8 -25791,9 +29576,14 @@@ msgid "Intensity of sepia effect
msgstr ""
#: modules/video_filter/sepia.c:64
++<<<<<<< HEAD
+msgid "Sepia video filter"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Sepia video filter"
+ msgstr "நகலி நிகழà¯à®ªà®Ÿ சலà¯à®²à®Ÿà¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/sepia.c:66
msgid "Gives video a warmer tone by applying sepia effect"
@@@ -25201,12 -25816,14 +29606,23 @@@ msgid "Sharpen video filter
msgstr ""
#: modules/video_filter/subsdelay.c:45
++<<<<<<< HEAD
+msgid "Change subtitle delay"
+msgstr ""
+
+#: modules/video_filter/subsdelay.c:47
+msgid "Delay calculation mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Change subtitle delay"
+ msgstr "தà¯à®£à¯ˆ உரை தாமதமாக"
+
+ #: modules/video_filter/subsdelay.c:47
+ #, fuzzy
+ msgid "Delay calculation mode"
+ msgstr "தாமத நேரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/subsdelay.c:49
msgid ""
@@@ -25216,8 -25833,9 +29632,14 @@@
msgstr ""
#: modules/video_filter/subsdelay.c:53
++<<<<<<< HEAD
+msgid "Calculation factor"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Calculation factor"
+ msgstr "தà¯à®£à¯ˆ உரை விவரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/subsdelay.c:54
msgid ""
@@@ -25276,8 -25894,9 +29698,14 @@@ msgid "
msgstr ""
#: modules/video_filter/subsdelay.c:80
++<<<<<<< HEAD
+msgid "Absolute delay"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Absolute delay"
+ msgstr "தà¯à®£à¯ˆ உரை தாமதமாக"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/subsdelay.c:80
msgid "Relative to source delay"
@@@ -25288,12 -25907,14 +29716,23 @@@ msgid "Relative to source content
msgstr ""
#: modules/video_filter/subsdelay.c:274
++<<<<<<< HEAD
+msgid "Subsdelay"
+msgstr ""
+
+#: modules/video_filter/subsdelay.c:291
+msgid "Overlap fix"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Subsdelay"
+ msgstr "தà¯à®£à¯ˆ உரை தாமதமாக"
+
+ #: modules/video_filter/subsdelay.c:291
+ #, fuzzy
+ msgid "Overlap fix"
+ msgstr "சரிசெயà¯à®¯ தேவைஇலà¯à®²à¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/swscale.c:56
msgid "Scaling mode"
@@@ -25356,8 -25977,9 +29795,14 @@@ msgid "Transform type
msgstr ""
#: modules/video_filter/transform.c:53
++<<<<<<< HEAD
+msgid "Transpose"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Transpose"
+ msgstr "தெளà¯à®³à®¤à¯à®¤à¯†à®³à®¿à®¨à¯à®¤"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/transform.c:53
msgid "Anti-transpose"
@@@ -25428,24 -26050,27 +29873,42 @@@ msgid "Force use of a specific chroma f
msgstr ""
#: modules/video_output/androidsurface.c:62
++<<<<<<< HEAD
+msgid "Android Surface video output"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Android Surface video output"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ கோபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/caca.c:56
msgid "Color ASCII art video output"
msgstr ""
#: modules/video_output/decklink.cpp:69
++<<<<<<< HEAD
+msgid "Output card"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Output card"
+ msgstr "வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ வடிவூடà¯à®Ÿà®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:71
msgid "DeckLink output card, if multiple exist. The cards are numbered from 0."
msgstr ""
#: modules/video_output/decklink.cpp:74
++<<<<<<< HEAD
+msgid "Desired output mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Desired output mode"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:76
msgid ""
@@@ -25454,8 -26079,9 +29917,14 @@@
msgstr ""
#: modules/video_output/decklink.cpp:82
++<<<<<<< HEAD
+msgid "Audio connection for DeckLink output."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Audio connection for DeckLink output."
+ msgstr "ஒலித கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:87
msgid ""
@@@ -25469,16 -26095,18 +29938,28 @@@ msgid "
msgstr ""
#: modules/video_output/decklink.cpp:97
++<<<<<<< HEAD
+msgid "Video connection for DeckLink output."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Video connection for DeckLink output."
+ msgstr "நிகழà¯à®ªà®Ÿ கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:101
msgid "Use 10 bits per pixel for video frames."
msgstr ""
#: modules/video_output/decklink.cpp:174
++<<<<<<< HEAD
+msgid "DecklinkOutput"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "DecklinkOutput"
+ msgstr "வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ சà¯à®Ÿà¯à®Ÿà®¿ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:175
msgid "output module to write to Blackmagic SDI card"
@@@ -25489,16 -26117,19 +29970,32 @@@ msgid "Decklink General Options
msgstr ""
#: modules/video_output/decklink.cpp:181
++<<<<<<< HEAD
+msgid "Decklink Video Output module"
+msgstr ""
+
+#: modules/video_output/decklink.cpp:186
+msgid "Decklink Video Options"
+msgstr ""
+
+#: modules/video_output/decklink.cpp:197
+msgid "Decklink Audio Output module"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Decklink Video Output module"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯"
+
+ #: modules/video_output/decklink.cpp:186
+ #, fuzzy
+ msgid "Decklink Video Options"
+ msgstr "இதர அமைபà¯à®ªà¯à®•à®³à¯..."
+
+ #: modules/video_output/decklink.cpp:197
+ #, fuzzy
+ msgid "Decklink Audio Output module"
+ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/decklink.cpp:202
msgid "Decklink Audio Options"
@@@ -25527,8 -26158,9 +30024,14 @@@ msgid "Embedded window video
msgstr ""
#: modules/video_output/egl.c:46
++<<<<<<< HEAD
+msgid "EGL"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "EGL"
+ msgstr "GLX"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/egl.c:47
msgid "EGL extension for OpenGL"
@@@ -25588,16 -26220,18 +30091,28 @@@ msgid "GNU/Linux framebuffer video outp
msgstr ""
#: modules/video_output/gl.c:40
++<<<<<<< HEAD
+msgid "OpenGL extension"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "OpenGL extension"
+ msgstr "AAC நீடிபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/gl.c:41
msgid "OpenGL ES 2 extension"
msgstr ""
#: modules/video_output/gl.c:42
++<<<<<<< HEAD
+msgid "OpenGL ES extension"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "OpenGL ES extension"
+ msgstr "AAC நீடிபà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/gl.c:44
msgid "Extension through which to use the Open Graphics Library (OpenGL)."
@@@ -25608,40 -26242,48 +30123,82 @@@ msgid "OpenGL ES2
msgstr ""
#: modules/video_output/gl.c:51
++<<<<<<< HEAD
+msgid "OpenGL for Embedded Systems 2 video output"
+msgstr ""
+
+#: modules/video_output/gl.c:61
+msgid "OpenGL ES"
+msgstr ""
+
+#: modules/video_output/gl.c:62
+msgid "OpenGL for Embedded Systems video output"
+msgstr ""
+
+#: modules/video_output/gl.c:71
+msgid "OpenGL"
+msgstr ""
+
+#: modules/video_output/gl.c:72
+msgid "OpenGL video output (experimental)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "OpenGL for Embedded Systems 2 video output"
+ msgstr "OpenGL நிகழà¯à®ªà®Ÿ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
+
+ #: modules/video_output/gl.c:61
+ #, fuzzy
+ msgid "OpenGL ES"
+ msgstr "திற"
+
+ #: modules/video_output/gl.c:62
+ #, fuzzy
+ msgid "OpenGL for Embedded Systems video output"
+ msgstr "OpenGL நிகழà¯à®ªà®Ÿ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
+
+ #: modules/video_output/gl.c:71
+ #, fuzzy
+ msgid "OpenGL"
+ msgstr "திற"
+
+ #: modules/video_output/gl.c:72
+ #, fuzzy
+ msgid "OpenGL video output (experimental)"
+ msgstr "OpenGL நிகழà¯à®ªà®Ÿ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/glx.c:42 modules/video_output/xcb/glx.c:51
msgid "GLX"
msgstr "GLX"
#: modules/video_output/glx.c:43
++<<<<<<< HEAD
+msgid "GLX extension for OpenGL"
+msgstr ""
+
+#: modules/video_output/ios.m:66
+msgid "iOS OpenGL ES video output (requires UIView)"
+msgstr ""
+
+#: modules/video_output/ios2.m:72
+msgid "iOS OpenGL video output"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "GLX extension for OpenGL"
+ msgstr "AAC நீடிபà¯à®ªà¯"
+
+ #: modules/video_output/ios.m:66
+ #, fuzzy
+ msgid "iOS OpenGL ES video output (requires UIView)"
+ msgstr "OpenGL நிகழà¯à®ªà®Ÿ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
+
+ #: modules/video_output/ios2.m:72
+ #, fuzzy
+ msgid "iOS OpenGL video output"
+ msgstr "OpenGL நிகழà¯à®ªà®Ÿ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:50 modules/gui/qt4/ui/sprefs_video.h:352
msgid "Enable a workaround for T23"
@@@ -25654,8 -26296,9 +30211,14 @@@ msgid "
msgstr ""
#: modules/video_output/kva.c:55 modules/gui/qt4/ui/sprefs_video.h:351
++<<<<<<< HEAD
+msgid "Video mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Video mode"
+ msgstr "நிகழà¯à®ªà®Ÿ கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:57
msgid "Select a proper video mode to be used by KVA."
@@@ -25678,8 -26321,9 +30241,14 @@@ msgid "DIVE
msgstr ""
#: modules/video_output/kva.c:72
++<<<<<<< HEAD
+msgid "K Video Acceleration video output"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "K Video Acceleration video output"
+ msgstr "மேசைதà¯à®¤à®³à®®à¯3D நிகழà¯à®ªà®Ÿà®®à¯ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/macosx.m:86
msgid "Mac OS X OpenGL video output (requires drawable-nsobject)"
@@@ -25701,8 -26345,9 +30270,14 @@@ msgid "Video output for Windows 7/Windo
msgstr ""
#: modules/video_output/msw/direct2d.c:59
++<<<<<<< HEAD
+msgid "Direct2D video output"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Direct2D video output"
+ msgstr "மேசைதà¯à®¤à®³à®®à¯3D நிகழà¯à®ªà®Ÿà®®à¯ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/msw/direct3d.c:57
msgid "The desktop mode allows you to display the video on the desktop."
@@@ -25814,12 -26459,14 +30389,23 @@@ msgid "
msgstr ""
#: modules/video_output/vdummy.c:48
++<<<<<<< HEAD
+msgid "Dummy video output"
+msgstr ""
+
+#: modules/video_output/vdummy.c:58
+msgid "Statistics video output"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Dummy video output"
+ msgstr "ஒனà¯à®±à¯à®•à¯à®•à¯à®®à¯à®¤à®µà®¾à®¤ நிகழà¯à®ªà®Ÿà®®à¯ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
+
+ #: modules/video_output/vdummy.c:58
+ #, fuzzy
+ msgid "Statistics video output"
+ msgstr "மேசைதà¯à®¤à®³à®®à¯3D நிகழà¯à®ªà®Ÿà®®à¯ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/vmem.c:43
msgid "Video memory buffer width."
@@@ -25855,8 -26502,9 +30441,14 @@@ msgid "Video memory
msgstr "நிகழà¯à®ªà®Ÿà®®à¯ நினைவகமà¯"
#: modules/video_output/xcb/glx.c:52
++<<<<<<< HEAD
+msgid "OpenGL GLX video output (XCB)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "OpenGL GLX video output (XCB)"
+ msgstr "GLX நிகழà¯à®ªà®Ÿ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯(XCB)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/xcb/window.c:43
msgid "X11 display"
@@@ -25869,8 -26517,9 +30461,14 @@@ msgid "
msgstr ""
#: modules/video_output/xcb/window.c:48
++<<<<<<< HEAD
+msgid "X11 window ID"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "X11 window ID"
+ msgstr "Xசாரளமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/xcb/window.c:62
msgid "X window"
@@@ -25920,8 -26569,9 +30518,14 @@@ msgid "
msgstr ""
#: modules/video_output/xcb/xvideo.c:49
++<<<<<<< HEAD
+msgid "XVideo format id"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "XVideo format id"
+ msgstr "நிகழà¯à®ªà®Ÿà®®à¯ வலை வாசலà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/xcb/xvideo.c:51
msgid ""
@@@ -26053,16 -26703,18 +30657,28 @@@ msgid "The height of the video window,
msgstr ""
#: modules/visualization/projectm.cpp:68
++<<<<<<< HEAD
+msgid "Mesh width"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Mesh width"
+ msgstr "நிகழà¯à®ªà®Ÿ அகலமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/visualization/projectm.cpp:69
msgid "The width of the mesh, in pixels."
msgstr ""
#: modules/visualization/projectm.cpp:71
-#, fuzzy
++<<<<<<< HEAD
+msgid "Mesh height"
+msgstr ""
++=======
++#, fuzzy
+ msgid "Mesh height"
+ msgstr "நிகழà¯à®ªà®Ÿ உயரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/visualization/projectm.cpp:72
msgid "The height of the mesh, in pixels."
@@@ -26208,104 -26860,125 +30824,217 @@@ msgstr "
#: share/lua/http/dialogs/browse_window.html:41
#: share/lua/http/mobile_browse.html:48
++<<<<<<< HEAD
+msgid "Play List"
+msgstr ""
+
+#: share/lua/http/dialogs/create_stream.html:156
+#: modules/gui/qt4/ui/sprefs_audio.h:416 modules/gui/qt4/ui/sprefs_video.h:346
+msgid "Output"
+msgstr ""
+
+#: share/lua/http/dialogs/create_stream.html:193
+msgid "Subtitle codec"
+msgstr ""
+
+#: share/lua/http/dialogs/create_stream.html:200
+msgid "Output\tmethod"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Play List"
+ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯"
- #: share/lua/http/dialogs/create_stream.html:249
- msgid "Multiplexer"
- msgstr ""
-
- #: share/lua/http/dialogs/create_stream.html:266
+ #: share/lua/http/dialogs/create_stream.html:156
+ #: modules/gui/qt4/ui/sprefs_audio.h:416 modules/gui/qt4/ui/sprefs_video.h:346
+ #, fuzzy
+ msgid "Output"
+ msgstr "வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ சà¯à®Ÿà¯à®Ÿà®¿ "
+
+ #: share/lua/http/dialogs/create_stream.html:193
+ #, fuzzy
+ msgid "Subtitle codec"
+ msgstr "தà¯à®£à¯ˆ உரை கோடகà¯à®•à®³à¯"
+
+ #: share/lua/http/dialogs/create_stream.html:200
+ #, fuzzy
+ msgid "Output\tmethod"
+ msgstr "IO வழிமà¯à®±à¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+
+ #: share/lua/http/dialogs/create_stream.html:249
+ msgid "Multiplexer"
+ msgstr ""
+
+ #: share/lua/http/dialogs/create_stream.html:266
++<<<<<<< HEAD
+msgid "Video FPS"
+msgstr ""
+
+#: share/lua/http/dialogs/create_stream.html:297
+msgid "MUX options"
+msgstr ""
+
+#: share/lua/http/dialogs/create_stream.html:303
+msgid "Video scale"
+msgstr ""
+
+#: share/lua/http/dialogs/create_stream.html:330
+#: share/lua/http/dialogs/create_stream.html:374
+msgid "Output port"
+msgstr ""
+
+#: share/lua/http/dialogs/create_stream.html:338
+msgid "Output\tfile"
+msgstr ""
+
+#: share/lua/http/dialogs/create_stream.html:355
+msgid "Input media"
+msgstr ""
+
+#: share/lua/http/dialogs/create_stream.html:367
+msgid "Error:"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Video FPS"
+ msgstr "நிகழà¯à®ªà®Ÿ PID"
+
+ #: share/lua/http/dialogs/create_stream.html:297
+ #, fuzzy
+ msgid "MUX options"
+ msgstr "DMX விரà¯à®ªà¯à®ªà®®à¯"
+
+ #: share/lua/http/dialogs/create_stream.html:303
+ #, fuzzy
+ msgid "Video scale"
+ msgstr "நிகழà¯à®ªà®Ÿ கைபà¯à®ªà®±à¯à®±à¯à®¤à®²à¯"
+
+ #: share/lua/http/dialogs/create_stream.html:330
+ #: share/lua/http/dialogs/create_stream.html:374
+ #, fuzzy
+ msgid "Output port"
+ msgstr "வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ வடிவூடà¯à®Ÿà®®à¯"
+
+ #: share/lua/http/dialogs/create_stream.html:338
+ #, fuzzy
+ msgid "Output\tfile"
+ msgstr "வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ கோபà¯à®ªà¯"
+
+ #: share/lua/http/dialogs/create_stream.html:355
+ #, fuzzy
+ msgid "Input media"
+ msgstr "உளà¯à®³à¯€à®Ÿà¯ ஓடை"
+
+ #: share/lua/http/dialogs/create_stream.html:367
+ #, fuzzy
+ msgid "Error:"
+ msgstr "வழà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:367
msgid "Sample ui-state-error style."
msgstr ""
#: share/lua/http/dialogs/create_stream.html:390
++<<<<<<< HEAD
+msgid "File name"
+msgstr ""
+
+#: share/lua/http/dialogs/equalizer_window.html:49
+#: share/lua/http/mobile_equalizer.html:62
+msgid "Preamp:"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "File name"
+ msgstr "கோபà¯à®ªà¯ பெயரà¯"
+
+ #: share/lua/http/dialogs/equalizer_window.html:49
+ #: share/lua/http/mobile_equalizer.html:62
+ #, fuzzy
+ msgid "Preamp:"
+ msgstr "&ஓடை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/mosaic_window.html:104
msgid "Row border"
msgstr ""
#: share/lua/http/dialogs/mosaic_window.html:122
++<<<<<<< HEAD
+msgid "Column border"
+msgstr ""
+
+#: share/lua/http/dialogs/mosaic_window.html:133
+msgid "Background"
+msgstr ""
+
+#: share/lua/http/dialogs/mosaic_window.html:135
+msgid "Mosaic Tiles"
+msgstr ""
+
+#: share/lua/http/dialogs/offset_window.html:68
+msgid "Playback Rate"
+msgstr ""
+
+#: share/lua/http/dialogs/offset_window.html:72
+msgid "Audio Delay"
+msgstr ""
+
+#: share/lua/http/dialogs/offset_window.html:76
+msgid "Subtitle Delay"
+msgstr ""
+
+#: share/lua/http/dialogs/stream_window.html:65
+msgid "Time:"
+msgstr ""
+
+#: share/lua/http/index.html:26 share/lua/http/mobile_browse.html:25
+#: share/lua/http/mobile_equalizer.html:25 share/lua/http/mobile_view.html:25
+msgid "VLC media player - Web Interface"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Column border"
+ msgstr "ஆணைகளà¯"
+
+ #: share/lua/http/dialogs/mosaic_window.html:133
+ #, fuzzy
+ msgid "Background"
+ msgstr "பினà¯à®ªà¯à®± தோறà¯à®±à®®à¯"
+
+ #: share/lua/http/dialogs/mosaic_window.html:135
+ #, fuzzy
+ msgid "Mosaic Tiles"
+ msgstr "ஊடக கோபà¯à®ªà¯à®•à®³à¯"
+
+ #: share/lua/http/dialogs/offset_window.html:68
+ #, fuzzy
+ msgid "Playback Rate"
+ msgstr "பினà¯à®©à®©à®¿"
+
+ #: share/lua/http/dialogs/offset_window.html:72
+ #, fuzzy
+ msgid "Audio Delay"
+ msgstr "ஒலிதம௠தாமதமாக à®®à¯à®©à¯à®©à¯‡à®±à¯"
+
+ #: share/lua/http/dialogs/offset_window.html:76
+ #, fuzzy
+ msgid "Subtitle Delay"
+ msgstr "தà¯à®£à¯ˆ உரை தாமதமாக"
+
+ #: share/lua/http/dialogs/stream_window.html:65
+ #, fuzzy
+ msgid "Time:"
+ msgstr "நேரமà¯"
+
+ #: share/lua/http/index.html:26 share/lua/http/mobile_browse.html:25
+ #: share/lua/http/mobile_equalizer.html:25 share/lua/http/mobile_view.html:25
+ #, fuzzy
+ msgid "VLC media player - Web Interface"
+ msgstr "VLC ஊடகஇயகà¯à®•à®¿ உதவி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:215
msgid "Hide / Show Library"
@@@ -26316,36 -26989,44 +31045,77 @@@ msgid "Hide / Show Viewer
msgstr ""
#: share/lua/http/index.html:217
++<<<<<<< HEAD
+msgid "Manage Streams"
+msgstr ""
+
+#: share/lua/http/index.html:218
+msgid "Track Synchronisation"
+msgstr ""
+
+#: share/lua/http/index.html:220
+msgid "VLM Batch Commands"
+msgstr ""
+
+#: share/lua/http/index.html:240 modules/gui/qt4/ui/vlm.h:298
+msgid "Loop"
+msgstr ""
+
+#: share/lua/http/index.html:242
+msgid "Empty Playlist"
+msgstr ""
+
+#: share/lua/http/index.html:243
+msgid "Queue Selected"
+msgstr ""
+
+#: share/lua/http/index.html:244
+msgid "Play Selected"
+msgstr ""
+
+#: share/lua/http/index.html:245
+msgid "Refresh List"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Manage Streams"
+ msgstr "&ஓடை"
+
+ #: share/lua/http/index.html:218
+ #, fuzzy
+ msgid "Track Synchronisation"
+ msgstr "ஒலிதம௠சà¯à®µà®Ÿà¯à®•à®³à¯: %s "
+
+ #: share/lua/http/index.html:220
+ #, fuzzy
+ msgid "VLM Batch Commands"
+ msgstr "ஆணைகளà¯"
+
+ #: share/lua/http/index.html:240 modules/gui/qt4/ui/vlm.h:298
+ #, fuzzy
+ msgid "Loop"
+ msgstr "[மீணà¯à®Ÿà¯à®®à¯ மீணà¯à®Ÿà¯à®®à¯]"
+
+ #: share/lua/http/index.html:242
+ #, fuzzy
+ msgid "Empty Playlist"
+ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯"
+
+ #: share/lua/http/index.html:243
+ #, fuzzy
+ msgid "Queue Selected"
+ msgstr "அகறà¯à®±à¯ எலà¯à®²à®¾à®®à¯"
+
+ #: share/lua/http/index.html:244
+ #, fuzzy
+ msgid "Play Selected"
+ msgstr "பினà¯à®©à®©à®¿â€Ž வேகமà¯"
+
+ #: share/lua/http/index.html:245
+ #, fuzzy
+ msgid "Refresh List"
+ msgstr "பà¯à®¤à¯à®¤à¯à®£à®°à¯à®µà¯ படà¯à®Ÿà®¿à®¯à®²à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:252
msgid "Loading flowplayer..."
@@@ -26398,12 -27079,14 +31168,23 @@@ msgstr "
#: modules/gui/qt4/ui/about.h:287 modules/gui/qt4/ui/open.h:242
#: modules/gui/qt4/ui/podcast_configuration.h:100
++<<<<<<< HEAD
+msgid "Dialog"
+msgstr ""
+
+#: modules/gui/qt4/ui/about.h:288 modules/gui/qt4/ui/about.h:289
+msgid "Update"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Dialog"
+ msgstr "செயலிளகà¯à®• செயà¯"
+
+ #: modules/gui/qt4/ui/about.h:288 modules/gui/qt4/ui/about.h:289
+ #, fuzzy
+ msgid "Update"
+ msgstr "&பà¯à®¤à¯à®ªà¯à®ªà®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/equalizer.h:132 modules/gui/qt4/ui/open_disk.h:296
#: modules/gui/qt4/ui/open_net.h:96 modules/gui/qt4/ui/sprefs_audio.h:411
@@@ -26415,8 -27098,9 +31196,14 @@@ msgid "Form
msgstr "படிவமà¯"
#: modules/gui/qt4/ui/equalizer.h:135
++<<<<<<< HEAD
+msgid "Preset"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Preset"
+ msgstr "சதவிகிதமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/equalizer.h:137
msgid "0.00 dB"
@@@ -26427,8 -27111,9 +31214,14 @@@ msgid "&Verbosity:
msgstr ""
#: modules/gui/qt4/ui/messages_panel.h:140
++<<<<<<< HEAD
+msgid "&Filter:"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "&Filter:"
+ msgstr "சலà¯à®²à®Ÿà¯ˆ:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/messages_panel.h:141
msgid "&Save as..."
@@@ -26439,12 -27124,14 +31232,23 @@@ msgid "Modules Tree
msgstr ""
#: modules/gui/qt4/ui/open.h:245
++<<<<<<< HEAD
+msgid "Show extended options"
+msgstr ""
+
+#: modules/gui/qt4/ui/open.h:247
+msgid "Show &more options"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Show extended options"
+ msgstr "நீடà¯à®Ÿà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ அமைபà¯à®ªà¯à®•à®³à¯ˆ காடà¯à®Ÿà¯"
+
+ #: modules/gui/qt4/ui/open.h:247
+ #, fuzzy
+ msgid "Show &more options"
+ msgstr "மேமà¯à®ªà®Ÿà¯à®Ÿ கோபà¯à®ªà¯à®•à®³à¯ˆ காடà¯à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/open.h:250
msgid "Change the caching for the media"
@@@ -26455,16 -27142,19 +31259,32 @@@ msgid " ms
msgstr ""
#: modules/gui/qt4/ui/open.h:253
++<<<<<<< HEAD
+msgid "MRL"
+msgstr ""
+
+#: modules/gui/qt4/ui/open.h:254
+msgid "Start Time"
+msgstr ""
+
+#: modules/gui/qt4/ui/open.h:255
+msgid "Edit Options"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "MRL"
+ msgstr "சà¯à®Ÿà¯à®Ÿà®¿"
+
+ #: modules/gui/qt4/ui/open.h:254
+ #, fuzzy
+ msgid "Start Time"
+ msgstr "தொடகà¯à®•à®®à¯ நேரமà¯"
+
+ #: modules/gui/qt4/ui/open.h:255
+ #, fuzzy
+ msgid "Edit Options"
+ msgstr "விரà¯à®ªà¯à®ªà®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/open.h:256
msgid "Extra media"
@@@ -26475,8 -27165,9 +31295,14 @@@ msgid "Complete MRL for VLC internal
msgstr ""
#: modules/gui/qt4/ui/open.h:261
++<<<<<<< HEAD
+msgid "Select the file"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Select the file"
+ msgstr "கோபà¯à®ªà¯ˆ தெரிவ௠செயà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/open.h:265
msgid "Change the start time for the media"
@@@ -26491,16 -27182,18 +31317,28 @@@ msgid "Play another media synchronousl
msgstr ""
#: modules/gui/qt4/ui/open_capture.h:97
++<<<<<<< HEAD
+msgid "Capture mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Capture mode"
+ msgstr "கைபà¯à®ªà®±à¯à®±à¯ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/open_capture.h:99
msgid "Select the capture device type"
msgstr ""
#: modules/gui/qt4/ui/open_capture.h:101
++<<<<<<< HEAD
+msgid "Device Selection"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Device Selection"
+ msgstr "File Selection"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/open_capture.h:102
msgid "Options"
@@@ -26511,48 -27204,57 +31349,96 @@@ msgid "Access advanced options to twea
msgstr ""
#: modules/gui/qt4/ui/open_capture.h:106
++<<<<<<< HEAD
+msgid "Advanced options..."
+msgstr ""
+
+#: modules/gui/qt4/ui/open_disk.h:297
+msgid "Disc Selection"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Advanced options..."
+ msgstr "மேமà¯à®ªà®Ÿà¯à®Ÿ அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #: modules/gui/qt4/ui/open_disk.h:297
+ #, fuzzy
+ msgid "Disc Selection"
+ msgstr "File Selection"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/open_disk.h:301
msgid "SVCD/VCD"
msgstr ""
#: modules/gui/qt4/ui/open_disk.h:303
++<<<<<<< HEAD
+msgid "Disable Disc Menus"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Disable Disc Menus"
+ msgstr "DVD வகைபà¯à®ªà®Ÿà¯à®Ÿà®¿à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/open_disk.h:305
msgid "No disc menus"
msgstr ""
#: modules/gui/qt4/ui/open_disk.h:306
++<<<<<<< HEAD
+msgid "Disc device"
+msgstr ""
+
+#: modules/gui/qt4/ui/open_disk.h:308
+msgid "Starting Position"
+msgstr ""
+
+#: modules/gui/qt4/ui/open_disk.h:311
+msgid "Audio and Subtitles"
+msgstr ""
+
+#: modules/gui/qt4/ui/open_file.h:143
+msgid "Use a sub&title file"
+msgstr ""
+
+#: modules/gui/qt4/ui/open_file.h:145
+msgid "Select the subtitle file"
+msgstr ""
+
+#: modules/gui/qt4/ui/open_file.h:149
+msgid "Choose one or more media file to open"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Disc device"
+ msgstr "DVD சாதனமà¯"
+
+ #: modules/gui/qt4/ui/open_disk.h:308
+ #, fuzzy
+ msgid "Starting Position"
+ msgstr "நிலை"
+
+ #: modules/gui/qt4/ui/open_disk.h:311
+ #, fuzzy
+ msgid "Audio and Subtitles"
+ msgstr "ஒலித கோபà¯à®ªà¯à®•à®³à¯"
+
+ #: modules/gui/qt4/ui/open_file.h:143
+ #, fuzzy
+ msgid "Use a sub&title file"
+ msgstr "தà¯à®£à¯ˆ&உரை கோபà¯à®ªà¯à®•à®³à¯ˆ உபயோகி"
+
+ #: modules/gui/qt4/ui/open_file.h:145
+ #, fuzzy
+ msgid "Select the subtitle file"
+ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯à®•à®³à¯ˆ தெரிவà¯"
+
+ #: modules/gui/qt4/ui/open_file.h:149
+ #, fuzzy
+ msgid "Choose one or more media file to open"
+ msgstr "பலவறà¯à®±à¯ˆ கோபà¯à®ªà¯à®•à®³à¯ˆ தெரிவ௠செய௠"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/open_file.h:151
msgid "File Selection"
@@@ -26575,24 -27277,29 +31461,50 @@@ msgid "Please enter a network URL:
msgstr ""
#: modules/gui/qt4/ui/profiles.h:686
++<<<<<<< HEAD
+msgid "Profile edition"
+msgstr ""
+
+#: modules/gui/qt4/ui/profiles.h:687
+msgid "MPEG-TS"
+msgstr ""
+
+#: modules/gui/qt4/ui/profiles.h:688
+msgid "MPEG-PS"
+msgstr ""
+
+#: modules/gui/qt4/ui/profiles.h:689
+msgid "MPEG 1"
+msgstr ""
+
+#: modules/gui/qt4/ui/profiles.h:690
+msgid "ASF/WMV"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Profile edition"
+ msgstr "சிற௠வாழà¯à®•à¯à®•à¯ˆà®•à¯ கà¯à®±à®¿à®ªà¯à®ªà¯"
+
+ #: modules/gui/qt4/ui/profiles.h:687
+ #, fuzzy
+ msgid "MPEG-TS"
+ msgstr "MPEG நிகழà¯à®ªà®Ÿà®®à¯"
+
+ #: modules/gui/qt4/ui/profiles.h:688
+ #, fuzzy
+ msgid "MPEG-PS"
+ msgstr "MPEG நிகழà¯à®ªà®Ÿà®®à¯"
+
+ #: modules/gui/qt4/ui/profiles.h:689
+ #, fuzzy
+ msgid "MPEG 1"
+ msgstr "MPEG நிகழà¯à®ªà®Ÿà®®à¯"
+
+ #: modules/gui/qt4/ui/profiles.h:690
+ #, fuzzy
+ msgid "ASF/WMV"
+ msgstr "AVI demuxer"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:691
msgid "Webm"
@@@ -26619,8 -27326,9 +31531,14 @@@ msgid "RAW
msgstr ""
#: modules/gui/qt4/ui/profiles.h:697
++<<<<<<< HEAD
+msgid "MP4/MOV"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "MP4/MOV"
+ msgstr "MP4"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:698
msgid "FLV"
@@@ -26631,32 -27339,37 +31549,60 @@@ msgid "AVI
msgstr ""
#: modules/gui/qt4/ui/profiles.h:700
++<<<<<<< HEAD
+msgid "Features"
+msgstr ""
+
+#: modules/gui/qt4/ui/profiles.h:702
+msgid "Streamable"
+msgstr ""
+
+#: modules/gui/qt4/ui/profiles.h:703
+msgid "Chapters"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Features"
+ msgstr "CPU à®…à®®à¯à®šà®™à¯à®•à®³à¯"
+
+ #: modules/gui/qt4/ui/profiles.h:702
+ #, fuzzy
+ msgid "Streamable"
+ msgstr "ஓடை பெயரà¯"
+
+ #: modules/gui/qt4/ui/profiles.h:703
+ #, fuzzy
+ msgid "Chapters"
+ msgstr "அதà¯à®¤à®¿à®¯à®¾à®¯à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:706
msgid "Menus"
msgstr ""
#: modules/gui/qt4/ui/profiles.h:714
++<<<<<<< HEAD
+msgid "Same as source"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Same as source"
+ msgstr "மூலமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:716
msgid " fps"
msgstr ""
#: modules/gui/qt4/ui/profiles.h:717
++<<<<<<< HEAD
+msgid "Custom options"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Custom options"
+ msgstr "அமைபà¯à®ªà¯à®•à®³à¯ விரà¯à®ªà¯à®ªà®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:718
msgid "Quality"
@@@ -26667,36 -27380,41 +31613,65 @@@ msgid "Not Used
msgstr ""
#: modules/gui/qt4/ui/profiles.h:721 modules/gui/qt4/ui/profiles.h:740
++<<<<<<< HEAD
+msgid " kb/s"
+msgstr ""
++=======
+ #, fuzzy
+ msgid " kb/s"
+ msgstr "%u kb/s"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:722 modules/gui/qt4/ui/profiles.h:742
msgid "Encoding parameters"
msgstr ""
#: modules/gui/qt4/ui/profiles.h:725
++<<<<<<< HEAD
+msgid "Frame size"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Frame size"
+ msgstr "வடிவம௠அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/profiles.h:728 modules/gui/qt4/ui/profiles.h:731
msgid "px"
msgstr ""
#: modules/gui/qt4/ui/profiles.h:741
++<<<<<<< HEAD
+msgid "Sample Rate"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Sample Rate"
+ msgstr "மாதிரி அளவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sout.h:203
msgid "Set up media sources to stream"
msgstr ""
#: modules/gui/qt4/ui/sout.h:205
++<<<<<<< HEAD
+msgid "Destination Setup"
+msgstr ""
+
+#: modules/gui/qt4/ui/sout.h:206
+msgid "Select destinations to stream to"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Destination Setup"
+ msgstr "சேரà¯à®®à®¿à®Ÿà®®à¯"
+
+ #: modules/gui/qt4/ui/sout.h:206
+ #, fuzzy
+ msgid "Select destinations to stream to"
+ msgstr "தேரà¯à®µà¯ ஓடை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sout.h:207
msgid ""
@@@ -26709,24 -27427,28 +31684,46 @@@ msgid "New destination
msgstr "பà¯à®¤à®¿à®¯ சேரà¯à®®à®¿à®Ÿà®®à¯"
#: modules/gui/qt4/ui/sout.h:210
++<<<<<<< HEAD
+msgid "Display locally"
+msgstr ""
+
+#: modules/gui/qt4/ui/sout.h:212
+msgid "Transcoding Options"
+msgstr ""
+
+#: modules/gui/qt4/ui/sout.h:213
+msgid "Select and choose transcoding options"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Display locally"
+ msgstr "காடà¯à®šà®¿"
+
+ #: modules/gui/qt4/ui/sout.h:212
+ #, fuzzy
+ msgid "Transcoding Options"
+ msgstr "மேமà¯à®ªà®Ÿà¯à®Ÿ அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #: modules/gui/qt4/ui/sout.h:213
+ #, fuzzy
+ msgid "Select and choose transcoding options"
+ msgstr "தெரிவ௠\" மேமà¯à®ªà®Ÿà¯à®Ÿ விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯\" விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯ எலà¯à®²à®¾à®¤à¯à®¤à¯ˆà®¯à¯à®®à¯ பாரà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sout.h:214
msgid "Activate Transcoding"
msgstr ""
#: modules/gui/qt4/ui/sout.h:215
++<<<<<<< HEAD
+msgid "Option Setup"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Option Setup"
+ msgstr "விரà¯à®ªà¯à®ªà®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sout.h:216
msgid "Set up any additional options for streaming"
@@@ -26741,32 -27463,37 +31738,60 @@@ msgid "Stream all elementary streams
msgstr ""
#: modules/gui/qt4/ui/sout.h:219
++<<<<<<< HEAD
+msgid "Generated stream output string"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Generated stream output string"
+ msgstr "பொத௠ஓடை வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ அமைபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:414
msgid " %"
msgstr ""
#: modules/gui/qt4/ui/sprefs_audio.h:419
++<<<<<<< HEAD
+msgid "Output module:"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_audio.h:421
+msgid "Visualization:"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_audio.h:422
+msgid "Enable Time-Stretching audio"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Output module:"
+ msgstr "வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯"
+
+ #: modules/gui/qt4/ui/sprefs_audio.h:421
+ #, fuzzy
+ msgid "Visualization:"
+ msgstr "பாரà¯à®µà¯ˆà®•à¯à®•à¯à®°à®¿à®¯"
+
+ #: modules/gui/qt4/ui/sprefs_audio.h:422
+ #, fuzzy
+ msgid "Enable Time-Stretching audio"
+ msgstr "ஒலிததà¯à®¤à¯ˆ இயஙà¯à®•à®šà¯ செயà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:423
msgid "Dolby Surround:"
msgstr ""
#: modules/gui/qt4/ui/sprefs_audio.h:424
++<<<<<<< HEAD
+msgid "Replay gain mode:"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Replay gain mode:"
+ msgstr "தாமத நேரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:425
msgid "Headphone surround effect"
@@@ -26777,17 -27504,20 +31802,33 @@@ msgid "Normalize volume to:
msgstr ""
#: modules/gui/qt4/ui/sprefs_audio.h:428
-#, fuzzy
++<<<<<<< HEAD
msgid "Preferred audio language:"
-msgstr "விரà¯à®ªà¯à®ª ஒலிதமொழி"
+msgstr ""
#: modules/gui/qt4/ui/sprefs_audio.h:429
-#, fuzzy
msgid "Password:"
-msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯"
+msgstr ""
#: modules/gui/qt4/ui/sprefs_audio.h:430
-#, fuzzy
msgid "Username:"
-msgstr "பயனரà¯à®ªà¯†à®¯à®°à¯"
-
+msgstr ""
++=======
++#, fuzzy
++msgid "Preferred audio language:"
++msgstr "விரà¯à®ªà¯à®ª ஒலிதமொழி"
++
++#: modules/gui/qt4/ui/sprefs_audio.h:429
++#, fuzzy
++msgid "Password:"
++msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯"
++
++#: modules/gui/qt4/ui/sprefs_audio.h:430
++#, fuzzy
++msgid "Username:"
++msgstr "பயனரà¯à®ªà¯†à®¯à®°à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+
#: modules/gui/qt4/ui/sprefs_audio.h:431
msgid "Submit played tracks stats to Last.fm"
msgstr ""
@@@ -26821,8 -27551,9 +31862,14 @@@ msgid "Optical drive
msgstr ""
#: modules/gui/qt4/ui/sprefs_input.h:348
++<<<<<<< HEAD
+msgid "Default optical device"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Default optical device"
+ msgstr "கோட நிலை சாதனமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_input.h:349
msgid "Files"
@@@ -26845,40 -27576,46 +31892,74 @@@ msgid "RTP over RTSP (TCP)
msgstr ""
#: modules/gui/qt4/ui/sprefs_input.h:358
++<<<<<<< HEAD
+msgid "Live555 stream transport"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_input.h:359
+msgid "Default caching policy"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_interface.h:514
+msgid "Menus language:"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Live555 stream transport"
+ msgstr "HTTP ஓடை வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
+
+ #: modules/gui/qt4/ui/sprefs_input.h:359
+ #, fuzzy
+ msgid "Default caching policy"
+ msgstr "கோட நிலை எழà¯à®¤à¯à®¤à¯à®°à¯ நிறமà¯"
+
+ #: modules/gui/qt4/ui/sprefs_interface.h:514
+ #, fuzzy
+ msgid "Menus language:"
+ msgstr "ஒலிதம௠மொழி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:515
msgid "Look and feel"
msgstr ""
#: modules/gui/qt4/ui/sprefs_interface.h:516
++<<<<<<< HEAD
+msgid "Use custom skin"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Use custom skin"
+ msgstr "தோல௠தெரிவà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:518
msgid "This is VLC's default interface, with a native look and feel."
msgstr ""
#: modules/gui/qt4/ui/sprefs_interface.h:520
++<<<<<<< HEAD
+msgid "Use native style"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Use native style"
+ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯à®•à®³à¯ˆ உபயோகி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:521
msgid "Resize interface to video size"
msgstr ""
#: modules/gui/qt4/ui/sprefs_interface.h:522
++<<<<<<< HEAD
+msgid "Show controls in full screen mode"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Show controls in full screen mode"
+ msgstr "விலகà¯à®•à¯ à®®à¯à®´à¯à®¤à¯à®¤à®¿à®°à¯ˆ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:523
msgid "Pause playback when minimized"
@@@ -26897,24 -27634,28 +31978,46 @@@ msgid "Force window style:
msgstr ""
#: modules/gui/qt4/ui/sprefs_interface.h:527
++<<<<<<< HEAD
+msgid "Integrate video in interface"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_interface.h:528
+msgid "Show systray icon"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Integrate video in interface"
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯ˆ மறை"
+
+ #: modules/gui/qt4/ui/sprefs_interface.h:528
+ #, fuzzy
+ msgid "Show systray icon"
+ msgstr "ஓடை நிலை காடà¯à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:529
msgid "Skin resource file:"
msgstr ""
#: modules/gui/qt4/ui/sprefs_interface.h:531
++<<<<<<< HEAD
+msgid "Playlist and Instances"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_interface.h:532
+msgid "Album art download policy:"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Playlist and Instances"
+ msgstr "ஓட௠& à®®à¯à®Ÿà®¿"
+
+ #: modules/gui/qt4/ui/sprefs_interface.h:532
+ #, fuzzy
+ msgid "Album art download policy:"
+ msgstr "கையால௠பதிவிறகà¯à®•à®®à¯ மடà¯à®Ÿà¯à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:535
msgid "Pause on the last frame of a video"
@@@ -26925,8 -27666,9 +32028,14 @@@ msgid "Allow only one instance
msgstr ""
#: modules/gui/qt4/ui/sprefs_interface.h:537
++<<<<<<< HEAD
+msgid "Configure Media Library"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Configure Media Library"
+ msgstr "ஊடகநூலகமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:541
msgid "Every "
@@@ -26949,44 -27691,53 +32058,91 @@@ msgid "Operating System Integration
msgstr ""
#: modules/gui/qt4/ui/sprefs_interface.h:549
++<<<<<<< HEAD
+msgid "File extensions association"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_interface.h:550
+msgid "Set up associations..."
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_subtitles.h:287
+msgid "Enable On Screen Display (OSD)"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_subtitles.h:288
+msgid "Show media title on video start"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_subtitles.h:290
+msgid "Enable subtitles"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_subtitles.h:291
+msgid "Subtitle Language"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_subtitles.h:293
+msgid "Default encoding"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_subtitles.h:294
+msgid "Subtitle effects"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "File extensions association"
+ msgstr "File Selection"
+
+ #: modules/gui/qt4/ui/sprefs_interface.h:550
+ #, fuzzy
+ msgid "Set up associations..."
+ msgstr "அமைபà¯à®ªà¯à®•à®³à¯..."
+
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:287
+ #, fuzzy
+ msgid "Enable On Screen Display (OSD)"
+ msgstr "தà¯à®£à¯ˆ உரை & On Screen Display அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:288
+ #, fuzzy
+ msgid "Show media title on video start"
+ msgstr "நிகழà¯à®ªà®Ÿà®¤à¯à®¤à¯à®Ÿà®©à¯ ஊடகதà¯à®¤à®²à¯ˆà®ªà¯à®ªà¯ˆ காடà¯à®Ÿà¯"
+
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:290
+ #, fuzzy
+ msgid "Enable subtitles"
+ msgstr "தà¯à®£à¯ˆà®‰à®°à¯ˆà®•à®³à¯ˆ திற..."
+
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:291
+ #, fuzzy
+ msgid "Subtitle Language"
+ msgstr "தà¯à®£à¯ˆ உரை மொழிகளà¯"
+
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:293
+ #, fuzzy
+ msgid "Default encoding"
+ msgstr "கோட நிலை எழà¯à®¤à¯à®¤à¯à®°à¯ நிறமà¯"
+
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:294
+ #, fuzzy
+ msgid "Subtitle effects"
+ msgstr "தà¯à®£à¯ˆ உரை கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:300
msgid "Add a shadow"
msgstr ""
#: modules/gui/qt4/ui/sprefs_subtitles.h:301
++<<<<<<< HEAD
+msgid "Add a background"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Add a background"
+ msgstr "பினà¯à®ªà¯à®± தோறà¯à®±à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:303
#: modules/gui/qt4/ui/video_effects.h:1317
@@@ -27001,28 -27752,33 +32157,55 @@@ msgid " px
msgstr ""
#: modules/gui/qt4/ui/sprefs_video.h:345
++<<<<<<< HEAD
+msgid "Accelerated video output (Overlay)"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_video.h:348
+msgid "DirectX"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_video.h:349
+msgid "Display device"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Accelerated video output (Overlay)"
+ msgstr "மேசைதà¯à®¤à®³à®®à¯3D நிகழà¯à®ªà®Ÿà®®à¯ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
+
+ #: modules/gui/qt4/ui/sprefs_video.h:348
+ #, fuzzy
+ msgid "DirectX"
+ msgstr "திசை"
+
+ #: modules/gui/qt4/ui/sprefs_video.h:349
+ #, fuzzy
+ msgid "Display device"
+ msgstr "DVD சாதனமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:350
msgid "KVA"
msgstr ""
#: modules/gui/qt4/ui/sprefs_video.h:354
++<<<<<<< HEAD
+msgid "Deinterlacing"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_video.h:355
+msgid "Force Aspect Ratio"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Deinterlacing"
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯"
+
+ #: modules/gui/qt4/ui/sprefs_video.h:355
+ #, fuzzy
+ msgid "Force Aspect Ratio"
+ msgstr "மூட௠தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:361
msgid "vlc-snap"
@@@ -27049,12 -27805,14 +32232,23 @@@ msgid "Run manually
msgstr ""
#: modules/gui/qt4/ui/streampanel.h:176
++<<<<<<< HEAD
+msgid "Setup schedule"
+msgstr ""
+
+#: modules/gui/qt4/ui/streampanel.h:177
+msgid "Run on schedule"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Setup schedule"
+ msgstr "அடà¯à®Ÿà®µà®©à¯ˆ"
+
+ #: modules/gui/qt4/ui/streampanel.h:177
+ #, fuzzy
+ msgid "Run on schedule"
+ msgstr "அடà¯à®Ÿà®µà®©à¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/streampanel.h:178
msgid "Status"
@@@ -27081,8 -27839,9 +32275,14 @@@ msgid "Clear List
msgstr "தà¯à®Ÿà¯ˆ படà¯à®Ÿà®¿à®¯à®²à¯"
#: modules/gui/qt4/ui/update.h:148
++<<<<<<< HEAD
+msgid "Check for VLC updates"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Check for VLC updates"
+ msgstr "பà¯à®¤à¯à®ªà¯à®ªà®¿à®•à¯à®• &சோதனை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/update.h:149
msgid "Launching an update request..."
@@@ -27102,29 -27861,34 +32302,57 @@@ msgid ">HHHHHH;#
msgstr ""
#: modules/gui/qt4/ui/video_effects.h:1330
++<<<<<<< HEAD
+msgid "Negate colors"
+msgstr ""
+
+#: modules/gui/qt4/ui/video_effects.h:1343
+msgid "Colors"
+msgstr ""
+
+#: modules/gui/qt4/ui/video_effects.h:1344
+msgid "Interactive Zoom"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Negate colors"
+ msgstr "உறையை உரà¯à®µà®¾à®•à¯à®•à¯..."
+
+ #: modules/gui/qt4/ui/video_effects.h:1343
+ #, fuzzy
+ msgid "Colors"
+ msgstr "நிறமà¯"
+
+ #: modules/gui/qt4/ui/video_effects.h:1344
+ #, fuzzy
+ msgid "Interactive Zoom"
+ msgstr "à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/video_effects.h:1350
msgid "Angle"
msgstr ""
#: modules/gui/qt4/ui/video_effects.h:1354
++<<<<<<< HEAD
+msgid "Black Slot"
+msgstr ""
+
+#: modules/gui/qt4/ui/video_effects.h:1358
+#: modules/gui/qt4/ui/video_effects.h:1375
+msgid "..."
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Black Slot"
+ msgstr "கறà¯à®ªà¯à®ªà¯ "
+
+ #: modules/gui/qt4/ui/video_effects.h:1358
+ #: modules/gui/qt4/ui/video_effects.h:1375
+ #, fuzzy
+ msgid "..."
+ msgstr "சேரà¯..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/video_effects.h:1363
msgid "full"
@@@ -27143,20 -27907,23 +32371,37 @@@ msgid "Mask
msgstr ""
#: modules/gui/qt4/ui/video_effects.h:1379
++<<<<<<< HEAD
+msgid "Output Color Filtermode"
+msgstr ""
+
+#: modules/gui/qt4/ui/video_effects.h:1380
+msgid "Brightness (%)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Output Color Filtermode"
+ msgstr "நிகழà¯à®ªà®Ÿ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ சலà¯à®²à®Ÿà¯ˆ மாடà¯à®²à¯à®•à®³à¯"
+
+ #: modules/gui/qt4/ui/video_effects.h:1380
+ #, fuzzy
+ msgid "Brightness (%)"
+ msgstr "பிரகாசமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/video_effects.h:1382
msgid "Mark analyzed Pixels"
msgstr ""
#: modules/gui/qt4/ui/video_effects.h:1384
++<<<<<<< HEAD
+msgid "Filter threshold (%)"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Filter threshold (%)"
+ msgstr " ஊரவை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/video_effects.h:1389
msgid "Motion detect"
@@@ -27175,527 -27942,308 +32420,817 @@@ msgid "Spatial blur
msgstr ""
#: modules/gui/qt4/ui/video_effects.h:1398
++<<<<<<< HEAD
+msgid "Mirror"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "Mirror"
+ msgstr "வழà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/video_effects.h:1400
msgid "Anaglyph 3D"
msgstr ""
#: modules/gui/qt4/ui/vlm.h:286
++<<<<<<< HEAD
+msgid "VLM configurator"
+msgstr ""
+
+#: modules/gui/qt4/ui/vlm.h:287
+msgid "Media Manager Edition"
+msgstr ""
+
+#: modules/gui/qt4/ui/vlm.h:288
+msgid "Name:"
+msgstr ""
+
+#: modules/gui/qt4/ui/vlm.h:290
+msgid "Input:"
+msgstr ""
+
+#: modules/gui/qt4/ui/vlm.h:291
+msgid "Select Input"
+msgstr ""
+
+#: modules/gui/qt4/ui/vlm.h:292
+msgid "Output:"
+msgstr ""
+
+#: modules/gui/qt4/ui/vlm.h:293
+msgid "Select Output"
+msgstr ""
+
+#: modules/gui/qt4/ui/vlm.h:294
+msgid "Time Control"
+msgstr ""
+
+#: modules/gui/qt4/ui/vlm.h:295
+msgid "Mux Control"
+msgstr ""
+
+#: modules/gui/qt4/ui/vlm.h:296
+msgid "Muxer:"
+msgstr ""
++=======
+ #, fuzzy
+ msgid "VLM configurator"
+ msgstr "&VLM வடிவமைபà¯à®ªà¯"
- #: modules/gui/qt4/ui/vlm.h:297
- msgid "AAAA; "
- msgstr ""
-
- #: modules/gui/qt4/ui/vlm.h:302
- msgid "Media Manager List"
- msgstr ""
+ #: modules/gui/qt4/ui/vlm.h:287
+ #, fuzzy
+ msgid "Media Manager Edition"
+ msgstr "ஊடக தகவலà¯à®•à®³à¯"
- #~ msgid "No help available"
- #~ msgstr "உதவி ஒனà¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
+ #: modules/gui/qt4/ui/vlm.h:288
+ #, fuzzy
+ msgid "Name:"
+ msgstr "பெயரà¯"
- #~ msgid "Modules search path"
- #~ msgstr "மாடà¯à®²à¯à®•à®³à¯ தேடல௠வழி"
+ #: modules/gui/qt4/ui/vlm.h:290
+ #, fuzzy
+ msgid "Input:"
+ msgstr "உளà¯à®³à¯€à®Ÿà¯"
+ #: modules/gui/qt4/ui/vlm.h:291
#, fuzzy
- #~ msgid "Coffee pot control"
- #~ msgstr "நீடà¯à®Ÿà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ அமைபà¯à®ªà¯à®•à®³à¯"
+ msgid "Select Input"
+ msgstr "திரை உளà¯à®³à¯€à®Ÿà¯"
- #~ msgid "RTMP"
- #~ msgstr "RTMP"
+ #: modules/gui/qt4/ui/vlm.h:292
+ #, fuzzy
+ msgid "Output:"
+ msgstr "வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ சà¯à®Ÿà¯à®Ÿà®¿ "
- #~ msgid "Audio volume (0-65535)."
- #~ msgstr "ஒலித ஒலிசà¯à®šà®¤à¯à®¤à®®à¯ (0-65535)."
+ #: modules/gui/qt4/ui/vlm.h:293
+ #, fuzzy
+ msgid "Select Output"
+ msgstr "ஓடை வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
- #~ msgid "SECAM"
- #~ msgstr "SECAM"
+ #: modules/gui/qt4/ui/vlm.h:294
+ #, fuzzy
+ msgid "Time Control"
+ msgstr "ஒலிசà¯à®šà®¤à¯à®¤â€Ž கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯"
+
+ #: modules/gui/qt4/ui/vlm.h:295
+ #, fuzzy
+ msgid "Mux Control"
+ msgstr "கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ "
+
+ #: modules/gui/qt4/ui/vlm.h:296
+ #, fuzzy
+ msgid "Muxer:"
+ msgstr "சதà¯à®¤à®¤à¯à®¤à¯ˆ கà¯à®±à¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+
+ #: modules/gui/qt4/ui/vlm.h:297
+ msgid "AAAA; "
+ msgstr ""
+
+ #: modules/gui/qt4/ui/vlm.h:302
-#, fuzzy
++<<<<<<< HEAD
+ msgid "Media Manager List"
-msgstr "ஊடக தகவலà¯à®•à®³à¯"
++msgstr ""
+
-#~ msgid "Show Details"
-#~ msgstr "தகவலà¯à®•à®³à¯ˆ காடà¯à®Ÿà¯"
++#~ msgid "No help available"
++#~ msgstr "உதவி ஒனà¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
++
++#~ msgid "Modules search path"
++#~ msgstr "மாடà¯à®²à¯à®•à®³à¯ தேடல௠வழி"
+
+ #, fuzzy
-#~ msgid "Add a subtitle file"
-#~ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯à®•à®³à¯ˆ சேரà¯"
++#~ msgid "Coffee pot control"
++#~ msgstr "நீடà¯à®Ÿà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ அமைபà¯à®ªà¯à®•à®³à¯"
+
-#~ msgid "Subtitles/OSD"
-#~ msgstr "தà¯à®£à¯ˆ உரை/OSD"
++#~ msgid "RTMP"
++#~ msgstr "RTMP"
+
-#~ msgid "General Input"
-#~ msgstr "பொத௠உளà¯à®³à¯€à®Ÿà¯"
++#~ msgid "Audio volume (0-65535)."
++#~ msgstr "ஒலித ஒலிசà¯à®šà®¤à¯à®¤à®®à¯ (0-65535)."
+
-#~ msgid "Chroma modules settings"
-#~ msgstr "Chroma மாடà¯à®²à¯à®•à®³à®¿à®©à¯ அமைபà¯à®ªà¯à®•à®³à¯"
++#~ msgid "SECAM"
++#~ msgstr "SECAM"
-#~ msgid "Encoders settings"
-#~ msgstr "Encoders அமைபà¯à®ªà¯à®•à®³à¯"
+#~ msgid "PAL"
+#~ msgstr "PAL"
-#~ msgid "No help available"
-#~ msgstr "உதவி ஒனà¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
+#~ msgid "NTSC"
+#~ msgstr "NTSC"
-#~ msgid "Quick &Open File..."
-#~ msgstr "விரைவ௠&கோபà¯à®ªà¯ திற..."
+#~ msgid "vbr"
+#~ msgstr "vbr"
-#~ msgid "&Bookmarks"
-#~ msgstr "&நினைவà¯à®•à¯à®•à¯à®±à®¿à®•à®³à¯"
+#~ msgid "cbr"
+#~ msgstr "cbr"
-#~ msgid "Fetch Information"
-#~ msgstr "தகவலà¯à®•à®³à¯ˆ சேரà¯"
+#~ msgid "PVR"
+#~ msgstr "PVR"
-#~ msgid "Sort"
-#~ msgstr "வரிசைபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
+#~ msgid "Use libv4l2"
+#~ msgstr "உபயோகி libv4l2"
-#~ msgid "Add to Media Library"
-#~ msgstr "ஊடகநூலகதà¯à®¤à¯à®Ÿà®©à¯ சேரà¯"
+#~ msgid "3 Front 2 Rear"
+#~ msgstr "3 à®®à¯à®©à¯à®ªà®•à¯à®•à®®à¯ 2 பினà¯à®ªà®•à¯à®•à®®à¯"
-#~ msgid "Advanced Open..."
-#~ msgstr "மேமà¯à®ªà®Ÿà¯à®Ÿ திற..."
+#~ msgid "2 Front 2 Rear"
+#~ msgstr "2 à®®à¯à®©à¯à®ªà®•à¯à®•à®®à¯ 2 பினà¯à®ªà®•à¯à®•à®®à¯"
-#~ msgid "Open Play&list..."
-#~ msgstr "திற தொகà¯à®ªà¯à®ªà¯&படà¯à®Ÿà®¿à®¯à®²à¯..."
+#~ msgid "A/52 over S/PDIF"
+#~ msgstr "A/52 over S/PDIF"
-#~ msgid "Search Filter"
-#~ msgstr "சலà¯à®²à®Ÿà¯ˆ தேடலà¯"
+#~ msgid "5.1"
+#~ msgstr "5.1"
-#~ msgid "&Services Discovery"
-#~ msgstr "&பணிவிடைகளின௠கணà¯à®Ÿà¯à®ªà®¿à®Ÿà®¿à®ªà¯à®ªà¯"
+#~ msgid "fast"
+#~ msgstr "விரைவாக"
-#~ msgid "Image clone"
-#~ msgstr "உரà¯à®µ நகலி"
+#~ msgid "slow"
+#~ msgstr "மெதà¯à®µà®¾à®•"
-#~ msgid "Clone the image"
-#~ msgstr "உரà¯à®µ நகலி"
+#~ msgid "Append"
+#~ msgstr "பினà¯à®¤à¯Šà®Ÿà®°à¯"
-#~ msgid "Magnification"
-#~ msgstr "உரà¯à®µà®ªà¯†à®°à¯à®•à¯à®•à®®à¯"
+#, fuzzy
+#~ msgid "Force Bold"
+#~ msgstr "வறà¯à®ªà¯à®ªà¯à®±à¯à®¤à¯à®¤à¯ IPv6"
-#~ msgid "Audio output frequency (Hz)"
-#~ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ அலைவரிசை (Hz)"
+#, fuzzy
+#~ msgid "Ignored extensions in the media library"
+#~ msgstr "AAC நீடிபà¯à®ªà¯"
+
+#, fuzzy
+#~ msgid "Automatically add new medias to ML"
+#~ msgstr "தானாக பà¯à®¤à¯à®ªà¯à®ªà®¿à®•à¯à®• சோதனை"
+
+#~ msgid "Sizes"
+#~ msgstr "அளவà¯à®•à®³à¯"
+
+#~ msgid "GOP size"
+#~ msgstr "GOP அளவà¯"
+
+#, fuzzy
+#~ msgid "Rows:"
+#~ msgstr "கணà¯à®Ÿà¯†à®Ÿà¯à®•à¯à®•"
+
+#, fuzzy
+#~ msgid "Columns:"
+#~ msgstr "ஆணைகளà¯"
+
+#~ msgid "Dump"
+#~ msgstr "டமà¯à®ªà¯"
+
+#~ msgid "dbus"
+#~ msgstr "dbus"
+
+#, fuzzy
+#~ msgid "Live Update"
+#~ msgstr "&பà¯à®¤à¯à®ªà¯à®ªà®¿"
+
+#~ msgid ""
+#~ "One of \"u8\", \"s8\", \"u16\", \"s16\", \"u16_le\", \"s16_le\", \"u16_be"
+#~ "\", \"s16_be\", \"fixed32\", \"float32\" or \"spdif\""
+#~ msgstr ""
+#~ "One of \"u8\", \"s8\", \"u16\", \"s16\", \"u16_le\", \"s16_le\", \"u16_be"
+#~ "\", \"s16_be\", \"fixed32\", \"float32\" or \"spdif\""
+
+#~ msgid "Left front"
+#~ msgstr "இடத௠மà¯à®©à¯ பகà¯à®•à®®à¯"
+
+#~ msgid " - Empty - "
+#~ msgstr "- காலி -"
+
+#~ msgid "Force IPv4"
+#~ msgstr "வறà¯à®ªà¯à®ªà¯à®±à¯à®¤à¯à®¤à¯ IPv4"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "Done %s (100.0%%)"
+#~ msgstr ""
+#~ "%s\n"
+#~ "à®®à¯à®Ÿà®¿à®¨à®¤à®¤à¯ %s (100.0%%)"
+
+#~ msgid "Alsa"
+#~ msgstr "அலà¯à®šà®¾"
+
+#~ msgid "QAM16"
+#~ msgstr "QAM16"
+
+#~ msgid "QAM32"
+#~ msgstr "QAM32"
+
+#~ msgid "QAM64"
+#~ msgstr "QAM64"
+
+#~ msgid "QAM128"
+#~ msgstr "QAM128"
+
+#~ msgid "QAM256"
+#~ msgstr "QAM256"
+
+#~ msgid "BPSK"
+#~ msgstr "BPSK"
+
+#~ msgid "QPSK"
+#~ msgstr "QPSK"
+
+#~ msgid "8VSB"
+#~ msgstr "8VSB"
+
+#~ msgid "16VSB"
+#~ msgstr "16VSB"
+
+#~ msgid "2/3"
+#~ msgstr "2/3"
+
+#~ msgid "3/4"
+#~ msgstr "3/4"
+
+#~ msgid "5/6"
+#~ msgstr "5/6"
+
+#~ msgid "7/8"
+#~ msgstr "7/8"
+
+#~ msgid "1/4"
+#~ msgstr "1/4"
+
+#~ msgid "1/8"
+#~ msgstr "1/8"
+
+#~ msgid "1/16"
+#~ msgstr "1/16"
+
+#~ msgid "1/32"
+#~ msgstr "1/32"
+
+#~ msgid "2k"
+#~ msgstr "2k"
+
+#~ msgid "8k"
+#~ msgstr "8k"
+
+#~ msgid "HTTP ACL"
+#~ msgstr "HTTP ACL"
+
+#~ msgid "Root CA file"
+#~ msgstr "Root CA கோபà¯à®ªà¯"
+
+#~ msgid "CRL file"
+#~ msgstr "CRL கோபà¯à®ªà¯"
+
+#~ msgid "%.1f MHz (%d services)"
+#~ msgstr "%.1f MHz (%d பணிவிடைகளà¯)"
+
+#~ msgid "MMap"
+#~ msgstr "MMap"
+
+#~ msgid "Quality of the stream."
+#~ msgstr "ஓடையின௠தரமà¯"
+
+#~ msgid "AUTO"
+#~ msgstr "தானாக"
+
+#~ msgid "READ"
+#~ msgstr "வாசிபà¯à®ªà¯"
+
+#~ msgid "MMAP"
+#~ msgstr "MMAP"
+
+#~ msgid "USERPTR"
+#~ msgstr "USERPTR"
+
+#~ msgid "Subpage"
+#~ msgstr "தà¯à®£à¯ˆ பகà¯à®•à®®à¯"
+
+#~ msgid "1.00x"
+#~ msgstr "1.00x"
+
+#~ msgid "Handlers"
+#~ msgstr "கையாளà¯à®ªà®µà®°à¯à®•à®³à¯"
+
+#~ msgid "Repair"
+#~ msgstr "சரிசெயà¯"
+
+#~ msgid "VLC was brought to you by:"
+#~ msgstr "உஙà¯à®•à®³à®¿à®Ÿà®®à¯ VLC வழஙà¯à®•à®¿à®¯à®¤à¯:"
+
+#~ msgid "Adjust Image"
+#~ msgstr "உரà¯à®µ சரியாகà¯à®•à®²à¯"
+
+#~ msgid " Playlist (All, one level) "
+#~ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ (All, one level) "
+
+#~ msgid " Playlist (By category) "
+#~ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ (By category) "
+
+#~ msgid " Playlist (Manually added) "
+#~ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯(Manually added) "
+
+#~ msgid "&Update"
+#~ msgstr "&பà¯à®¤à¯à®ªà¯à®ªà®¿"
+
+#~ msgid "Sca&le"
+#~ msgstr "அளவà¯&கோலà¯"
+
+#~ msgid "OSSO"
+#~ msgstr "OSSO"
+
+#, fuzzy
+#~ msgid "Show Details"
+#~ msgstr "&கோடக௠தகவலà¯"
+
+#, fuzzy
+#~ msgid "Add a subtitle file"
+#~ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯à®•à®³à¯ˆ உபயோகி"
+
+#, fuzzy
+#~ msgid "Subtitles/OSD"
+#~ msgstr "தà¯à®£à¯ˆà®¤à¯ தலைபà¯à®ªà¯à®•à®³à¯ / திரையில௠தோனà¯à®±à¯à®®à¯ காடà¯à®šà®¿"
+
+#, fuzzy
+#~ msgid "General Input"
+#~ msgstr "பொதà¯"
+
+#, fuzzy
+#~ msgid "Chroma modules settings"
+#~ msgstr "பொத௠நிகழà¯à®ªà®Ÿ அமைபà¯à®ªà¯à®•à®³à¯"
+
+#, fuzzy
+#~ msgid "Encoders settings"
+#~ msgstr "பதிபà¯à®ªà¯ அமைபà¯à®ªà¯à®•à®³à¯"
+
+#, fuzzy
+#~ msgid "Quick &Open File..."
+#~ msgstr "&கோபà¯à®ªà¯à®•à®³à¯ˆ திற..."
+
+#, fuzzy
+#~ msgid "&Bookmarks"
+#~ msgstr "நினைவà¯à®•à¯à®•à¯à®±à®¿"
+
+#, fuzzy
+#~ msgid "Fetch Information"
+#~ msgstr "&கோடக௠தகவலà¯"
+
+#, fuzzy
+#~ msgid "Sort"
+#~ msgstr "வரிசைபà¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯"
+
+#, fuzzy
+#~ msgid "Add to Media Library"
+#~ msgstr "ஊடகநூலகமà¯"
+
+#, fuzzy
+#~ msgid "Advanced Open..."
+#~ msgstr "&மேமà¯à®ªà®Ÿà¯à®Ÿ திற..."
+
+#, fuzzy
+#~ msgid "Open Play&list..."
+#~ msgstr "திற தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯..."
+
+#, fuzzy
+#~ msgid "Search Filter"
+#~ msgstr "ஓடை சலà¯à®²à®Ÿà¯ˆà®•à®³à¯"
+
+#, fuzzy
+#~ msgid "&Services Discovery"
+#~ msgstr "பணிவிடைகளின௠கணà¯à®Ÿà¯à®ªà®¿à®Ÿà®¿à®ªà¯à®ªà¯"
+
+#, fuzzy
+#~ msgid "Image clone"
+#~ msgstr "உரà¯à®µ உயரமà¯"
+
+#, fuzzy
+#~ msgid "Clone the image"
+#~ msgstr "உரà¯à®µ கலவை"
+
+#, fuzzy
+#~ msgid "Magnification"
+#~ msgstr "ஓடà¯à®Ÿà¯"
+
+#, fuzzy
+#~ msgid "Audio output frequency (Hz)"
+#~ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ தோலà¯à®µà®¿"
+
+#, fuzzy
+#~ msgid "Audio visualizations "
+#~ msgstr "ஒலி காடà¯à®šà®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯à®•à®³à¯"
+
+#, fuzzy
+#~ msgid "Leave fullscreen"
+#~ msgstr "விலகà¯à®•à¯ à®®à¯à®´à¯à®¤à¯à®¤à®¿à®°à¯ˆ "
+
+#, fuzzy
+#~ msgid "Hide interface"
+#~ msgstr "QT à®®à¯à®•à®ªà¯à®ªà¯"
+
+#, fuzzy
+#~ msgid "CPU"
+#~ msgstr "TCP"
+
+#, fuzzy
+#~ msgid "Aspect-ratio"
+#~ msgstr "தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
+
+#, fuzzy
+#~ msgid "GSM Audio"
+#~ msgstr "ஒலி"
+
+#, fuzzy
+#~ msgid "dc1394 input"
+#~ msgstr "ஒலிதம௠உளà¯à®³à¯€à®Ÿà¯"
+
+#, fuzzy
+#~ msgid "Refresh list"
+#~ msgstr "பà¯à®¤à¯à®¤à¯à®£à®°à¯à®µà¯ நேரமà¯"
+
+#, fuzzy
+#~ msgid "RTMP stream output"
+#~ msgstr "RTP ஓடை வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
+
+#, fuzzy
+#~ msgid "PVR video device"
+#~ msgstr "ஒலித சாதனமà¯"
+
+#, fuzzy
+#~ msgid "PVR radio device"
+#~ msgstr "வானொலி சாதனமà¯"
+
+#, fuzzy
+#~ msgid "RTMP input"
+#~ msgstr "FTP உளà¯à®³à¯€à®Ÿà¯"
+
+#, fuzzy
+#~ msgid "SFTP user name"
+#~ msgstr "FTP பயனரà¯à®ªà¯†à®¯à®°à¯"
+
+#, fuzzy
+#~ msgid "SFTP password"
+#~ msgstr "FTP கடவà¯à®šà¯à®šà¯Šà®²à¯"
++=======
++#, fuzzy
++msgid "Media Manager List"
++msgstr "ஊடக தகவலà¯à®•à®³à¯"
++
++#~ msgid "Show Details"
++#~ msgstr "தகவலà¯à®•à®³à¯ˆ காடà¯à®Ÿà¯"
++
++#, fuzzy
++#~ msgid "Add a subtitle file"
++#~ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯à®•à®³à¯ˆ சேரà¯"
++
++#~ msgid "Subtitles/OSD"
++#~ msgstr "தà¯à®£à¯ˆ உரை/OSD"
++
++#~ msgid "General Input"
++#~ msgstr "பொத௠உளà¯à®³à¯€à®Ÿà¯"
++
++#~ msgid "Chroma modules settings"
++#~ msgstr "Chroma மாடà¯à®²à¯à®•à®³à®¿à®©à¯ அமைபà¯à®ªà¯à®•à®³à¯"
++
++#~ msgid "Encoders settings"
++#~ msgstr "Encoders அமைபà¯à®ªà¯à®•à®³à¯"
++
++#~ msgid "No help available"
++#~ msgstr "உதவி ஒனà¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
++
++#~ msgid "Quick &Open File..."
++#~ msgstr "விரைவ௠&கோபà¯à®ªà¯ திற..."
++
++#~ msgid "&Bookmarks"
++#~ msgstr "&நினைவà¯à®•à¯à®•à¯à®±à®¿à®•à®³à¯"
++
++#~ msgid "Fetch Information"
++#~ msgstr "தகவலà¯à®•à®³à¯ˆ சேரà¯"
++
++#~ msgid "Sort"
++#~ msgstr "வரிசைபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
++
++#~ msgid "Add to Media Library"
++#~ msgstr "ஊடகநூலகதà¯à®¤à¯à®Ÿà®©à¯ சேரà¯"
++
++#~ msgid "Advanced Open..."
++#~ msgstr "மேமà¯à®ªà®Ÿà¯à®Ÿ திற..."
++
++#~ msgid "Open Play&list..."
++#~ msgstr "திற தொகà¯à®ªà¯à®ªà¯&படà¯à®Ÿà®¿à®¯à®²à¯..."
++
++#~ msgid "Search Filter"
++#~ msgstr "சலà¯à®²à®Ÿà¯ˆ தேடலà¯"
++
++#~ msgid "&Services Discovery"
++#~ msgstr "&பணிவிடைகளின௠கணà¯à®Ÿà¯à®ªà®¿à®Ÿà®¿à®ªà¯à®ªà¯"
++
++#~ msgid "Image clone"
++#~ msgstr "உரà¯à®µ நகலி"
++
++#~ msgid "Clone the image"
++#~ msgstr "உரà¯à®µ நகலி"
++
++#~ msgid "Magnification"
++#~ msgstr "உரà¯à®µà®ªà¯†à®°à¯à®•à¯à®•à®®à¯"
++
++#~ msgid "Audio output frequency (Hz)"
++#~ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ அலைவரிசை (Hz)"
+
+ #~ msgid "Audio visualizations "
+ #~ msgstr "ஒலிதம௠பாரà¯à®µà¯ˆà®•à¯à®•à®³à¯"
+
+ #~ msgid "Modules search path"
+ #~ msgstr "மாடà¯à®²à¯à®•à®³à¯ தேடல௠வழி"
+
+ #~ msgid "Leave fullscreen"
+ #~ msgstr "à®®à¯à®´à¯à®¤à¯à®¤à®¿à®°à¯ˆà®¯à¯ˆ விலகà¯à®•à¯ "
+
+ #~ msgid "Hide interface"
+ #~ msgstr "à®®à¯à®•à®ªà¯à®ªà¯ˆ மறை"
+
+ #~ msgid "CPU"
+ #~ msgstr "CPU"
+
+ #~ msgid "Aspect-ratio"
+ #~ msgstr "தோறà¯à®±-விகிதமà¯"
+
+ #, fuzzy
+ #~ msgid "GSM Audio"
+ #~ msgstr "ஒலிதமà¯"
+
+ #~ msgid "dc1394 input"
+ #~ msgstr "dc1394 உளà¯à®³à¯€à®Ÿà¯"
+
+ #~ msgid "Refresh list"
+ #~ msgstr "பà¯à®¤à¯à®¤à¯à®£à®°à¯à®µà¯ படà¯à®Ÿà®¿à®¯à®²à¯"
+
+ #, fuzzy
+ #~ msgid "Coffee pot control"
+ #~ msgstr "நீடà¯à®Ÿà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #~ msgid "RTMP stream output"
+ #~ msgstr "RTMP ஓடை வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
+
+ #~ msgid "RTMP"
+ #~ msgstr "RTMP"
+
+ #~ msgid "PVR video device"
+ #~ msgstr "PVR நிகழà¯à®ªà®Ÿ சாதனமà¯"
+
+ #~ msgid "PVR radio device"
+ #~ msgstr "PVR வானொலி சாதனமà¯"
+
+ #~ msgid "Audio volume (0-65535)."
+ #~ msgstr "ஒலித ஒலிசà¯à®šà®¤à¯à®¤à®®à¯ (0-65535)."
+
+ #~ msgid "SECAM"
+ #~ msgstr "SECAM"
+
+ #~ msgid "PAL"
+ #~ msgstr "PAL"
+
+ #~ msgid "NTSC"
+ #~ msgstr "NTSC"
+
+ #~ msgid "vbr"
+ #~ msgstr "vbr"
+
+ #~ msgid "cbr"
+ #~ msgstr "cbr"
+
+ #~ msgid "PVR"
+ #~ msgstr "PVR"
+
+ #~ msgid "RTMP input"
+ #~ msgstr "RTMP உளà¯à®³à¯€à®Ÿà¯"
+
+ #~ msgid "SFTP user name"
+ #~ msgstr "SFTP பயனரà¯à®ªà¯†à®¯à®°à¯"
+
+ #~ msgid "SFTP password"
+ #~ msgstr "SFTP கடவà¯à®šà¯à®šà¯Šà®²à¯"
+
+ #~ msgid "Use libv4l2"
+ #~ msgstr "உபயோகி libv4l2"
+
+ #~ msgid "3 Front 2 Rear"
+ #~ msgstr "3 à®®à¯à®©à¯à®ªà®•à¯à®•à®®à¯ 2 பினà¯à®ªà®•à¯à®•à®®à¯"
+
+ #~ msgid "2 Front 2 Rear"
+ #~ msgstr "2 à®®à¯à®©à¯à®ªà®•à¯à®•à®®à¯ 2 பினà¯à®ªà®•à¯à®•à®®à¯"
+
+ #~ msgid "A/52 over S/PDIF"
+ #~ msgstr "A/52 over S/PDIF"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Open Sound System"
#~ msgstr "திற மூலமà¯"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "OSS DSP device"
+#~ msgstr "DVD சாதனமà¯"
+
+#, fuzzy
+#~ msgid "Default Audio Device"
+#~ msgstr "ஒலித சாதனம௠தெரிவ௠"
+
+#, fuzzy
+#~ msgid "normal"
+#~ msgstr "வழகà¯à®•à®®à®¾à®©"
+
+#, fuzzy
+#~ msgid "all"
+#~ msgstr "சிறிய"
+
+#, fuzzy
+#~ msgid "Video aspect ratio"
+#~ msgstr "வை தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
+
+#, fuzzy
+#~ msgid "Image file"
+#~ msgstr "உரà¯à®µ அகலமà¯"
+
+#, fuzzy
+#~ msgid "Commands"
+#~ msgstr "கரà¯à®¤à¯à®¤à¯à®°à¯ˆà®•à®³à¯"
+
+#, fuzzy
+#~ msgid "Subscreen width:"
+#~ msgstr "தà¯à®£à¯ˆà®¤à®¿à®°à¯ˆ அகலமà¯"
+
+#, fuzzy
+#~ msgid "Subscreen height:"
+#~ msgstr "தà¯à®£à¯ˆà®¤à®¿à®°à¯ˆ உயரமà¯"
++=======
+ #~ msgid "OSS DSP device"
+ #~ msgstr "OSS DSP சாதனமà¯"
+
+ #~ msgid "5.1"
+ #~ msgstr "5.1"
+
+ #~ msgid "Default Audio Device"
+ #~ msgstr "கோட நிலை ஒலிதசாதனமà¯"
+
+ #~ msgid "fast"
+ #~ msgstr "விரைவாக"
+
+ #~ msgid "normal"
+ #~ msgstr "வழகà¯à®•à®®à®¾à®©"
+
+ #~ msgid "slow"
+ #~ msgstr "மெதà¯à®µà®¾à®•"
+
+ #~ msgid "all"
+ #~ msgstr "எலà¯à®²à®¾à®®à¯"
+
+ #~ msgid "Append"
+ #~ msgstr "பினà¯à®¤à¯Šà®Ÿà®°à¯"
+
+ #~ msgid "Video aspect ratio"
+ #~ msgstr "நிகழà¯à®ªà®Ÿ தோறà¯à®±à®µà®¿à®•à®¿à®¤à®®à¯"
+
+ #~ msgid "Image file"
+ #~ msgstr "உரà¯à®µ கோபà¯à®ªà¯"
+
-#~ msgid "Commands"
-#~ msgstr "ஆணைகளà¯"
++#~ msgid "Commands"
++#~ msgstr "ஆணைகளà¯"
++
++#~ msgid "Subscreen width:"
++#~ msgstr "தà¯à®£à¯ˆà®¤à®¿à®°à¯ˆ அகலமà¯:"
++
++#~ msgid "Subscreen height:"
++#~ msgstr "தà¯à®£à¯ˆà®¤à®¿à®°à¯ˆ உயரமà¯:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+
+#, fuzzy
+#~ msgid "Image width:"
+#~ msgstr "உரà¯à®µ அகலமà¯"
+
+#, fuzzy
+#~ msgid "Image height:"
+#~ msgstr "உரà¯à®µ உயரமà¯"
+
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "Load subtitles file:"
+#~ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯à®•à®³à¯ˆ உபயோகி"
+
+#, fuzzy
+#~ msgid "HTML Playlist"
+#~ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯"
+
+#, fuzzy
+#~ msgid "General Audio Settings"
+#~ msgstr "பொத௠ஒலி அமைபà¯à®ªà¯à®•à®³à¯"
-#~ msgid "Subscreen width:"
-#~ msgstr "தà¯à®£à¯ˆà®¤à®¿à®°à¯ˆ அகலமà¯:"
+#, fuzzy
+#~ msgid "General Video Settings"
+#~ msgstr "பொத௠நிகழà¯à®ªà®Ÿ அமைபà¯à®ªà¯à®•à®³à¯"
-#~ msgid "Subscreen height:"
-#~ msgstr "தà¯à®£à¯ˆà®¤à®¿à®°à¯ˆ உயரமà¯:"
+#, fuzzy
+#~ msgid "Input & Codecs"
+#~ msgstr "உளà¯à®³à¯€à®Ÿà¯ / கோடகà¯"
#, fuzzy
-#~ msgid "Image width:"
-#~ msgstr "உரà¯à®µ அகலமà¯"
+#~ msgid "Input & Codec settings"
+#~ msgstr "உளà¯à®³à¯€à®Ÿà¯ & Codecs அமைபà¯à®ªà¯à®•à®³à¯"
#, fuzzy
-#~ msgid "Image height:"
-#~ msgstr "உரà¯à®µ உயரமà¯"
+#~ msgid "Enable Audio"
+#~ msgstr "ஒலிததà¯à®¤à¯ˆ இயஙà¯à®•à®šà¯ செயà¯"
+
+#, fuzzy
+#~ msgid "HTTP Proxy"
+#~ msgstr "HTTP பிரதிநிதி"
+#, fuzzy
++=======
+ #~ msgid "Load subtitles file:"
+ #~ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯à®•à®³à¯ˆ சேரà¯:"
+
+ #~ msgid "HTML Playlist"
+ #~ msgstr "HTML தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ "
+
+ #~ msgid "General Audio Settings"
+ #~ msgstr "பொத௠ஒலிதம௠அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #~ msgid "General Video Settings"
+ #~ msgstr "பொத௠நிகழà¯à®ªà®Ÿ அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #~ msgid "Input & Codecs"
+ #~ msgstr "உளà¯à®³à¯€à®Ÿà¯ & Codecs"
+
+ #~ msgid "Input & Codec settings"
+ #~ msgstr "உளà¯à®³à¯€à®Ÿà¯ & Codecs அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #~ msgid "Enable Audio"
+ #~ msgstr "ஒலிததà¯à®¤à¯ˆ இயஙà¯à®•à®šà¯ செயà¯"
+
+ #~ msgid "HTTP Proxy"
+ #~ msgstr "HTTP பிரதிநிதி"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Preferred Subtitle Language"
#~ msgstr "விரà¯à®ªà¯à®ª ஒலிதமொழி"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Outline Color"
+#~ msgstr "சà¯à®°à¯à®•à¯à®•à®®à®¾à®©"
+
+#, fuzzy
+#~ msgid "Enable Video"
+#~ msgstr "நிகழà¯à®ªà®Ÿà®¤à¯à®¤à¯ˆ செயலà¯à®ªà®Ÿ வை"
++=======
+ #~ msgid "Force Bold"
+ #~ msgstr "வறà¯à®ªà¯à®ªà¯à®±à¯à®¤à¯à®¤à¯ IPv6"
+
+ #, fuzzy
+ #~ msgid "Outline Color"
+ #~ msgstr "சà¯à®°à¯à®•à¯à®•à®®à®¾à®©"
+
+ #~ msgid "Enable Video"
+ #~ msgstr "நிகழà¯à®ªà®Ÿà®¤à¯à®¤à¯ˆ இயஙà¯à®•à®šà¯ செயà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid " [Video Decoding]"
@@@ -27703,15 -28251,14 +33238,24 @@@
#, fuzzy
#~ msgid " [Audio Decoding]"
++<<<<<<< HEAD
+#~ msgstr "ஒலி அமைபà¯à®ªà¯à®•à®³à¯"
++=======
+ #~ msgstr "ஒலித அமைபà¯à®ªà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid " [Streaming]"
#~ msgstr "ஓடை"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "Show playlist"
+#~ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ சேமி"
++=======
+ #~ msgid "Show playlist"
+ #~ msgstr "தொகà¯à®ªà¯à®ªà¯à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯ˆ காடà¯à®Ÿà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid " dB"
@@@ -27721,69 -28268,65 +33265,124 @@@
#~ msgid "Add to playlist"
#~ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯à®Ÿà®©à¯ சேரà¯"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "Hotkey for "
+#~ msgstr "à®®à¯à®•à¯à®•à®¿à®¯ விசை"
+
+#, fuzzy
+#~ msgid "Subtitles && OSD"
+#~ msgstr "தà¯à®£à¯ˆà®¤à¯ தலைபà¯à®ªà¯à®•à®³à¯ / திரையில௠தோனà¯à®±à¯à®®à¯ காடà¯à®šà®¿"
+
+#, fuzzy
+#~ msgid "Input && Codecs"
+#~ msgstr "உளà¯à®³à¯€à®Ÿà¯ / கோடகà¯"
++=======
+ #~ msgid "Hotkey for "
+ #~ msgstr "à®®à¯à®•à¯à®•à®¿à®¯ விசை "
+
+ #~ msgid "Subtitles && OSD"
+ #~ msgstr "தà¯à®£à¯ˆ உரை && OSD"
+
+ #~ msgid "Input && Codecs"
+ #~ msgstr "உளà¯à®³à¯€à®Ÿà¯ && Codecs"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Save and Continue"
#~ msgstr "தொடரà¯à®¨à¯à®¤à¯"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "Compiler: "
+#~ msgstr "தொகà¯à®ªà¯à®ªà®¿: %s\n"
+
+#, fuzzy
+#~ msgid "Copyright (C) "
+#~ msgstr "நகலà¯à®‰à®°à®¿à®®à¯ˆ"
++=======
+ #~ msgid "Compiler: "
+ #~ msgstr "தொகà¯à®ªà¯à®ªà®¿:"
+
+ #~ msgid "Copyright (C) "
+ #~ msgstr "உரிமைகள௠(C)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "&Codec"
#~ msgstr "கோடகà¯"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "&Convert"
+#~ msgstr "செயலà¯à®²à®¾à®•à¯à®•à¯"
+
+#, fuzzy
+#~ msgid "&Tools"
+#~ msgstr "கரà¯à®µà®¿"
++=======
+ #~ msgid "&Convert"
+ #~ msgstr "&செயலà¯à®²à®¾à®•à¯à®•à¯"
+
+ #~ msgid "&Tools"
+ #~ msgstr "&கரà¯à®µà®¿à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "&Open (advanced)..."
#~ msgstr "&கோபà¯à®ªà¯à®•à®³à¯ˆ திற..."
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "Audio &Channels"
+#~ msgstr "ஒலித அலைவரிசைகளà¯"
+
+#, fuzzy
+#~ msgid "&Subtitles Track"
+#~ msgstr "தà¯à®£à¯ˆ உரை சà¯à®µà®Ÿà¯"
+
+#, fuzzy
+#~ msgid "&Navigation"
+#~ msgstr "ஓடà¯à®Ÿà¯"
+
+#, fuzzy
++=======
+ #~ msgid "Audio &Channels"
+ #~ msgstr "ஒலிதம௠&அலைவரிசைகளà¯"
+
+ #~ msgid "&Subtitles Track"
+ #~ msgstr "&தà¯à®£à¯ˆ உரைகள௠சà¯à®µà®Ÿà¯"
+
+ #~ msgid "&Navigation"
+ #~ msgstr "&ஓடà¯à®Ÿà¯"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Advanced options"
#~ msgstr "மேமà¯à®ªà®Ÿà¯à®Ÿ அமைபà¯à®ªà¯à®•à®³à¯"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "SQLite database module"
+#~ msgstr "சலà¯à®²à®Ÿà¯ˆ ஓடை மாடà¯à®²à¯"
+
+#, fuzzy
+#~ msgid "XOSD interface"
+#~ msgstr "QT à®®à¯à®•à®ªà¯à®ªà¯"
++=======
+ #~ msgid "Ignored extensions in the media library"
+ #~ msgstr "AAC நீடிபà¯à®ªà¯"
+
+ #, fuzzy
+ #~ msgid "Automatically add new medias to ML"
+ #~ msgstr "தானாக பà¯à®¤à¯à®ªà¯à®ªà®¿à®•à¯à®• சோதனை"
+
+ #, fuzzy
+ #~ msgid "SQLite database module"
+ #~ msgstr "சலà¯à®²à®Ÿà¯ˆ ஓடை மாடà¯à®²à¯"
+
+ #~ msgid "XOSD interface"
+ #~ msgstr "XOSD à®®à¯à®•à®ªà¯à®ªà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Disable ES id"
@@@ -27793,20 -28336,24 +33392,34 @@@
#~ msgid "Enable ES id"
#~ msgstr "நிகழà¯à®ªà®Ÿà®¤à¯à®¤à¯ˆ செயலà¯à®ªà®Ÿ வை"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "Audio Language"
+#~ msgstr "ஒலிதம௠மொழி"
+
+#, fuzzy
+#~ msgid "Crop video filter"
+#~ msgstr "நகலி நிகழà¯à®ªà®Ÿ சலà¯à®²à®Ÿà¯ˆ"
++=======
+ #~ msgid "Sizes"
+ #~ msgstr "அளவà¯à®•à®³à¯"
- #, fuzzy
- #~ msgid "Stream Name"
- #~ msgstr "ஓடை பெயரà¯"
+ #~ msgid "GOP size"
+ #~ msgstr "GOP அளவà¯"
- #, fuzzy
- #~ msgid "Video Codec"
+ #~ msgid "Audio Language"
+ #~ msgstr "ஒலிதம௠மொழி"
+
+ #~ msgid "Crop video filter"
+ #~ msgstr "வெடà¯à®Ÿà¯ நிகழà¯à®ªà®Ÿ சலà¯à®²à®Ÿà¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
+
+ #, fuzzy
+ #~ msgid "Stream Name"
+ #~ msgstr "ஓடை பெயரà¯"
+
+ #, fuzzy
+ #~ msgid "Video Codec"
#~ msgstr "நிகழà¯à®ªà®Ÿ கோடகà¯à®•à®³à¯"
#, fuzzy
@@@ -27815,7 -28362,7 +33428,11 @@@
#, fuzzy
#~ msgid "Subtitle Codec"
++<<<<<<< HEAD
+#~ msgstr "தà¯à®£à¯ˆ உரை கோபà¯à®ªà¯"
++=======
+ #~ msgstr "தà¯à®£à¯ˆ உரை கோடகà¯à®•à®³à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Video Bit Rate"
@@@ -27842,6 -28389,10 +33459,13 @@@
#~ msgstr "கோபà¯à®ªà¯ பெயரà¯"
#, fuzzy
++<<<<<<< HEAD
++=======
+ #~ msgid "Rows:"
+ #~ msgstr "கணà¯à®Ÿà¯†à®Ÿà¯à®•à¯à®•"
+
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "x offset"
#~ msgstr "X ஈடà¯à®šà¯†à®¯à¯"
@@@ -27850,6 -28401,10 +33474,13 @@@
#~ msgstr "அகலமà¯"
#, fuzzy
++<<<<<<< HEAD
++=======
+ #~ msgid "Columns:"
+ #~ msgstr "ஆணைகளà¯"
+
+ #, fuzzy
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "y offset"
#~ msgstr "X ஈடà¯à®šà¯†à®¯à¯"
@@@ -27861,17 -28416,16 +33492,30 @@@
#~ msgid "Licence"
#~ msgstr "உரிமமà¯"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "Group name"
+#~ msgstr "பிணைய பெயரà¯"
+
+#, fuzzy
+#~ msgid "Instances"
+#~ msgstr "நிறà¯à®µà¯à®¤à®²à¯"
+
+#, fuzzy
+#~ msgid "Subtitles Language"
+#~ msgstr "தà¯à®£à¯ˆ உரை மொழி"
++=======
+ #~ msgid "Group name"
+ #~ msgstr "Group பெயரà¯"
+
+ #, fuzzy
+ #~ msgid "Instances"
+ #~ msgstr "à®®à¯à®•à®ªà¯à®ªà¯"
+
+ #, fuzzy
+ #~ msgid "Subtitles Language"
+ #~ msgstr "தà¯à®£à¯ˆ உரை மொழிகளà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Black slot"
@@@ -27883,7 -28437,7 +33527,11 @@@
#, fuzzy
#~ msgid "Duration in second"
++<<<<<<< HEAD
+#~ msgstr "காலமà¯"
++=======
+ #~ msgstr "காலம௠in ms"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Previous/Backward"
@@@ -27893,13 -28447,12 +33541,22 @@@
#~ msgid "Next/Forward"
#~ msgstr "à®®à¯à®©à¯à®©à¯‹à®•à¯à®•à®¿à®¯ அடி"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "DVB"
+#~ msgstr "DV"
+
+#, fuzzy
+#~ msgid "Video Filters..."
+#~ msgstr "நிகழà¯à®ªà®Ÿ கோபà¯à®ªà¯à®•à®³à¯"
++=======
+ #~ msgid "DVB"
+ #~ msgstr "DVB"
+
+ #, fuzzy
+ #~ msgid "Video Filters..."
+ #~ msgstr "நிகழà¯à®ªà®Ÿ சலà¯à®²à®Ÿà¯ˆ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Video output is not supported"
@@@ -27907,19 -28460,23 +33564,39 @@@
#, fuzzy
#~ msgid "Front speakers"
++<<<<<<< HEAD
+#~ msgstr "எழà¯à®¤à¯à®¤à¯à®°à¯ உடமைகளà¯"
+
+#, fuzzy
+#~ msgid "ALSA device"
+#~ msgstr "DVD சாதனமà¯"
+
+#, fuzzy
+#~ msgid "Session groupname"
+#~ msgstr "பகà¯à®¤à®¿ பெயரà¯"
+
+#, fuzzy
+#~ msgid "Default Volume"
+#~ msgstr "சிறிய ஒலிசà¯à®šà®¤à¯à®¤à®®à¯"
++=======
+ #~ msgstr "2 à®®à¯à®©à¯à®ªà®•à¯à®•à®®à¯ 2 பினà¯à®ªà®•à¯à®•à®®à¯"
+
+ #, fuzzy
+ #~ msgid "ALSA device"
+ #~ msgstr "ALSA சாதனப௠பெயரà¯"
+
+ #~ msgid "Dump"
+ #~ msgstr "டமà¯à®ªà¯"
+
+ #~ msgid "Session groupname"
+ #~ msgstr "பகà¯à®¤à®¿ கà¯à®´à¯à®ªà¯†à®¯à®°à¯"
+
+ #~ msgid "dbus"
+ #~ msgstr "dbus"
+
+ #~ msgid "Default Volume"
+ #~ msgstr "கோட நிலை ஒலிசà¯à®šà®¤à¯à®¤à®®à¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Open a Media"
@@@ -27927,7 -28484,11 +33604,15 @@@
#, fuzzy
#~ msgid "&Open a Media"
++<<<<<<< HEAD
+#~ msgstr "ஊடகதà¯à®¤à¯ˆ திற"
++=======
+ #~ msgstr "&ஊடகதà¯à®¤à¯ˆ திற"
+
+ #, fuzzy
+ #~ msgid "Live Update"
+ #~ msgstr "&பà¯à®¤à¯à®ªà¯à®ªà®¿"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Display on &Desktop"
@@@ -27935,7 -28496,14 +33620,18 @@@
#, fuzzy
#~ msgid "Elasped time"
++<<<<<<< HEAD
+#~ msgstr "தாமத நேரமà¯"
++=======
+ #~ msgstr "பà¯à®¤à¯à®¤à¯à®£à®°à¯à®µà¯ நேரமà¯"
+
+ #~ msgid ""
+ #~ "One of \"u8\", \"s8\", \"u16\", \"s16\", \"u16_le\", \"s16_le\", \"u16_be"
+ #~ "\", \"s16_be\", \"fixed32\", \"float32\" or \"spdif\""
+ #~ msgstr ""
+ #~ "One of \"u8\", \"s8\", \"u16\", \"s16\", \"u16_le\", \"s16_le\", \"u16_be"
+ #~ "\", \"s16_be\", \"fixed32\", \"float32\" or \"spdif\""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Viewer"
@@@ -27947,7 -28515,7 +33643,11 @@@
#, fuzzy
#~ msgid "No"
++<<<<<<< HEAD
+#~ msgstr "ஒனà¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
++=======
+ #~ msgstr "&செலà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Full Screen"
@@@ -27959,7 -28527,7 +33659,11 @@@
#, fuzzy
#~ msgid "Seek Time"
++<<<<<<< HEAD
+#~ msgstr "நேரமà¯"
++=======
+ #~ msgstr "தொடகà¯à®•à®®à¯ நேரமà¯"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Graphical Equalizer"
@@@ -28017,202 -28585,298 +33721,494 @@@
#~ msgid "Refresh Streams"
#~ msgstr "பà¯à®¤à¯à®¤à¯à®£à®°à¯à®µà¯ நேரமà¯"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "Left rear"
+#~ msgstr "இடதà¯"
+
+#, fuzzy
+#~ msgid "Right rear"
+#~ msgstr "வலதà¯"
+
+#, fuzzy
+#~ msgid "Quiet mode."
+#~ msgstr "அமைதி அளவை"
+
+#, fuzzy
+#~ msgid "Effect"
+#~ msgstr "ஒலித விளைவà¯"
+
+#, fuzzy
+#~ msgid "Zoom playlist"
+#~ msgstr "தொகà¯à®ªà¯à®ªà¯à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯"
+
+#, fuzzy
+#~ msgid "key"
+#~ msgstr "à®®à¯à®•à¯à®•à®¿à®¯ விசை"
+
+#, fuzzy
+#~ msgid "Telnet Interface"
+#~ msgstr "இடைமà¯à®•à®ªà¯à®ªà¯"
+
+#, fuzzy
+#~ msgid "Web Interface"
+#~ msgstr "இடைமà¯à®•à®ªà¯à®ªà¯"
+
+#, fuzzy
+#~ msgid "Video output filter module"
+#~ msgstr "ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ மாடà¯à®²à¯"
+
+#, fuzzy
+#~ msgid "UDP port"
+#~ msgstr "SFTP வாசலà¯"
+
+#, fuzzy
+#~ msgid "HTTP password"
+#~ msgstr "FTP கடவà¯à®šà¯à®šà¯Šà®²à¯"
+
+#, fuzzy
+#~ msgid "Fake"
+#~ msgstr "போலி TTY"
++=======
+ #~ msgid "Left rear"
+ #~ msgstr "இடத௠பின௠பகà¯à®•à®®à¯"
+
+ #~ msgid "Right rear"
+ #~ msgstr "வலத௠பின௠பகà¯à®•à®®à¯"
+
+ #~ msgid "Left front"
+ #~ msgstr "இடத௠மà¯à®©à¯ பகà¯à®•à®®à¯"
+
+ #~ msgid "Quiet mode."
+ #~ msgstr "அமைதி அளவை."
+
+ #, fuzzy
+ #~ msgid "Effect"
+ #~ msgstr "எழà¯à®¤à¯à®¤à¯à®±à¯ விளைவà¯"
+
+ #, fuzzy
+ #~ msgid "Zoom playlist"
+ #~ msgstr "தொகà¯à®ªà¯à®ªà¯à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯ˆ காடà¯à®Ÿà¯"
+
+ #~ msgid " - Empty - "
+ #~ msgstr "- காலி -"
+
+ #~ msgid "key"
+ #~ msgstr "விசை"
+
+ #~ msgid "Telnet Interface"
+ #~ msgstr "Telnet à®®à¯à®•à®ªà¯à®ªà¯"
+
+ #~ msgid "Web Interface"
+ #~ msgstr "இணையவலை à®®à¯à®•à®ªà¯à®ªà¯"
+
+ #~ msgid "Video output filter module"
+ #~ msgstr "நிகழà¯à®ªà®Ÿ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ சலà¯à®²à®Ÿà¯ˆ மாடà¯à®²à¯à®•à®³à¯"
+
+ #~ msgid "UDP port"
+ #~ msgstr "UDP வாசலà¯"
+
+ #~ msgid "Force IPv4"
+ #~ msgstr "வறà¯à®ªà¯à®ªà¯à®±à¯à®¤à¯à®¤à¯ IPv4"
+
+ #~ msgid ""
+ #~ "%s\n"
+ #~ "Done %s (100.0%%)"
+ #~ msgstr ""
+ #~ "%s\n"
+ #~ "à®®à¯à®Ÿà®¿à®¨à®¤à®¤à¯ %s (100.0%%)"
+
+ #~ msgid "Alsa"
+ #~ msgstr "அலà¯à®šà®¾"
+
+ #~ msgid "QAM16"
+ #~ msgstr "QAM16"
+
+ #~ msgid "QAM32"
+ #~ msgstr "QAM32"
+
+ #~ msgid "QAM64"
+ #~ msgstr "QAM64"
+
+ #~ msgid "QAM128"
+ #~ msgstr "QAM128"
+
+ #~ msgid "QAM256"
+ #~ msgstr "QAM256"
+
+ #~ msgid "BPSK"
+ #~ msgstr "BPSK"
+
+ #~ msgid "QPSK"
+ #~ msgstr "QPSK"
+
+ #~ msgid "8VSB"
+ #~ msgstr "8VSB"
+
+ #~ msgid "16VSB"
+ #~ msgstr "16VSB"
+
+ #~ msgid "2/3"
+ #~ msgstr "2/3"
+
+ #~ msgid "3/4"
+ #~ msgstr "3/4"
+
+ #~ msgid "5/6"
+ #~ msgstr "5/6"
+
+ #~ msgid "7/8"
+ #~ msgstr "7/8"
+
+ #~ msgid "1/4"
+ #~ msgstr "1/4"
+
+ #~ msgid "1/8"
+ #~ msgstr "1/8"
+
+ #~ msgid "1/16"
+ #~ msgstr "1/16"
+
+ #~ msgid "1/32"
+ #~ msgstr "1/32"
+
+ #~ msgid "2k"
+ #~ msgstr "2k"
+
+ #~ msgid "8k"
+ #~ msgstr "8k"
+
+ #~ msgid "HTTP password"
+ #~ msgstr "HTTP கடவà¯à®šà¯à®šà¯Šà®²à¯"
+
+ #~ msgid "HTTP ACL"
+ #~ msgstr "HTTP ACL"
+
+ #~ msgid "Root CA file"
+ #~ msgstr "Root CA கோபà¯à®ªà¯"
+
+ #~ msgid "CRL file"
+ #~ msgstr "CRL கோபà¯à®ªà¯"
+
+ #~ msgid "%.1f MHz (%d services)"
+ #~ msgstr "%.1f MHz (%d பணிவிடைகளà¯)"
+
+ #~ msgid "Fake"
+ #~ msgstr "போலி"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Directory input"
#~ msgstr "நேரடியாக காடà¯à®Ÿà¯ உளà¯à®³à¯€à®Ÿà¯"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "Audio Channel"
+#~ msgstr "ஒலித அலைவரிசைகளà¯"
+
+#, fuzzy
+#~ msgid "default"
+#~ msgstr "கோட நிலை"
+
+#, fuzzy
+#~ msgid "No Audio Device"
+#~ msgstr "ஒலித சாதனமà¯"
+
+#, fuzzy
+#~ msgid "Unknown soundcard"
+#~ msgstr "தெரியாத வகை"
+
+#, fuzzy
+#~ msgid "UNIX OSS audio output"
+#~ msgstr "ALSA ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
+
+#, fuzzy
+#~ msgid "Host address"
+#~ msgstr "பà¯à®°à®µà®²à®°à¯ à®®à¯à®•à®µà®°à®¿"
+
+#, fuzzy
+#~ msgid "HTTP remote control interface"
+#~ msgstr "தொலை கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ à®®à¯à®•à®ªà¯à®ªà¯"
+
+#, fuzzy
+#~ msgid "HTTP SSL"
+#~ msgstr "HTTP(S)"
+
+#, fuzzy
+#~ msgid "VLM remote control interface"
+#~ msgstr "தொலை கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ à®®à¯à®•à®ªà¯à®ªà¯"
+
+#, fuzzy
+#~ msgid "AVI Index"
+#~ msgstr "உளà¯à®³à®Ÿà®•à¯à®•à®®à¯"
+
+#, fuzzy
+#~ msgid "Don't repair"
+#~ msgstr "அனà¯à®ªà¯à®ªà®¾à®¤à¯‡"
+
+#, fuzzy
+#~ msgid "Audio Filter"
+#~ msgstr "ஒலிதம௠சலà¯à®²à®Ÿà¯ˆ"
+
+#, fuzzy
+#~ msgid "About the video filters"
+#~ msgstr "சà¯à®´à®²à¯ ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
+
+#, fuzzy
+#~ msgid "Controller..."
+#~ msgstr "கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ "
+
+#, fuzzy
+#~ msgid "Equalizer..."
+#~ msgstr "சரிசமமாகà¯à®•à¯à®¤à®²à¯"
+
+#, fuzzy
+#~ msgid "Extended Controls..."
+#~ msgstr "&மேமà¯à®ªà®Ÿà¯à®Ÿ அமைபà¯à®ªà¯à®•à®³à¯"
+
+#, fuzzy
+#~ msgid "Volume: %d%%"
+#~ msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®®à¯ கீழே"
+
+#, fuzzy
+#~ msgid " Help "
+#~ msgstr "உதவி"
+
+#, fuzzy
+#~ msgid "&Codec Details"
+#~ msgstr "&கோடக௠தகவலà¯"
+
+#, fuzzy
+#~ msgid "&Statistics"
+#~ msgstr "பà¯à®³à¯à®³à®¿ விபரஙà¯à®•à®³à¯"
+
+#, fuzzy
+#~ msgid "C&lear"
+#~ msgstr "தà¯à®Ÿà¯ˆà®•à¯à®•"
+
+#, fuzzy
+#~ msgid "XSPF playlist (*.xspf)"
+#~ msgstr "XSPF தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ இறகà¯à®•à¯à®®à®¤à®¿"
+
+#, fuzzy
+#~ msgid "M3U8 playlist (*.m3u8)"
+#~ msgstr "M3U தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ இறகà¯à®•à¯à®®à®¤à®¿"
+
+#, fuzzy
+#~ msgid "M3U playlist (*.m3u)"
+#~ msgstr "M3U தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ இறகà¯à®•à¯à®®à®¤à®¿"
+
+#, fuzzy
+#~ msgid "HTML playlist (*.html)"
+#~ msgstr "HTML தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ இறகà¯à®•à¯à®®à®¤à®¿"
+
+#, fuzzy
+#~ msgid "Sna&pshot"
+#~ msgstr "திடிரனகைபà¯à®ªà®±à¯à®±à¯"
+
+#, fuzzy
+#~ msgid "Manage &bookmarks"
+#~ msgstr "உரà¯à®µà®¾à®•à¯à®•à¯ நினைவà¯à®•à¯à®•à¯à®±à®¿"
+
+#, fuzzy
++=======
+ #~ msgid "MMap"
+ #~ msgstr "MMap"
+
+ #~ msgid "Audio Channel"
+ #~ msgstr "ஒலித அலைவரிசை"
+
+ #~ msgid "Quality of the stream."
+ #~ msgstr "ஓடையின௠தரமà¯"
+
+ #~ msgid "AUTO"
+ #~ msgstr "தானாக"
+
+ #~ msgid "READ"
+ #~ msgstr "வாசிபà¯à®ªà¯"
+
+ #~ msgid "MMAP"
+ #~ msgstr "MMAP"
+
+ #~ msgid "USERPTR"
+ #~ msgstr "USERPTR"
+
+ #~ msgid "default"
+ #~ msgstr "கோட நிலை"
+
+ #~ msgid "No Audio Device"
+ #~ msgstr "ஒலிதசாதனம௠ஒனà¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
+
+ #~ msgid "Unknown soundcard"
+ #~ msgstr "தெரியாத வகை"
+
+ #~ msgid "UNIX OSS audio output"
+ #~ msgstr "UNIX OSS ஒலித வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
+
+ #~ msgid "Subpage"
+ #~ msgstr "தà¯à®£à¯ˆ பகà¯à®•à®®à¯"
+
+ #~ msgid "1.00x"
+ #~ msgstr "1.00x"
+
+ #~ msgid "Host address"
+ #~ msgstr "பà¯à®°à®µà®²à®°à¯ à®®à¯à®•à®µà®°à®¿"
+
+ #~ msgid "Handlers"
+ #~ msgstr "கையாளà¯à®ªà®µà®°à¯à®•à®³à¯"
+
+ #~ msgid "HTTP remote control interface"
+ #~ msgstr "HTTP தொலை கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ à®®à¯à®•à®ªà¯à®ªà¯"
+
+ #~ msgid "HTTP SSL"
+ #~ msgstr "HTTP SSL"
+
+ #~ msgid "VLM remote control interface"
+ #~ msgstr "VLC தொலை கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯ à®®à¯à®•à®ªà¯à®ªà¯"
+
+ #~ msgid "AVI Index"
+ #~ msgstr "AVI உளà¯à®³à®Ÿà®•à¯à®•à®®à¯"
+
+ #~ msgid "Repair"
+ #~ msgstr "சரிசெயà¯"
+
+ #~ msgid "Don't repair"
+ #~ msgstr "சரிசெயà¯à®¯à®¾à®¤"
+
+ #~ msgid "VLC was brought to you by:"
+ #~ msgstr "உஙà¯à®•à®³à®¿à®Ÿà®®à¯ VLC வழஙà¯à®•à®¿à®¯à®¤à¯:"
+
+ #~ msgid "Adjust Image"
+ #~ msgstr "உரà¯à®µ சரியாகà¯à®•à®²à¯"
+
+ #~ msgid "Audio Filter"
+ #~ msgstr "ஒலிதம௠சலà¯à®²à®Ÿà¯ˆ"
+
+ #~ msgid "About the video filters"
+ #~ msgstr "நிகழà¯à®ªà®Ÿ சலà¯à®²à®Ÿà¯ˆà®ªà¯à®ªà®±à¯à®±à®¿"
+
+ #~ msgid "Controller..."
+ #~ msgstr "அமைபà¯à®ªà®¾à®³à®°à¯..."
+
+ #~ msgid "Equalizer..."
+ #~ msgstr "சரிசமமாகà¯à®•à¯à®¤à®²à¯..."
+
+ #~ msgid "Extended Controls..."
+ #~ msgstr "நீடà¯à®Ÿà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ அமைபà¯à®ªà¯à®•à®³à¯"
+
+ #~ msgid "Volume: %d%%"
+ #~ msgstr "ஒலிசà¯à®šà®¤à¯à®¤à®®à¯: %d%%"
+
+ #~ msgid " Help "
+ #~ msgstr "உதவி"
+
+ #~ msgid " Playlist (All, one level) "
+ #~ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ (All, one level) "
+
+ #~ msgid " Playlist (By category) "
+ #~ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ (By category) "
+
+ #~ msgid " Playlist (Manually added) "
+ #~ msgstr "தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯(Manually added) "
+
+ #~ msgid "&Codec Details"
+ #~ msgstr "&கோடக௠தகவலà¯"
+
+ #~ msgid "&Statistics"
+ #~ msgstr "&பà¯à®³à¯à®³à®¿ விபரஙà¯à®•à®³à¯"
+
+ #~ msgid "C&lear"
+ #~ msgstr "தà¯&டைகà¯à®•"
+
+ #~ msgid "&Update"
+ #~ msgstr "&பà¯à®¤à¯à®ªà¯à®ªà®¿"
+
+ #~ msgid "XSPF playlist (*.xspf)"
+ #~ msgstr "XSPF தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ (*.xspf)"
+
+ #~ msgid "M3U8 playlist (*.m3u8)"
+ #~ msgstr "M3U8 தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ (*.m3u8)"
+
+ #~ msgid "M3U playlist (*.m3u)"
+ #~ msgstr "M3U தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ (*.m3u)"
+
+ #~ msgid "HTML playlist (*.html)"
+ #~ msgstr "HTML தொகà¯à®ªà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ (*.html)"
+
+ #~ msgid "Sna&pshot"
+ #~ msgstr "திடிரன&கைபà¯à®ªà®±à¯à®±à¯"
+
+ #~ msgid "Sca&le"
+ #~ msgstr "அளவà¯&கோலà¯"
+
+ #~ msgid "Manage &bookmarks"
+ #~ msgstr "தொக௠&நினைவà¯à®•à¯à®•à¯à®±à®¿"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgctxt "Tooltip|Clear"
#~ msgid "Clear"
#~ msgstr "தà¯à®Ÿà¯ˆà®•à¯à®•"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "Font Effect"
+#~ msgstr "ஒலித விளைவà¯"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "பணிவிடைகளà¯"
+
+#, fuzzy
+#~ msgid "HD1000 video output"
+#~ msgstr "YUV நிகழà¯à®ªà®Ÿà®®à¯ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
+
+#, fuzzy
+#~ msgid "Snapshot width"
+#~ msgstr "நிகழà¯à®ªà®Ÿ திடிரனகைபà¯à®ªà®±à¯à®±à¯ அகலமà¯"
+
+#, fuzzy
+#~ msgid "Snapshot height"
+#~ msgstr "நிகழà¯à®ªà®Ÿ திடிரனகைபà¯à®ªà®±à¯à®±à¯ உயரமà¯"
+
+#, fuzzy
+#~ msgid "Snapshot output"
+#~ msgstr "திடிரனகைபà¯à®ªà®±à¯à®±à¯"
+
+#, fuzzy
+#~ msgid "Font size:"
+#~ msgstr "எழà¯à®¤à¯à®¤à¯à®±à¯ அளவà¯"
+
+#, fuzzy
+#~ msgid "Text alignment:"
+#~ msgstr "நிகழà¯à®ªà®Ÿ வரிசைபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
++=======
+ #~ msgid "Font Effect"
+ #~ msgstr "எழà¯à®¤à¯à®¤à¯à®±à¯ விளைவà¯"
+
+ #~ msgid "OSSO"
+ #~ msgstr "OSSO"
+
+ #~ msgid "Server"
+ #~ msgstr "வழஙà¯à®•à®¿"
+
+ #~ msgid "HD1000 video output"
+ #~ msgstr "HD1000 நிகழà¯à®ªà®Ÿà®®à¯ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯ "
+
+ #~ msgid "Snapshot width"
+ #~ msgstr "திடிரனகைபà¯à®ªà®±à¯à®±à¯ அகலமà¯"
+
+ #~ msgid "Snapshot height"
+ #~ msgstr "திடிரனகைபà¯à®ªà®±à¯à®±à¯ உயரமà¯"
+
+ #~ msgid "Snapshot output"
+ #~ msgstr "திடிரனகைபà¯à®ªà®±à¯à®±à¯ வெளிபà¯à®ªà¯‹à®¤à¯à®¤à¯"
+
+ #~ msgid "Font size:"
+ #~ msgstr "எழà¯à®¤à¯à®¤à¯à®±à¯ அளவà¯:"
+
+ #~ msgid "Text alignment:"
+ #~ msgstr "எழà¯à®¤à¯à®¤à¯ வரிசைபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Color fun"
@@@ -28238,14 -28902,11 +34234,25 @@@
#~ msgid "SessionManager"
#~ msgstr "பகà¯à®¤à®¿ பெயரà¯"
++<<<<<<< HEAD
+#, fuzzy
+#~ msgid "title"
+#~ msgstr "தலைபà¯à®ªà¯"
+
+#, fuzzy
+#~ msgid "Key"
+#~ msgstr "விசை:"
+
+#, fuzzy
+#~ msgid "Set"
+#~ msgstr "ஈரமà¯"
++=======
+ #~ msgid "title"
+ #~ msgstr "தலைபà¯à®ªà¯"
+
+ #~ msgid "Key"
+ #~ msgstr "விசை"
+
+ #~ msgid "Set"
+ #~ msgstr "அமை"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined po/te.po
index 381c2e3,1e487c1..166f967
--- a/po/te.po
+++ b/po/te.po
@@@ -9,7 -9,7 +9,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-24 14:45+0000\n"
"Last-Translator: వీవెనౠవీరపనేని <veeven at gmail.com>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -138,7 -138,7 +142,11 @@@ msgstr "ఇతర ఆడియో à°…à°
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -445,10 -445,10 +453,17 @@@ msgid "&About
msgstr "à°—à±à°°à°¿à°‚à°šà°¿ (&A)"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -487,17 -487,17 +502,29 @@@ msgid "Save...
msgstr "à°à°¦à±à°°à°ªà°°à±à°šà±..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "à°…à°¨à±à°¨à±€ à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°‚ చేయి"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "ఒకదానినే à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°‚చేయి"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -599,7 -599,7 +626,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "అచేతనపరà±à°šà±"
@@@ -1259,20 -1259,20 +1290,36 @@@ msgstr "à°šà°Ÿà±à°°à°‚ రేటà±
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1663,7 -1663,7 +1710,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1745,7 -1745,7 +1796,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "à°à°¦à±€à°•à°¾à°¦à±"
@@@ -1769,7 -1769,7 +1824,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "వీడియోని చేతనపరà±à°šà±"
@@@ -1959,7 -1959,7 +2018,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "à°Žà°²à±à°²à°ªà±à°ªà±à°¡à± పైన ఉంచà±"
@@@ -2010,7 -2010,7 +2073,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2019,7 -2019,7 +2086,11 @@@ msgstr "విజాలీకరణ
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "విజాలీకరణ రీతి"
@@@ -2075,7 -2075,7 +2146,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "à°•à°¿à°Ÿà°¿à°•à±€ అలంకారాలà±"
@@@ -2244,7 -2244,7 +2319,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "à°šà°Ÿà±à°°à°¾à°²à°¨à± దాటవేయి"
@@@ -2372,12 -2372,12 +2451,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2385,7 -2385,7 +2473,11 @@@ msgid "Default
msgstr "à°…à°ªà±à°°à°®à±‡à°¯à°‚"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2688,7 -2688,7 +2780,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3500,7 -3500,7 +3596,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "విసà±à°®à°°à°¿à°‚à°šà±"
@@@ -3524,8 -3524,8 +3624,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3605,10 -3605,10 +3710,17 @@@ msgid "Slower (fine)
msgstr "నెమà±à°®à°¦à°¿ (బాగా)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3621,10 -3621,10 +3733,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "à°®à±à°¨à±à°ªà°Ÿà°¿"
@@@ -3633,9 -3633,9 +3752,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3870,9 -3870,9 +3995,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "నిశబà±à°¦à°‚"
@@@ -4286,7 -4286,7 +4417,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "తకà±à°·à°£à°šà°¿à°¤à±à°°à°‚"
@@@ -4485,12 -4485,12 +4620,21 @@@ msgstr "దించà±à°•à±à°‚à°Ÿà±à
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
@@@ -5248,7 -5248,7 +5392,11 @@@ msgstr "à°•à°¤à±à°¤à°¿à°°à°¿à°‚à°šà±
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "రూప నిషà±à°ªà°¤à±à°¤à°¿"
@@@ -7544,7 -7544,7 +7692,11 @@@ msgstr "తెర ఇనà±â€Œà°ªà±à°Ÿ
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "తెర"
@@@ -8276,7 -8276,7 +8428,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9387,7 -9387,7 +9543,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "ALSA ఆడియో à°…à°µà±à°Ÿà±â€Œà°ªà±à°Ÿà±"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "ఆడియో à°…à°µà±à°Ÿà±â€Œà°ªà±à°Ÿà± విఫలమైంది"
@@@ -9418,7 -9418,7 +9578,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9426,30 -9426,30 +9590,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10615,46 -10615,46 +10803,74 @@@ msgstr "నీడ
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "నలà±à°ªà±"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "బూడిదరంగà±"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "వెండి"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "తెలà±à°ªà±"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "మెరూనà±"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "à°Žà°°à±à°ªà±"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10662,61 -10662,61 +10878,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "పసà±à°ªà±"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "ఆలివà±"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "పచà±à°š"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "లైమà±"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "నావీ"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "నీలం"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10846,7 -10846,7 +11098,11 @@@ msgstr "ఉపశీరà±à°·à°¿à°•à°²à
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12633,10 -12633,10 +12889,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "సాధారణం"
@@@ -12741,8 -12741,8 +13004,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13078,9 -13078,9 +13346,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "నిలిపివేయి"
@@@ -14959,7 -14959,7 +15233,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15138,7 -15138,7 +15416,11 @@@ msgid "VLC media player Help
msgstr "VLC మాధà±à°¯à°® à°ªà±à°°à°¦à°°à±à°¶à°•à°‚ సహాయం"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "సూచిక"
@@@ -15226,9 -15226,9 +15508,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "à°à°¦à±à°°à°ªà°°à±à°šà±"
@@@ -15367,7 -15367,7 +15655,11 @@@ msgstr "ఠఇనà±â€Œà°ªà±à°Ÿà± à°
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "సమయానికి గెంతà±"
@@@ -15387,7 -15387,7 +15679,11 @@@ msgstr "
msgid "Backward"
msgstr "వెనà±à°•à°•à±"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15397,7 -15397,7 +15693,11 @@@ msgstr "
msgid "Forward"
msgstr "à°®à±à°‚à°¦à±à°•à±"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15417,84 -15417,84 +15717,155 @@@ msgstr "పూరà±à°¤à°¿à°¤à±†à°° à°µ
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "à°ªà±à°°à°¦à°°à±à°¶à°¨à°œà°¾à°¬à°¿à°¤à°¾ చూపించà±/దాయి"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "à°ªà±à°°à°¦à°°à±à°¶à°¨à°œà°¾à°¬à°¿à°¤à°¾ చూపించà±/దాయి"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "యాదృచà±à°›à°¿à°•à°‚"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "యాదృచà±à°›à°¿à°•à°‚"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "పూరà±à°¤à°¿ శబà±à°¦à°‚"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "పూరà±à°¤à°¿ శబà±à°¦à°‚"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "à°ªà±à°°à°à°¾à°µà°¾à°²à±"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15530,7 -15530,7 +15901,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15713,8 -15713,8 +16088,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "à°…à°¨à±à°°à±‚పితం"
@@@ -15807,36 -15807,36 +16187,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "మళà±à°³à±€ à°…à°¡à±à°—వదà±à°¦à±"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "à°Žà°Ÿà±à°µà°‚à°Ÿà°¿ విరిగినచిటà±à°Ÿà°¾ కనపడలేదà±"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "à°Žà°Ÿà±à°µà°‚à°Ÿà°¿ విరిగినచిటà±à°Ÿà°¾ కనపడలేదà±"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "కొనసాగించà±"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "పాత à°ªà±à°°à°¾à°§à°¾à°¨à±à°¯à°¤à°²à°¨à± తీసివేయాలా?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "పాత à°ªà±à°°à°¾à°§à°¾à°¨à±à°¯à°¤à°²à°¨à± తీసివేయాలా?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15988,7 -15988,7 +16400,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "రూప నిషà±à°ªà°¤à±à°¤à°¿à°•à°¿ తాళంవేయి"
@@@ -16117,7 -16117,7 +16533,11 @@@ msgstr "వియలà±à°¸à±€à°¨à°¿ à°¦
msgid "Hide Others"
msgstr "ఇతరాలని దాయి"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "à°…à°¨à±à°¨à±€ చూపించà±"
@@@ -16202,15 -16202,15 +16622,27 @@@ msgstr "à°Ÿà±à°°à°¾à°•à± సమకా
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "à°ªà±à°²à±‡à°¬à±à°¯à°¾à°•à± తరà±à°µà°¾à°¤ నిషà±à°•à±à°°à°®à°¿à°‚à°šà±"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "à°…à°¡à±à°—à± à°®à±à°‚à°¦à±à°•à±"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "à°ªà±à°²à±‡à°¬à±à°¯à°¾à°•à± తరà±à°µà°¾à°¤ నిషà±à°•à±à°°à°®à°¿à°‚à°šà±"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "à°…à°¡à±à°—à± à°®à±à°‚à°¦à±à°•à±"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "à°…à°¡à±à°—ౠవెనà±à°•à°•à±"
@@@ -16226,30 -16226,30 +16658,56 @@@ msgstr "శబà±à°¦à°‚ తగà±à°—à°¿
msgid "Audio Device"
msgstr "ఆడియో పరికరం"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "సగం పరిమాణం"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "సాధారణ పరిమాణం"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "రెండింతల పరిమాణం"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "తెరకౠఅమరà±à°šà±"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "సగం పరిమాణం"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "సాధారణ పరిమాణం"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "రెండింతల పరిమాణం"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "తెరకౠఅమరà±à°šà±"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "పూరà±à°¤à°¿à°¤à±†à°° వీడియో పరికరం"
@@@ -16258,7 -16258,7 +16716,11 @@@
msgid "Post processing"
msgstr "పోసà±à°Ÿà± à°ªà±à°°à±‹à°¸à±†à°¸à°¿à°‚à°—à±"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16486,7 -16486,7 +16948,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "à°Žà°‚à°šà±à°•à±Šà°¨à±..."
@@@ -16657,7 -16657,7 +17123,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "ఖతి పరిమాణం"
@@@ -16886,12 -16886,12 +17356,20 @@@ msgstr "మెటా à°à°¦à±à°°à°ªà°°
msgid "VLC was unable to save the meta data."
msgstr "మెటాడేటానౠవియలà±à°¸à±€ à°à°¦à±à°°à°ªà°°à±à°šà°²à±‡à°•à°ªà±‹à°¤à±à°‚ది."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "à°ªà±à°°à°¾à°§à°¾à°¨à±à°¯à°¤à°²à±"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "à°…à°¨à±à°¨à±€ తిరిగిఅమరà±à°šà±"
@@@ -17068,129 -17068,125 +17546,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "à°…à°ªà±à°°à°®à±‡à°¯ à°Žà°¨à±à°•à±‹à°¡à°¿à°‚à°—à±"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "à°ªà±à°°à°¦à°°à±à°¶à°¨à°¾ అమరికలà±"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "à°…à°ªà±à°°à°®à±‡à°¯ à°Žà°¨à±à°•à±‹à°¡à°¿à°‚à°—à±"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "à°ªà±à°°à°¦à°°à±à°¶à°¨à°¾ అమరికలà±"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "ఖతి à°°à°‚à°—à±"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "ఖతి"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "OSD చేతనపరà±à°šà±"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "OSD చేతనపరà±à°šà±"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "అపారదరà±à°¶à°•à°¤"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "à°ªà±à°°à°¦à°°à±à°¶à°¨"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "à°…à°µà±à°Ÿà±â€Œà°ªà±à°Ÿà± పరà±à°µà°¿à°•à°‚"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "దృశà±à°¯à°•à°‚ తకà±à°·à°£à°šà°¿à°¤à±à°°à°¾à°²à±"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "సంచయం"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "ఆకృతి"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "à°…à°µà±à°Ÿà±â€Œà°ªà±à°Ÿà± పరà±à°µà°¿à°•à°‚"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "దృశà±à°¯à°•à°‚ తకà±à°·à°£à°šà°¿à°¤à±à°°à°¾à°²à±"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "సంచయం"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "ఆకృతి"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "à°ªà±à°°à°¾à°§à°¾à°¨à±à°¯à°¤à°²à°¨à± తిరిగిఅమరà±à°šà±"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17203,35 -17199,35 +17789,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "à°Žà°‚à°šà±à°•à±Šà°¨à±"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "à°Žà°‚à°šà±à°•à±Šà°¨à±"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19169,20 -19165,20 +19785,36 @@@ msgstr "
msgid "Create a new profile"
msgstr "à°’à°• కొతà±à°¤ à°ªà±à°°à°µà°°à°¨à± సృషà±à°Ÿà°¿à°‚à°šà±"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "సృషà±à°Ÿà°¿à°‚à°šà±"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22485,45 -22481,45 +23117,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "ఖతి పరిమాణం పికà±à°¸à±†à°³à±à°³à°²à±‹"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "ఖతి పరిమాణం పికà±à°¸à±†à°³à±à°³à°²à±‹"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "పాఠà±à°¯ ఆపారదరà±à°¶à°•à°¤"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "పాఠà±à°¯ ఆపారదరà±à°¶à°•à°¤"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "పాఠà±à°¯à°ªà± à°…à°ªà±à°°à°®à±‡à°¯ వరà±à°£à°‚"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22532,93 -22528,93 +23200,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "నేపథà±à°¯à°‚ అపారదరà±à°¶à°•à°¤"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "నేపథà±à°¯à°‚ à°°à°‚à°—à±"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "ఛాయ అపారదరà±à°¶à°•à°¤"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "ఛాయ à°°à°‚à°—à±"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "ఛాయ కోణం"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "ఛాయ దూరం"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "నేపథà±à°¯à°‚ అపారదరà±à°¶à°•à°¤"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "నేపథà±à°¯à°‚ à°°à°‚à°—à±"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "ఛాయ అపారదరà±à°¶à°•à°¤"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "ఛాయ à°°à°‚à°—à±"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "ఛాయ కోణం"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "ఛాయ దూరం"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "à°šà°¿à°¨à±à°¨à°¦à°¿"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "à°šà°¿à°¨à±à°¨"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "పెదà±à°¦"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "పెదà±à°¦à°¦à°¿"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "సనà±à°¨à°‚"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "మందం"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "సనà±à°¨à°‚"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "మందం"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/tet.po
index ae4833e,0f037c4..1faec31
--- a/po/tet.po
+++ b/po/tet.po
@@@ -10,7 -10,7 +10,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2005-02-01 14:16+0000\n"
"Last-Translator: Elizabeth Da Conceicao Baptista <elizabeth at tonle.net>\n"
"Language-Team: Tetum\n"
@@@ -138,7 -138,7 +142,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -465,10 -465,10 +473,17 @@@ msgid "&About
msgstr "_Kona ba..."
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -511,17 -511,17 +526,29 @@@ msgid "Save...
msgstr ""
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr ""
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr ""
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -606,7 -606,7 +633,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr ""
@@@ -1296,20 -1296,20 +1327,36 @@@ msgstr "
msgid "Decoded format"
msgstr "_Archivo"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1710,7 -1710,7 +1757,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
#, fuzzy
@@@ -1795,7 -1795,7 +1846,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr ""
@@@ -1819,7 -1819,7 +1874,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -2011,7 -2011,7 +2070,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr ""
@@@ -2063,7 -2063,7 +2126,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2072,7 -2072,7 +2139,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2128,7 -2128,7 +2199,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2303,7 -2303,7 +2378,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2433,12 -2433,12 +2512,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2446,7 -2446,7 +2534,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2757,7 -2757,7 +2849,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3578,7 -3578,7 +3674,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3603,8 -3603,8 +3703,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3686,10 -3686,10 +3791,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3702,10 -3702,10 +3814,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr ""
@@@ -3714,9 -3714,9 +3833,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3955,9 -3955,9 +4080,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4387,7 -4387,7 +4518,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4588,12 -4588,12 +4723,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr ""
@@@ -5359,7 -5359,7 +5503,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "Kona ba applikação ida ne'e"
@@@ -7775,7 -7775,7 +7923,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8571,7 -8571,7 +8723,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9730,7 -9730,7 +9886,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "_Formas"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "_Formas"
@@@ -9766,7 -9766,7 +9926,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "_Formas"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "_Formas"
@@@ -9776,32 -9776,32 +9940,56 @@@
msgid "Last audio device"
msgstr "_Audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
++=======
+ #: modules/audio_output/auhal.c:166
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "HAL AudioUnit output"
msgstr "_Formas"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "_Audio"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -11026,26 -11026,26 +11214,42 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
#, fuzzy
msgid "Silver"
msgstr "_Archivo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
@@@ -11053,21 -11053,21 +11257,33 @@@
msgid "White"
msgstr "_Archivo"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11075,61 -11075,61 +11291,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11267,7 -11267,7 +11519,11 @@@ msgstr "_Archivo
msgid "Subtitle renderers using libass"
msgstr "_Archivo"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13121,10 -13121,10 +13377,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -13239,8 -13239,8 +13502,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13592,9 -13592,9 +13860,15 @@@ msgstr "
msgid "Opening"
msgstr "_Audio"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -15558,7 -15558,7 +15832,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Teletext"
msgstr "_Archivo"
@@@ -15753,7 -15753,7 +16031,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15852,9 -15852,9 +16134,15 @@@ msgstr "_Archivo
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
#, fuzzy
msgid "Save"
@@@ -16004,7 -16004,7 +16292,11 @@@ msgstr "_Video
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -16025,7 -16025,7 +16317,11 @@@ msgstr "
msgid "Backward"
msgstr "Kona ba applikação ida ne'e"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16035,7 -16035,7 +16331,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16056,89 -16056,89 +16356,160 @@@ msgstr "_Video
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "_Archivo"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "_Video"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "_Archivo"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
#, fuzzy
msgid "Effects"
msgstr "_Video"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr "_Archivo"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -16179,7 -16179,7 +16550,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16380,8 -16380,8 +16755,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
#, fuzzy
msgid "Custom"
@@@ -16480,37 -16480,37 +16860,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Remove old preferences?"
msgstr "_Preferações"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16666,7 -16666,7 +17078,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Lock Aspect Ratio"
msgstr "Kona ba applikação ida ne'e"
@@@ -16805,7 -16805,7 +17221,11 @@@ msgstr "
msgid "Hide Others"
msgstr "_Video"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show All"
msgstr "_Archivo"
@@@ -16902,15 -16902,15 +17322,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16928,30 -16928,30 +17360,56 @@@ msgstr "_Video
msgid "Audio Device"
msgstr "_Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Fullscreen Video Device"
msgstr "_Video"
@@@ -16961,7 -16961,7 +17419,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "_Archivo"
@@@ -17210,7 -17210,7 +17672,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -17398,7 -17398,7 +17864,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr "_Archivo"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
#, fuzzy
msgid "Font size"
@@@ -17652,13 -17652,13 +18122,21 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
#, fuzzy
msgid "Preferences"
msgstr "_Preferações"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17854,26 -17854,22 +18332,42 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Display Settings"
msgstr "_Formas"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
#, fuzzy
msgid "Font color"
msgstr "_Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
@@@ -17881,113 -17877,113 +18375,205 @@@
msgid "Font"
msgstr "_Video"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "_Archivo"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "_Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "_Audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
#, fuzzy
msgid "Display"
msgstr "_Formas"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Output module"
msgstr "_Video"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
++=======
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Video snapshots"
msgstr "_Video"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
++=======
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Folder"
msgstr "_Archivo"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
#, fuzzy
msgid "Reset Preferences"
msgstr "_Preferações"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18000,37 -17996,37 +18586,67 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose"
msgstr "Sai husi programa ida ne'e"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Invalid combination"
msgstr "_Navigação"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -20100,21 -20096,21 +20716,37 @@@ msgstr "_Archivo
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
#, fuzzy
msgid "Create"
msgstr "_Audio"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "You must set a name for the profile."
msgstr "_Archivo"
@@@ -23647,47 -23643,47 +24279,83 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr "_Archivo"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font size in pixels"
msgstr "_Video"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "Kona ba applikação ida ne'e"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23696,97 -23692,97 +24364,177 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "Kona ba applikação ida ne'e"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "Kona ba applikação ida ne'e"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "_Audio"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Smaller"
msgstr "_Archivo"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/th.po
index b6facf2,2e27395..1c4d31d
--- a/po/th.po
+++ b/po/th.po
@@@ -4,15 -4,14 +4,24 @@@
#
# Translators:
# Thanakrit Chomphuming <jernghan at gmail.com>, 2011-3013.
++<<<<<<< HEAD
+# rigelenrique <d.chalermpon at gmail.com>, 2013
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
# <develop5 at datawiz.co.th>, 2006.
msgid ""
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-12-07 11:41+0000\n"
+"Last-Translator: rigelenrique <d.chalermpon at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-09-26 04:58+0000\n"
+ "Last-Translator: jerng <jernghan at gmail.com>\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Language-Team: Thai (http://www.transifex.com/projects/p/vlc-trans/language/"
"th/)\n"
"Language: th\n"
@@@ -101,7 -100,7 +110,11 @@@ msgstr "ค่าตั้งเสีà
#: include/vlc_config_cat.h:58 include/vlc_config_cat.h:80
#: modules/gui/qt4/ui/profiles.h:733 modules/gui/qt4/ui/profiles.h:743
msgid "Filters"
++<<<<<<< HEAD
+msgstr "ตัวà¸à¸£à¸à¸‡"
++=======
+ msgstr "ตัวผันค่า"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:59
msgid "Audio filters are used to process the audio stream."
@@@ -139,7 -138,7 +152,11 @@@ msgstr "ค่าตั้งà¹à¸¥à¸°à
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -457,10 -456,10 +474,17 @@@ msgid "&About
msgstr "&เà¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸š"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -499,17 -498,17 +523,29 @@@ msgid "Save...
msgstr "บันทึà¸..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "เล่นซ้ำทั้งหมด"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "เล่นซ้ำตัวเดียว"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -612,7 -611,7 +648,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "ปิดใช้"
@@@ -839,7 -838,7 +879,11 @@@ msgstr "เติม --advanced ลงà
msgid "%u module was not displayed because it only has advanced options.\n"
msgid_plural ""
"%u modules were not displayed because they only have advanced options.\n"
++<<<<<<< HEAD
+msgstr[0] "โมดูล %u ไม่ถูà¸à¹à¸ªà¸”งผลเนื่à¸à¸‡à¸ˆà¸²à¸à¸¡à¸µà¹€à¸žà¸µà¸¢à¸‡à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸‚ั้นสูงเท่านั้น\n"
++=======
+ msgstr[0] ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/help.c:704 src/config/help.c:708
msgid ""
@@@ -868,8 -867,6 +912,11 @@@ msgid "
"\n"
"Dumped content to vlc-help.txt file.\n"
msgstr ""
++<<<<<<< HEAD
+"\n"
+"ถ่ายข้à¸à¸¡à¸¹à¸¥à¹„ปยังไฟล์ vlc-help.txt\n"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/help.c:841
msgid ""
@@@ -1334,20 -1331,20 +1381,36 @@@ msgstr "à¸à¸±à¸•à¸£à¸²à¹€à¸Ÿà¸£à¸¡
msgid "Decoded format"
msgstr "รูปà¹à¸šà¸šà¸à¸²à¸£à¸à¹ˆà¸²à¸™à¸£à¸«à¸±à¸ª"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "ไม่สามารถเปิดส่วนนำเข้าขà¸à¸‡à¸„ุณได้"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "ไม่สามารถเปิดส่วนนำเข้าขà¸à¸‡à¸„ุณได้"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC ไม่สามารถเปิด MRL '%s' ดูรายละเà¸à¸µà¸¢à¸”ที่ปูม"
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC ไม่สามารถจำรูปà¹à¸šà¸šà¸‚à¸à¸‡à¸ªà¹ˆà¸§à¸™à¸™à¸³à¹€à¸‚้าได้"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC ไม่สามารถจำรูปà¹à¸šà¸šà¸‚à¸à¸‡à¸ªà¹ˆà¸§à¸™à¸™à¸³à¹€à¸‚้าได้"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1749,7 -1746,7 +1812,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1831,7 -1828,7 +1898,11 @@@ msgstr "ตัวเลืà¸à¸à¸™à¸µà
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "ไม่ใช้"
@@@ -1855,7 -1852,7 +1926,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "เปิดใช้วีดิทัศน์"
@@@ -2047,7 -2044,7 +2122,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "à¸à¸¢à¸¹à¹ˆà¸‚้างบนเสมà¸"
@@@ -2098,7 -2095,7 +2177,11 @@@ msgstr "ซ่à¸à¸™à¹€à¸„à¸à¸£à¹Œà¹€à
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2107,7 -2104,7 +2190,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2163,7 -2160,7 +2250,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "ส่วนตà¸à¹à¸•à¹ˆà¸‡à¸«à¸™à¹‰à¸²à¸•à¹ˆà¸²à¸‡"
@@@ -2334,7 -2331,7 +2425,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "ข้ามเฟรม"
@@@ -2462,12 -2459,12 +2557,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2475,7 -2472,7 +2579,11 @@@ msgid "Default
msgstr "ปริยาย"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2782,7 -2779,7 +2890,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3592,19 -3589,19 +3704,31 @@@ msgstr "
#: src/libvlc-module.c:1175 modules/gui/qt4/ui/sprefs_interface.h:533
msgid "Display playlist tree"
++<<<<<<< HEAD
+msgstr "à¹à¸ªà¸”งผังเล่นà¹à¸šà¸šà¹à¸œà¸™à¸œà¸±à¸‡à¸•à¹‰à¸™à¹„ม้"
++=======
+ msgstr "à¹à¸ªà¸”งโครงข่ายผังเล่น"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1177
msgid ""
"The playlist can use a tree to categorize some items, like the contents of a "
"directory."
++<<<<<<< HEAD
+msgstr "ผังเล่นสามารถà¹à¸ªà¸”งรายà¸à¸²à¸£à¹€à¸›à¹‡à¸™à¸«à¸¡à¸§à¸”หมู่à¹à¸šà¸šà¹à¸œà¸™à¸œà¸±à¸‡à¸•à¹‰à¸™à¹„ม้ ตามที่เà¸à¹‡à¸šà¹à¸Ÿà¹‰à¸¡à¸‚à¸à¸‡à¸£à¸²à¸¢à¸à¸²à¸£à¸•à¹ˆà¸²à¸‡à¹† ได้"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1186
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "มà¸à¸‡à¸‚้าม"
@@@ -3614,7 -3611,7 +3738,11 @@@ msgstr "à¸à¸²à¸£à¸„วบคุมรà
#: src/libvlc-module.c:1197
msgid "Position Control"
++<<<<<<< HEAD
+msgstr "ควบคุมตำà¹à¸«à¸™à¹ˆà¸‡à¸à¸²à¸£à¹à¸ªà¸”ง"
++=======
+ msgstr "ควบคุมตำà¹à¸«à¸™à¹ˆà¸‡à¹€à¸§à¸¥à¸²à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1199
msgid "MouseWheel up-down axis Control"
@@@ -3625,13 -3622,13 +3753,22 @@@ msgid "
"The MouseWheel up-down (vertical) axis can control volume, position or "
"mousewheel event can be ignored"
msgstr ""
++<<<<<<< HEAD
+"à¸à¸²à¸£à¹€à¸¥à¸·à¹ˆà¸à¸™à¸›à¸¸à¹ˆà¸¡à¸¥à¹‰à¸à¹€à¸¥à¸·à¹ˆà¸à¸™à¹€à¸¡à¸²à¸ªà¹Œà¸‚ึ้น-ลงตามà¹à¸™à¸§(ตั้ง) สามารถใช้ควบคุม ระดับเสียง ตำà¹à¸«à¸™à¹ˆà¸‡à¸à¸²à¸£à¹à¸ªà¸”ง "
++=======
+ "à¸à¸²à¸£à¹€à¸¥à¸·à¹ˆà¸à¸™à¸›à¸¸à¹ˆà¸¡à¸¥à¹‰à¸à¹€à¸¥à¸·à¹ˆà¸à¸™à¹€à¸¡à¸²à¸ªà¹Œà¸‚ึ้น-ลงตามà¹à¸™à¸§(ตั้ง) สามารถใช้ควบคุม ระดับเสียง ตำà¹à¸«à¸™à¹ˆà¸‡à¹€à¸§à¸¥à¸²à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™ "
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"หรืà¸à¸¡à¸à¸‡à¸‚้ามà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸‚à¸à¸‡à¸¡à¸±à¸™à¹„ปà¸à¹‡à¹„ด้"
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3711,10 -3708,10 +3848,17 @@@ msgid "Slower (fine)
msgstr "ช้าลง (ละเà¸à¸µà¸¢à¸”)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3727,10 -3724,10 +3871,17 @@@ msgid "Select the hotkey to use to ski
msgstr "เลืà¸à¸à¸›à¸¸à¹ˆà¸¡à¸¥à¸±à¸”ที่จะใช้เพื่à¸à¸‚้ามไปเล่นรายà¸à¸²à¸£à¸–ัดไปขà¸à¸‡à¸œà¸±à¸‡à¹€à¸¥à¹ˆà¸™"
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²"
@@@ -3739,9 -3736,9 +3890,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "เลืà¸à¸à¸›à¸¸à¹ˆà¸¡à¸¥à¸±à¸”ที่จะใช้เพื่à¸à¸‚้ามไปเล่นรายà¸à¸²à¸£à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸‚à¸à¸‡à¸œà¸±à¸‡à¹€à¸¥à¹ˆà¸™"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3758,11 -3755,11 +3915,19 @@@ msgstr "เลืà¸à¸à¸›à¸¸à¹ˆà¸¡à¸—à
#: modules/video_filter/rss.c:200 modules/gui/qt4/ui/sprefs_subtitles.h:289
#: modules/gui/qt4/ui/video_effects.h:1367
msgid "Position"
++<<<<<<< HEAD
+msgstr "ตำà¹à¸«à¸™à¹ˆà¸‡à¸à¸²à¸£à¹à¸ªà¸”ง"
+
+#: src/libvlc-module.c:1230
+msgid "Select the hotkey to display the position."
+msgstr "เลืà¸à¸à¸›à¸¸à¹ˆà¸¡à¸—ี่จะเลืà¸à¸à¸•à¸³à¹à¸«à¸™à¹ˆà¸‡à¸à¸²à¸£à¹à¸ªà¸”ง"
++=======
+ msgstr "ตำà¹à¸«à¸™à¹ˆà¸‡à¹€à¸§à¸¥à¸²à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™"
+
+ #: src/libvlc-module.c:1230
+ msgid "Select the hotkey to display the position."
+ msgstr "เลืà¸à¸à¸›à¸¸à¹ˆà¸¡à¸—ี่จะใช้à¹à¸ªà¸”งตำà¹à¸«à¸™à¹ˆà¸‡à¹€à¸§à¸¥à¸²à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:1232
msgid "Very short backwards jump"
@@@ -3976,9 -3973,9 +4141,15 @@@ msgid "Select the key to decrease audi
msgstr "เลืà¸à¸à¸›à¸¸à¹ˆà¸¡à¸—ี่จะใช้ลดระดับเสียง"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "ปิดเสียง"
@@@ -4392,7 -4389,7 +4563,11 @@@ msgstr "สับเปลี่ยนà
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "จับภาพ"
@@@ -4591,12 -4588,12 +4766,21 @@@ msgstr "à¸à¸³à¸¥à¸±à¸‡à¸”าวน์à
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "ยà¸à¹€à¸¥à¸´à¸"
@@@ -5354,7 -5351,7 +5538,11 @@@ msgstr "ตัดขà¸à¸š
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "à¸à¸±à¸•à¸£à¸²à¸ªà¹ˆà¸§à¸™à¸ าพ"
@@@ -7650,7 -7647,7 +7838,11 @@@ msgstr "ส่วนนำเข้าà
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "หน้าจà¸"
@@@ -8382,7 -8379,7 +8574,11 @@@ msgstr "สุดเสียง #
msgid "Volume Set"
msgstr "ตั้งค่าระดับเสียง"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -8899,7 -8896,7 +9095,11 @@@ msgstr "
#: modules/audio_filter/chorus_flanger.c:91
msgid "Wet mix"
++<<<<<<< HEAD
+msgstr "เว็ตมิà¸à¸‹à¹Œ"
++=======
+ msgstr "Wet mix"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/chorus_flanger.c:91
msgid "Level of delayed signal"
@@@ -8907,7 -8904,7 +9107,11 @@@ msgstr "
#: modules/audio_filter/chorus_flanger.c:93
msgid "Dry Mix"
++<<<<<<< HEAD
+msgstr "ไดรย์มิà¸à¸‹à¹Œ"
++=======
+ msgstr "Dry Mix"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/chorus_flanger.c:93
msgid "Level of input signal"
@@@ -9031,11 -9028,11 +9235,19 @@@ msgstr "ตัวà¸à¹ˆà¸²à¸™à¸£à¸«à¸±à
#: modules/audio_filter/equalizer.c:58
msgid "Equalizer preset"
++<<<<<<< HEAD
+msgstr "ชุดค่าตั้งตัวปรับสมดุล"
+
+#: modules/audio_filter/equalizer.c:59
+msgid "Preset to use for the equalizer."
+msgstr "ชุดค่าตั้งที่จะใช้สำหรับตัวปรับสมดุล"
++=======
+ msgstr "ค่าสำเร็จรูปตัวปรับสมดุล"
+
+ #: modules/audio_filter/equalizer.c:59
+ msgid "Preset to use for the equalizer."
+ msgstr "ค่าสำเร็จรูปที่จะใช้สำหรับตัวปรับสมดุล"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/equalizer.c:61
msgid "Bands gain"
@@@ -9371,13 -9368,13 +9583,21 @@@ msgstr "ระยะขà¸à¸‡à¸«à¹‰à¸à
#: modules/gui/macosx/AudioEffects.m:132
#: modules/gui/qt4/components/extended_panels.cpp:1403
msgid "Wet"
++<<<<<<< HEAD
+msgstr "เว็ต"
++=======
+ msgstr "Wet"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/spatializer/spatializer.cpp:64
#: modules/gui/macosx/AudioEffects.m:133
#: modules/gui/qt4/components/extended_panels.cpp:1404
msgid "Dry"
++<<<<<<< HEAD
+msgstr "ไดรย์"
++=======
+ msgstr "Dry"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/spatializer/spatializer.cpp:67
#: modules/gui/macosx/AudioEffects.m:134
@@@ -9426,7 -9423,7 +9646,11 @@@ msgstr "
#: modules/audio_filter/stereo_widen.c:70
msgid "Dry mix"
++<<<<<<< HEAD
+msgstr "ไดรย์มิà¸à¸‹à¹Œ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_filter/stereo_widen.c:71
msgid "Level of input signal of original channel."
@@@ -9495,7 -9492,7 +9719,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "ส่วนส่งเสียง ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "ส่วนส่งเสียงล้มเหลว"
@@@ -9528,7 -9525,7 +9756,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9536,33 -9533,33 +9768,60 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
+#, c-format
+msgid "%s (Encoded Output)"
+msgstr "%s (ที่ลงรหัสà¹à¸¥à¹‰à¸§)"
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
+ #, c-format
+ msgid "%s (Encoded Output)"
+ msgstr "%s (ผลลัพธ์ที่ลงรหัส)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/directx.c:108
msgid "Output device"
@@@ -9616,7 -9613,7 +9875,11 @@@ msgstr "
#: modules/audio_output/file.c:105
#: share/lua/http/dialogs/create_stream.html:382
msgid "Output file"
++<<<<<<< HEAD
+msgstr "à¹à¸Ÿà¹‰à¸¡à¸—ี่ได้"
++=======
+ msgstr "à¹à¸Ÿà¹‰à¸¡à¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/audio_output/file.c:106
msgid "File to which the audio samples will be written to. (\"-\" for stdout"
@@@ -10728,46 -10725,46 +10991,74 @@@ msgstr "เงา
msgid "Outline"
msgstr "เส้นขà¸à¸š"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "ดำ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "เทา"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "เงิน"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "ขาว"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "สีà¹à¸”งเข้ม"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "à¹à¸”ง"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10775,61 -10772,61 +11066,97 @@@ msgid "Fuchsia
msgstr "สีà¹à¸”งà¸à¸¡à¸¡à¹ˆà¸§à¸‡"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "เหลืà¸à¸‡"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "สีเขียวเข้มปนเหลืà¸à¸‡"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "เขียว"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "สีน้ำเงินà¸à¸¡à¹€à¸‚ียว "
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "สีเหลืà¸à¸‡à¹à¸à¸¡à¹€à¸‚ียว"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "ม่วง"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "สีน้ำเงินเข้ม"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "น้ำเงิน"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10959,7 -10956,7 +11286,11 @@@ msgstr "บทบรรยาย (ขà¸
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -11027,7 -11024,7 +11358,11 @@@ msgstr "ตัวà¸à¹ˆà¸²à¸™à¸£à¸«à¸±à
#: modules/codec/qsv.c:56
msgid "Enable software mode"
++<<<<<<< HEAD
+msgstr "เปิดใช้รูปà¹à¸šà¸šà¸‹à¸à¸£à¹Œà¸Ÿà¹à¸§à¸£à¹Œ"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/qsv.c:57
msgid ""
@@@ -12715,7 -12712,7 +13050,11 @@@ msgstr "
#: modules/codec/x264.c:410
msgid "Default preset setting used"
++<<<<<<< HEAD
+msgstr "ค่าตั้งปริยายขà¸à¸‡à¸Šà¸¸à¸”ค่าตั้งที่ใช้"
++=======
+ msgstr "ค่าตั้งปริยายขà¸à¸‡à¸„่าสำเร็จรูปที่ใช้"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/codec/x264.c:412
msgid "x264 advanced options."
@@@ -12750,10 -12747,10 +13089,17 @@@ msgid "Fast
msgstr "เร็ว"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "ปà¸à¸•à¸´"
@@@ -12858,8 -12855,8 +13204,13 @@@ msgid "D-Bus control interface
msgstr "ส่วนติดต่à¸à¸„วบคุม D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13197,9 -13194,9 +13548,15 @@@ msgstr "
msgid "Opening"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸›à¸´à¸”"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "พัà¸à¸&ารเล่น"
@@@ -15079,7 -15076,7 +15436,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "ข่าวข้à¸à¸„วาม"
@@@ -15221,7 -15218,7 +15582,11 @@@ msgstr "เà¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¹‚à
#: modules/gui/macosx/about.m:95 modules/gui/qt4/dialogs/help.cpp:125
msgid "Credits"
++<<<<<<< HEAD
+msgstr "เครดิต"
++=======
+ msgstr "เคดิต"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/about.m:98 modules/gui/macosx/MainMenu.m:450
#: modules/gui/qt4/dialogs/help.cpp:119
@@@ -15260,7 -15257,7 +15625,11 @@@ msgid "VLC media player Help
msgstr "วิธีใช้โปรà¹à¸à¸£à¸¡à¹€à¸¥à¹ˆà¸™à¸ªà¸·à¹ˆà¸ VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "ดัชนี"
@@@ -15348,9 -15345,9 +15717,15 @@@ msgstr "ใส่ชื่à¸à¹ƒà¸«à¹‰à
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "บันทึà¸"
@@@ -15358,12 -15355,12 +15733,20 @@@
#: modules/gui/macosx/AudioEffects.m:399 modules/gui/macosx/AudioEffects.m:738
#: modules/gui/macosx/VideoEffects.m:940
msgid "Remove a preset"
++<<<<<<< HEAD
+msgstr "ลบชุดค่าตั้งà¸à¸à¸"
++=======
+ msgstr "ลบค่าสำเร็จรูปà¸à¸à¸"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:400 modules/gui/macosx/AudioEffects.m:739
#: modules/gui/macosx/VideoEffects.m:941
msgid "Select the preset you would like to remove:"
++<<<<<<< HEAD
+msgstr "เลืà¸à¸à¸Šà¸¸à¸”ค่าตั้งที่คุณต้à¸à¸‡à¸à¸²à¸£à¸¥à¸šà¸à¸à¸:"
++=======
+ msgstr "เลืà¸à¸à¸„่าสำเร็จรูปที่คุณต้à¸à¸‡à¸à¸²à¸£à¸¥à¸šà¸à¸à¸:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:401 modules/gui/macosx/AudioEffects.m:740
#: modules/gui/macosx/bookmarks.m:95 modules/gui/macosx/ConvertAndSave.m:381
@@@ -15373,7 -15370,7 +15756,11 @@@ msgstr "เà¸à¸²à¸à¸à¸
#: modules/gui/macosx/AudioEffects.m:461
msgid "Add new Preset..."
++<<<<<<< HEAD
+msgstr "เพิ่มชุดค่าตั้งตัวใหม่..."
++=======
+ msgstr "เพิ่มค่าสำเร็จรูปตัวใหม่..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:466
msgid "Organize Presets..."
@@@ -15381,7 -15378,7 +15768,11 @@@ msgstr "จัดà¸à¸²à¸£à¹‚พรไà
#: modules/gui/macosx/AudioEffects.m:639
msgid "Save current selection as new preset"
++<<<<<<< HEAD
+msgstr "บันทึà¸à¸„่าที่à¸à¸³à¸¥à¸±à¸‡à¹ƒà¸Šà¹‰à¸à¸¢à¸¹à¹ˆà¹€à¸›à¹‡à¸™à¸Šà¸¸à¸”ค่าตั้งตัวใหม่"
++=======
+ msgstr "บันทึà¸à¸„่าที่à¸à¸³à¸¥à¸±à¸‡à¹ƒà¸Šà¹‰à¸à¸¢à¸¹à¹ˆà¹€à¸›à¹‡à¸™à¸„่าสำเร็จรูปตัวใหม่"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/AudioEffects.m:640
msgid "Enter a name for the new preset:"
@@@ -15489,7 -15486,7 +15880,11 @@@ msgstr "ไม่พบส่วนนà
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "ช่วงจำเพาะ"
@@@ -15509,7 -15506,7 +15904,11 @@@ msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¹€à
msgid "Backward"
msgstr "à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15519,7 -15516,7 +15918,11 @@@ msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¹„à
msgid "Forward"
msgstr "ถัดไป"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15539,34 -15536,26 +15942,54 @@@ msgstr "เปิด/ปิดà¸à¸²à¸£
msgid "Click to enable fullscreen video playback."
msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¹€à¸›à¸´à¸”ใช้à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™à¸§à¸µà¸”ิทัศน์à¹à¸šà¸šà¹€à¸•à¹‡à¸¡à¸ˆà¸"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "คลิà¸à¸„้างไว้เพื่à¸à¹€à¸¥à¹ˆà¸™à¸¢à¹‰à¸à¸™à¸à¸¥à¸±à¸š"
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "คลิà¸à¸„้างไว้เพื่à¸à¹€à¸£à¹ˆà¸‡à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™à¹„ปข้างหน้า"
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¸«à¸¢à¸¸à¸”à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™"
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "à¹à¸ªà¸”ง/ซ่à¸à¸™ ผังเล่น"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¸«à¸¢à¸¸à¸”à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™"
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "à¹à¸ªà¸”ง/ซ่à¸à¸™ ผังเล่น"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "เล่นซ้ำ"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -15574,51 -15563,59 +15997,102 @@@ msgstr "
"คลิà¸à¹€à¸žà¸·à¹ˆà¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸¹à¸›à¹à¸šà¸šà¸à¸²à¸£à¹€à¸¥à¹ˆà¸™à¸‹à¹‰à¸³ ซึ่งมีà¸à¸¢à¸¹à¹ˆ 3 à¹à¸šà¸š: เล่นซ้ำรายà¸à¸²à¸£à¹€à¸”ียว เล่นซ้ำทั้งหมด "
"à¹à¸¥à¸°à¸›à¸´à¸”à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™à¸‹à¹‰à¸³"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "เล่นสลับเพลง"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¹€à¸›à¸´à¸”หรืà¸à¸›à¸´à¸”ใช้à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™à¸ªà¸¸à¹ˆà¸¡"
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "เล่นสลับเพลง"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¹€à¸›à¸´à¸”หรืà¸à¸›à¸´à¸”ใช้à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™à¸ªà¸¸à¹ˆà¸¡"
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¸›à¸´à¸”เสียงหรืà¸à¹€à¸›à¸´à¸”ใช้เสียง"
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "สุดเสียง"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¹€à¸£à¹ˆà¸‡à¸£à¸°à¸”ับเสียงไปยังระดับสูงสุด"
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¸›à¸´à¸”เสียงหรืà¸à¹€à¸›à¸´à¸”ใช้เสียง"
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "สุดเสียง"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¹€à¸£à¹ˆà¸‡à¸£à¸°à¸”ับเสียงไปยังระดับสูงสุด"
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "ลูà¸à¹€à¸¥à¹ˆà¸™"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¹„ปยังรายà¸à¸²à¸£à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸‚à¸à¸‡à¸œà¸±à¸‡à¹€à¸¥à¹ˆà¸™"
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¹„ปยังรายà¸à¸²à¸£à¸–ัดไปขà¸à¸‡à¸œà¸±à¸‡à¹€à¸¥à¹ˆà¸™"
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¹„ปยังรายà¸à¸²à¸£à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸‚à¸à¸‡à¸œà¸±à¸‡à¹€à¸¥à¹ˆà¸™"
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "คลิà¸à¹€à¸žà¸·à¹ˆà¸à¹„ปยังรายà¸à¸²à¸£à¸–ัดไปขà¸à¸‡à¸œà¸±à¸‡à¹€à¸¥à¹ˆà¸™"
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "คลิà¸à¸„้างไว้เพื่à¸à¹€à¸¥à¹ˆà¸™à¸¢à¹‰à¸à¸™à¸à¸¥à¸±à¸š"
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "คลิà¸à¸„้างไว้เพื่à¸à¹€à¸£à¹ˆà¸‡à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™à¹„ปข้างหน้า"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "à¹à¸›à¸¥à¸‡ & ทำà¸à¸£à¸°à¹à¸ª"
@@@ -15654,7 -15651,7 +16128,11 @@@ msgstr "เลืà¸à¸à¸•à¸³à¹à¸«à¸™à
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15837,8 -15834,8 +16315,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "à¸à¸³à¸«à¸™à¸”เà¸à¸‡"
@@@ -15931,36 -15928,36 +16414,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "ไม่ต้à¸à¸‡à¸–ามà¸à¸µà¸"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™à¸ªà¸·à¹ˆà¸à¸‚à¸à¸‡ VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "ไม่พบปูมความเสียหาย"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "à¸à¸²à¸£à¹€à¸¥à¹ˆà¸™à¸ªà¸·à¹ˆà¸à¸‚à¸à¸‡ VLC"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "ไม่พบปูมความเสียหาย"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "ทำต่à¸"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "ลบค่าปรับà¹à¸•à¹ˆà¸‡à¸•à¸±à¸§à¹€à¸à¹ˆà¸²à¸à¸à¸"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "ลบค่าปรับà¹à¸•à¹ˆà¸‡à¸•à¸±à¸§à¹€à¸à¹ˆà¸²à¸à¸à¸"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16121,7 -16118,7 +16636,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "ล็à¸à¸„à¸à¸±à¸•à¸£à¸²à¸ªà¹ˆà¸§à¸™à¸ าพ"
@@@ -16147,7 -16144,7 +16666,11 @@@ msgstr "à¹à¸ªà¸”งปุ่มควà
#: modules/gui/macosx/macosx.m:119
msgid "Shows the audio effects button in the main window."
++<<<<<<< HEAD
+msgstr "à¹à¸ªà¸”งปุ่มลูà¸à¹€à¸¥à¹ˆà¸™à¹€à¸ªà¸µà¸¢à¸‡à¹ƒà¸™à¸ªà¹ˆà¸§à¸™à¸«à¸™à¹‰à¸²à¸•à¹ˆà¸²à¸‡à¸«à¸¥à¸±à¸"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/macosx.m:121 modules/gui/macosx/MainMenu.m:344
msgid "Show Sidebar"
@@@ -16250,7 -16247,7 +16773,11 @@@ msgstr "ซ่à¸à¸™ VLC
msgid "Hide Others"
msgstr "ซ่à¸à¸™à¸•à¸±à¸§à¸à¸·à¹ˆà¸™"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "à¹à¸ªà¸”งทั้งหมด"
@@@ -16335,15 -16332,15 +16862,27 @@@ msgstr "à¸à¸²à¸£à¸›à¸£à¸°à¸ªà¸²à¸™à¸£à
msgid "A→B Loop"
msgstr "เล่นวนช่วง A→B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "à¸à¸à¸à¹€à¸¡à¸·à¹ˆà¸à¸ˆà¸šà¸à¸²à¸£à¹€à¸¥à¹ˆà¸™à¹ƒà¸™à¸œà¸±à¸‡à¹à¸¥à¹‰à¸§"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "ช่วงถัดไป"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "à¸à¸à¸à¹€à¸¡à¸·à¹ˆà¸à¸ˆà¸šà¸à¸²à¸£à¹€à¸¥à¹ˆà¸™à¹ƒà¸™à¸œà¸±à¸‡à¹à¸¥à¹‰à¸§"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "ช่วงถัดไป"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "ช่วงà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²"
@@@ -16359,30 -16356,30 +16898,56 @@@ msgstr "ลดระดับเสีà
msgid "Audio Device"
msgstr "à¸à¸¸à¸›à¸à¸£à¸“์เล่นเสียง"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "ขนาดครึ่งหนึ่ง"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "ขนาดปà¸à¸•à¸´"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "ขนาดสà¸à¸‡à¹€à¸—่า"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "พà¸à¸”ีà¸à¸±à¸šà¸«à¸™à¹‰à¸²à¸ˆà¸"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "ขนาดครึ่งหนึ่ง"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "ขนาดปà¸à¸•à¸´"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "ขนาดสà¸à¸‡à¹€à¸—่า"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "พà¸à¸”ีà¸à¸±à¸šà¸«à¸™à¹‰à¸²à¸ˆà¸"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16391,7 -16388,7 +16956,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "เพิ่มà¹à¸Ÿà¹‰à¸¡à¸šà¸—บรรยาย..."
@@@ -16619,7 -16616,7 +17188,11 @@@ msgid "Play another media synchronously
msgstr "เล่นสื่à¸à¸à¸·à¹ˆà¸™à¸œà¸ªà¸¡"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "เลืà¸à¸..."
@@@ -16790,7 -16787,7 +17363,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "à¸à¸²à¸£à¸¥à¸‡à¸£à¸«à¸±à¸ªà¸šà¸—บรรยาย"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "ขนาดà¹à¸šà¸šà¸à¸±à¸à¸©à¸£"
@@@ -17019,12 -17016,12 +17596,20 @@@ msgstr "เà¸à¸´à¸”ข้à¸à¸‚ัดà
msgid "VLC was unable to save the meta data."
msgstr "VLC ไม่สามารถบันทึà¸à¸‚้à¸à¸¡à¸¹à¸¥à¸à¸³à¸à¸±à¸šà¹„ด้"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "ปรับà¹à¸•à¹ˆà¸‡"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "เรียà¸à¸„ืนค่าทั้งหมด"
@@@ -17201,130 -17198,125 +17786,239 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "พัภiTunes ระหว่างที่เล่น VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "รหัสà¸à¸±à¸à¸‚ระปริยาย"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "ค่าตั้งส่วนà¹à¸ªà¸”งผล"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "รหัสà¸à¸±à¸à¸‚ระปริยาย"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "ค่าตั้งส่วนà¹à¸ªà¸”งผล"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "สีà¹à¸šà¸šà¸à¸±à¸à¸©à¸£"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "à¹à¸šà¸šà¸à¸±à¸à¸©à¸£"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "ภาษาบทบรรยาย"
+
+#: modules/gui/macosx/simple_prefs.m:384
+#: modules/gui/qt4/ui/sprefs_subtitles.h:292
+msgid "Preferred subtitle language"
+msgstr "ภาษาบทบรรยายที่ควรเลืà¸à¸à¹ƒà¸Šà¹‰"
+
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "เปิดใช้ OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "ภาษาบทบรรยาย"
+
+ #: modules/gui/macosx/simple_prefs.m:383
+ #: modules/gui/qt4/ui/sprefs_subtitles.h:292
+ msgid "Preferred subtitle language"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "เปิดใช้ OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "ความทึบà¹à¸ªà¸‡"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "บังคับใช้ตัวหนา"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "บังคับใช้ตัวหนา"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "สีเส้นขà¸à¸š"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "ความหนาเส้นขà¸à¸š"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "à¹à¸ªà¸”ง"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "มà¸à¸”ูลà¹à¸ªà¸”งผล"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "ภาพถ่ายวิดีทัศน์"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "โฟลเดà¸à¸£à¹Œ"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "รูปà¹à¸šà¸š"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "คำนำหน้า"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "ตรวงครั้งสุดท้ายเมื่à¸: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "มà¸à¸”ูลà¹à¸ªà¸”งผล"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "ภาพถ่ายวิดีทัศน์"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "โฟลเดà¸à¸£à¹Œ"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "รูปà¹à¸šà¸š"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "คำนำหน้า"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "ตรวงครั้งสุดท้ายเมื่à¸: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "ความหน่วงต่ำสุด"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "ความหน่วงต่ำ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "ความหน่วงสูง"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "ความหน่วงสูงขึ้น"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "เรียà¸à¸„ืนค่าปรับà¹à¸•à¹ˆà¸‡"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17337,35 -17329,35 +18031,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "เลืà¸à¸"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "เลืà¸à¸"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "ปุ่มร่วมผิดรูปà¹à¸šà¸š"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "ปุ่มร่วมผิดรูปà¹à¸šà¸š"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -17769,12 -17761,11 +18493,19 @@@ msgstr "รูปà¹à¸šà¸šà¹€à¸ªà¸µà¸¢à
#: modules/gui/macosx/wizard.m:198
msgid "Vorbis is a free audio codec (useable with OGG)"
++<<<<<<< HEAD
+msgstr "Vorbis เป็นตัวลง-à¸à¹ˆà¸²à¸™à¸£à¸«à¸±à¸ªà¹€à¸ªà¸µà¸¢à¸‡à¹à¸šà¸šà¹€à¸›à¸´à¸”ฟรี (สามารถใช้à¸à¸±à¸š OGG ได้)"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:201
msgid "FLAC is a lossless audio codec (useable with OGG and RAW)"
msgstr ""
++<<<<<<< HEAD
+"FLAC เป็นตัวลง-à¸à¹ˆà¸²à¸™à¸£à¸«à¸±à¸ªà¹€à¸ªà¸µà¸¢à¸‡à¸—ี่ปราศจาà¸à¸à¸²à¸£à¸ªà¸¹à¸à¹€à¸ªà¸µà¸¢à¸„ุณภาพเสียง (สามารถใช้à¸à¸±à¸š OGG à¹à¸¥à¸° RAW ได้)"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:204
msgid "A free audio codec dedicated to compression of voice (useable with OGG)"
@@@ -18310,7 -18301,7 +19041,11 @@@ msgstr " <, > ตà¸à
#: modules/gui/ncurses.c:890
#, c-format
msgid " <left>,<right> Seek -/+ 1%%"
++<<<<<<< HEAD
+msgstr " <ซ้าย>,<ขวา> ปรับค่า -/+ 1%%"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:891
msgid " a, z Volume Up/Down"
@@@ -18369,7 -18360,7 +19104,11 @@@ msgstr " / ตรà
#: modules/gui/ncurses.c:911
msgid " ; Look for the next item"
++<<<<<<< HEAD
+msgstr " ; มà¸à¸‡à¸«à¸²à¸£à¸²à¸¢à¸à¸²à¸£à¸–ัดไป"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:912
msgid " A Add an entry"
@@@ -18408,7 -18399,7 +19147,11 @@@ msgstr "[ตัวเล่น]
#: modules/gui/ncurses.c:930
#, c-format
msgid " <up>,<down> Seek +/-5%%"
++<<<<<<< HEAD
+msgstr " <ขึ้น>,<ลง> ปรับค่า +/-5%%"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/ncurses.c:1050
msgid "[Repeat] "
@@@ -19006,7 -18997,7 +19749,11 @@@ msgstr "
#: modules/gui/qt4/components/open_panels.cpp:900
msgid "TV - digital"
++<<<<<<< HEAD
+msgstr "โทรทัศน์ - ดิจิทัล"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/open_panels.cpp:903
msgid "Tuner card"
@@@ -19030,7 -19021,7 +19777,11 @@@ msgstr "à¹à¸šà¸™à¸”์วิดท์
#: modules/gui/qt4/components/open_panels.cpp:1021
msgid "TV - analog"
++<<<<<<< HEAD
+msgstr "โทรทัศน์ - à¹à¸à¸™à¸°à¸¥à¹‡à¸à¸"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/open_panels.cpp:1024
msgid "Device name"
@@@ -19269,7 -19260,7 +20020,11 @@@ msgstr "ค่าปริยายรà
#: modules/gui/qt4/components/simple_preferences.cpp:1242
msgid "File associations"
++<<<<<<< HEAD
+msgstr "à¸à¸²à¸£à¹€à¸‚้าใช้à¹à¸Ÿà¹‰à¸¡"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:1251
#: modules/gui/qt4/dialogs_provider.hpp:42
@@@ -19317,20 -19308,20 +20072,36 @@@ msgstr "ลบโพรไฟล์ทà
msgid "Create a new profile"
msgstr "สร้างโพรไฟล์ใหม่"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "สร้าง"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "ชื่à¸à¹‚พรไฟล์ผิด"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "ชื่à¸à¹‚พรไฟล์ผิด"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "คุณต้à¸à¸‡à¸•à¸±à¹‰à¸‡à¸Šà¸·à¹ˆà¸à¹‚พรไฟล์"
@@@ -19493,7 -19484,7 +20264,11 @@@ msgstr "&ล&้าง
#: modules/gui/qt4/dialogs/errors.cpp:54
msgid "Hide future errors"
++<<<<<<< HEAD
+msgstr "ซ่à¸à¸™à¸‚้à¸à¸‚ัดข้à¸à¸‡"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/extended.cpp:49
msgid "Adjustments and Effects"
@@@ -19532,14 -19523,6 +20307,17 @@@ msgid "
"entities. Therefore the <i>VLC</i> developers require your express consent "
"for the media player to access the Internet automatically.</p>\n"
msgstr ""
++<<<<<<< HEAD
+"<p>ในà¸à¸£à¸“ีที่ต้à¸à¸‡à¸à¸²à¸£à¸›à¸à¸›à¹‰à¸à¸‡à¸„วามเป็นส่วนตัว โปรà¹à¸à¸£à¸¡à¹€à¸¥à¹ˆà¸™à¸ªà¸·à¹ˆà¸ <i>VLC</i> จะ <b>ไม่</b> "
+"เà¸à¹‡à¸šà¸«à¸£à¸·à¸à¸ªà¹ˆà¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸ªà¹ˆà¸§à¸™à¸šà¸¸à¸„คล รวมถึงà¹à¸šà¸šà¸Ÿà¸à¸£à¹Œà¸¡à¸—ี่ไม่ระบุตัวตนด้วย</p>\n"
+"<p>à¹à¸•à¹ˆà¸–ึงà¸à¸¢à¹ˆà¸²à¸‡à¹„ร <i>VLC</i> "
+"ยังคงสามารถรับข้à¸à¸¡à¸¹à¸¥à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¸ªà¸·à¹ˆà¸à¹ƒà¸™à¸£à¸²à¸¢à¸à¸²à¸£à¹€à¸žà¸¥à¸¥à¸´à¸ªà¸•à¹Œà¸ˆà¸²à¸à¸šà¸£à¸´à¸à¸²à¸£à¸£à¸°à¸šà¸šà¸à¸´à¸™à¹€à¸•à¸à¸£à¹Œà¹€à¸™à¹‡à¸•à¸‚à¸à¸‡à¸šà¸¸à¸„คลที่สามได้ "
+"ได้à¹à¸à¹ˆà¸«à¸™à¹‰à¸²à¸›à¸ ชื่à¸à¹€à¸žà¸¥à¸‡ ผู้à¹à¸•à¹ˆà¸‡à¹à¸¥à¸°à¸à¸·à¹ˆà¸™à¹†</p>\n"
+"เหล่านี้à¸à¸²à¸ˆà¸™à¸³à¸¡à¸²à¸‹à¸¶à¹ˆà¸‡à¸à¸²à¸£à¸£à¸°à¸šà¸¸à¹€à¸à¸à¸¥à¸±à¸à¸©à¸“์ขà¸à¸‡à¹„ฟล์ข้à¸à¸¡à¸¹à¸¥à¸ªà¸·à¹ˆà¸à¹„ปยังบริà¸à¸²à¸£à¸‚à¸à¸‡à¸šà¸¸à¸„คลที่สาม ดังนั้น "
+"นัà¸à¸žà¸±à¸’นาโปรà¹à¸à¸£à¸¡ <i>VLC</i> "
+"จึงขà¸à¸„วามยินยà¸à¸¡à¹€à¸žà¸·à¹ˆà¸à¹ƒà¸«à¹‰à¹‚ปรà¹à¸à¸£à¸¡à¹€à¸¥à¹ˆà¸™à¸ªà¸·à¹ˆà¸à¸ªà¸²à¸¡à¸²à¸£à¸–เข้าถึงà¸à¸´à¸™à¹€à¸•à¸à¸£à¹Œà¹€à¸™à¹‡à¸•à¹„ด้à¸à¸±à¸•à¹‚นมัติ<p>\n"
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:91
msgid "Network Access Policy"
@@@ -19547,11 -19530,11 +20325,19 @@@ msgstr "ข้à¸à¸à¸³à¸«à¸™à¸”à¸à¸²à
#: modules/gui/qt4/dialogs/firstrun.cpp:98
msgid "Automatically retrieve media info"
++<<<<<<< HEAD
+msgstr "รับข้à¸à¸¡à¸¹à¸¥à¸ªà¸·à¹ˆà¸à¹‚ดยà¸à¸±à¸•à¹‚นมัติ"
+
+#: modules/gui/qt4/dialogs/firstrun.cpp:103
+msgid "Regularly check for VLC updates"
+msgstr "ตรวจหารุ่นปรับปรุ่งขà¸à¸‡ VLC à¸à¸¢à¹ˆà¸²à¸‡à¸ªà¸¡à¹ˆà¸³à¹€à¸ªà¸¡à¸"
++=======
+ msgstr ""
+
+ #: modules/gui/qt4/dialogs/firstrun.cpp:103
+ msgid "Regularly check for VLC updates"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/gototime.cpp:42
msgid "Go to Time"
@@@ -20120,7 -20103,7 +20906,11 @@@ msgstr "เปิดà¹&ผ&่น
#: modules/gui/qt4/menus.cpp:361
msgid "Open &Network Stream..."
++<<<<<<< HEAD
+msgstr "เปิดสตรีมผ่านเครืà¸à¸‚่าย"
++=======
+ msgstr "เปิด&à¸à¸£à¸°à¹à¸ªà¹€à¸„รืà¸à¸‚่าย..."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/menus.cpp:363 modules/gui/qt4/menus.cpp:924
msgid "Open &Capture Device..."
@@@ -20951,15 -20934,15 +21741,27 @@@ msgstr "
#: modules/misc/gnutls.c:294 modules/misc/gnutls.c:311
msgid "Insecure site"
++<<<<<<< HEAD
+msgstr "ไซต์ไม่ปลà¸à¸”ภัย"
+
+#: modules/misc/gnutls.c:295 modules/misc/gnutls.c:314
+msgid "Abort"
+msgstr "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹€à¸‚้า"
+
+#: modules/misc/gnutls.c:295
+msgid "View certificate"
+msgstr "ดูใบรับรà¸à¸‡"
++=======
+ msgstr ""
+
+ #: modules/misc/gnutls.c:295 modules/misc/gnutls.c:314
+ msgid "Abort"
+ msgstr ""
+
+ #: modules/misc/gnutls.c:295
+ msgid "View certificate"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/gnutls.c:312
#, c-format
@@@ -20969,18 -20952,14 +21771,29 @@@ msgid "
"\n"
"If in doubt, abort now.\n"
msgstr ""
++<<<<<<< HEAD
+"ใบรับรà¸à¸‡à¸™à¸µà¹‰à¸à¸à¸à¹‚ดย %s:\n"
+"%s\n"
+"\n"
+"หาà¸à¸ªà¸‡à¸ªà¸±à¸¢à¸§à¹ˆà¸²à¹„ม่ปลà¸à¸¢à¸ ัย ให้ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹€à¸‚้าโดยทันที\n"
+
+#: modules/misc/gnutls.c:314
+msgid "Accept 24 hours"
+msgstr "ยà¸à¸¡à¸£à¸±à¸šà¹à¸„่ 24 ชั่วโมง"
+
+#: modules/misc/gnutls.c:315
+msgid "Accept permanently"
+msgstr "ยà¸à¸¡à¸£à¸±à¸šà¸–าวร"
++=======
+
+ #: modules/misc/gnutls.c:314
+ msgid "Accept 24 hours"
+ msgstr ""
+
+ #: modules/misc/gnutls.c:315
+ msgid "Accept permanently"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/inhibit/dbus.c:129
msgid "Playing some media."
@@@ -21008,7 -20987,7 +21821,11 @@@ msgstr "รูปà¹à¸šà¸šà¸›à¸¹à¸¡
#: modules/misc/logger.c:118
msgid "Specify the logging format."
++<<<<<<< HEAD
+msgstr "ระบุรูปà¹à¸šà¸šà¸à¸²à¸£à¸—ำปูม"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/misc/logger.c:121
msgid "Syslog ident"
@@@ -21918,7 -21897,7 +22735,11 @@@ msgstr "วิธีà¸à¸²à¸£à¹€à¸‚้à
#: modules/stream_out/es.c:52 modules/stream_out/standard.c:44
msgid "Output muxer"
++<<<<<<< HEAD
+msgstr "ตัวรวมà¸à¸£à¸°à¹à¸ªà¹à¸ªà¸”งผล"
++=======
+ msgstr "ตัวรวมà¸à¸£à¸°à¹à¸ªà¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/es.c:54
msgid "This is the default muxer method that will be used."
@@@ -21942,11 -21921,11 +22763,19 @@@ msgstr "นี่คืà¸à¸•à¸±à¸§à¸£à
#: modules/stream_out/es.c:62
msgid "Output URL"
++<<<<<<< HEAD
+msgstr "URL à¹à¸ªà¸”งผล"
+
+#: modules/stream_out/es.c:64
+msgid "This is the default output URI."
+msgstr "นี่คืภURI à¹à¸ªà¸”งผล"
++=======
+ msgstr "URL ผลลัพธ์"
+
+ #: modules/stream_out/es.c:64
+ msgid "This is the default output URI."
+ msgstr "นี่คืภURI ผลลัพธ์ปริยายขà¸à¸‡à¸„ุณ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/es.c:65
msgid "Audio output URL"
@@@ -21954,7 -21933,7 +22783,11 @@@ msgstr "URL ส่งเสียง
#: modules/stream_out/es.c:67
msgid "This is the output URI that will be used for audio."
++<<<<<<< HEAD
+msgstr "URI à¹à¸ªà¸”งผลตัวนี้จะใช้ในส่วนส่งเสียง"
++=======
+ msgstr "URI ผลลัพธ์ตัวนี้จะใช้ในส่วนส่งเสียง"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/es.c:68
msgid "Video output URL"
@@@ -21962,7 -21941,7 +22795,11 @@@ msgstr "URL à¹à¸ªà¸”งวีดิท
#: modules/stream_out/es.c:70
msgid "This is the output URI that will be used for video."
++<<<<<<< HEAD
+msgstr "URI à¹à¸ªà¸”งผลตัวนี้จะใช้ในส่วนà¹à¸ªà¸”งวีดิทัศน์"
++=======
+ msgstr "URI ผลลัพธ์ตัวนี้จะใช้ในส่วนà¹à¸ªà¸”งวีดิทัศน์"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/es.c:79
msgid "Elementary stream output"
@@@ -22655,45 -22634,45 +23492,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr "ภาพซ้à¸à¸™/บทบรรยาย"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "ขนาดตัวà¸à¸±à¸à¸©à¸£à¹à¸šà¸šà¸žà¸´à¸à¹€à¸‹à¸¥"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "ขนาดตัวà¸à¸±à¸à¸©à¸£à¹à¸šà¸šà¸žà¸´à¸à¹€à¸‹à¸¥"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "ความทึบà¹à¸ªà¸‡à¸‚à¸à¸‡à¸‚้à¸à¸„วาม"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "ความทึบà¹à¸ªà¸‡à¸‚à¸à¸‡à¸‚้à¸à¸„วาม"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "สีปริยายขà¸à¸‡à¸‚้à¸à¸„วาม"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22702,93 -22681,93 +23575,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "ความทึบà¹à¸ªà¸‡à¸‚à¸à¸‡à¸žà¸·à¹‰à¸™à¸«à¸¥à¸±à¸‡"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "สีพื้นหลัง"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "ความทึบà¹à¸ªà¸‡à¹€à¸ªà¹‰à¸™à¸‚à¸à¸š"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "ความทึบà¹à¸ªà¸‡à¸‚à¸à¸‡à¹€à¸‡à¸²"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "สีขà¸à¸‡à¹€à¸‡à¸²"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "à¸à¸²à¸£à¸—ำà¸à¸‡à¸¨à¸²à¸‚à¸à¸‡à¹€à¸‡à¸²"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "ระยะห่างเงา"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "ความทึบà¹à¸ªà¸‡à¸‚à¸à¸‡à¸žà¸·à¹‰à¸™à¸«à¸¥à¸±à¸‡"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "สีพื้นหลัง"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "ความทึบà¹à¸ªà¸‡à¹€à¸ªà¹‰à¸™à¸‚à¸à¸š"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "ความทึบà¹à¸ªà¸‡à¸‚à¸à¸‡à¹€à¸‡à¸²"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "สีขà¸à¸‡à¹€à¸‡à¸²"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "à¸à¸²à¸£à¸—ำà¸à¸‡à¸¨à¸²à¸‚à¸à¸‡à¹€à¸‡à¸²"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "ระยะห่างเงา"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "เล็à¸à¸¡à¸²à¸"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "เล็à¸"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "ใหà¸à¹ˆ"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "ใหà¸à¹ˆà¸¡à¸²à¸"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "à¹à¸„บ"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "หนา"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "à¹à¸„บ"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "หนา"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -23789,7 -23768,7 +24742,11 @@@ msgstr "ความสูง (ขà¸à¸
#: modules/video_filter/canvas.c:89
msgid "Output picture aspect ratio"
++<<<<<<< HEAD
+msgstr "à¸à¸±à¸•à¸£à¸²à¸ªà¹ˆà¸§à¸™à¸ าพที่à¹à¸ªà¸”ง"
++=======
+ msgstr "à¸à¸±à¸•à¸£à¸²à¸ªà¹ˆà¸§à¸™à¸ าพผลลัพธ์"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/canvas.c:91
msgid ""
@@@ -24025,7 -24004,7 +24982,11 @@@ msgstr "FIFO ที่จะถูà¸à¸
#: modules/video_filter/dynamicoverlay/dynamicoverlay.c:63
msgid "Output FIFO"
++<<<<<<< HEAD
+msgstr "FIFO à¹à¸ªà¸”งผล"
++=======
+ msgstr "FIFO ผลลัพธ์"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/dynamicoverlay/dynamicoverlay.c:64
msgid "FIFO which will be written to for responses"
@@@ -25296,7 -25275,7 +26257,11 @@@ msgstr "รูปà¹à¸šà¸šà¸£à¸¹à¸›à¸ à
#: modules/video_filter/scene.c:60
msgid "Format of the output images (png, jpeg, ...)."
++<<<<<<< HEAD
+msgstr "ชนิดà¹à¸Ÿà¹‰à¸¡à¸‚à¸à¸‡à¸£à¸¹à¸›à¸ าพที่ทำ (png, jpeg, ...)."
++=======
+ msgstr "รูปà¹à¸šà¸šà¸‚à¸à¸‡à¸ าพผลลัพธ์ (png, jpeg, ...)."
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/scene.c:63
msgid ""
@@@ -26218,11 -26197,11 +27183,19 @@@ msgstr "à¹à¸Ÿà¹‰à¸¡à¸—ี่จะถà
#: modules/visualization/projectm.cpp:53
msgid "projectM preset path"
++<<<<<<< HEAD
+msgstr "พาธชุดค่าตั้ง projectM"
+
+#: modules/visualization/projectm.cpp:54
+msgid "Path to the projectM preset directory"
+msgstr "พาธไปยังที่เà¸à¹‡à¸šà¹à¸Ÿà¹‰à¸¡à¸Šà¸¸à¸”ค่าตั้ง projectM"
++=======
+ msgstr "พาธค่าสำเร็จรูป projectM"
+
+ #: modules/visualization/projectm.cpp:54
+ msgid "Path to the projectM preset directory"
+ msgstr "พาธไปยังที่เà¸à¹‡à¸šà¹à¸Ÿà¹‰à¸¡à¸„่าสำเร็จรูป projectM"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/visualization/projectm.cpp:56
msgid "Title font"
@@@ -26541,7 -26520,7 +27514,11 @@@ msgstr "เล่นตัวที่à
#: share/lua/http/index.html:245
msgid "Refresh List"
++<<<<<<< HEAD
+msgstr "ปรับเรียà¸à¸£à¸²à¸¢à¸à¸²à¸£"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:252
msgid "Loading flowplayer..."
@@@ -26612,7 -26591,7 +27589,11 @@@ msgstr "
#: modules/gui/qt4/ui/equalizer.h:135
msgid "Preset"
++<<<<<<< HEAD
+msgstr "ชุดค่าตั้ง"
++=======
+ msgstr "ค่าสำเร็จรูป"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/equalizer.h:137
msgid "0.00 dB"
@@@ -26998,11 -26977,11 +27979,19 @@@ msgstr "à¸à¸²à¸£à¹€à¸¥à¸·à¸à¸à¸£à¸°à
#: modules/gui/qt4/ui/sprefs_input.h:343
msgid "x264 preset and tuning selection"
++<<<<<<< HEAD
+msgstr "à¸à¸²à¸£à¸›à¸£à¸±à¸šà¸„่าà¹à¸¥à¸°à¸Šà¸¸à¸”ค่าตั้ง x264"
+
+#: modules/gui/qt4/ui/sprefs_input.h:344
+msgid "Hardware-accelerated decoding"
+msgstr "à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸®à¸²à¸£à¹Œà¸”à¹à¸§à¸£à¹Œà¹€à¸žà¸·à¹ˆà¸à¹€à¸£à¹ˆà¸‡à¸„วามเร็วในà¸à¸²à¸£à¸à¹ˆà¸²à¸™à¸£à¸«à¸±à¸ª"
++=======
+ msgstr "à¸à¸²à¸£à¸›à¸£à¸±à¸šà¸„่าà¹à¸¥à¸°à¸„่าสำเร็จรูป x264"
+
+ #: modules/gui/qt4/ui/sprefs_input.h:344
+ msgid "Hardware-accelerated decoding"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_input.h:345
msgid "Skip H.264 in-loop deblocking filter"
@@@ -27050,7 -27029,7 +28039,11 @@@ msgstr "ข้à¸à¸à¸³à¸«à¸™à¸”à¸à¸²à
#: modules/gui/qt4/ui/sprefs_interface.h:514
msgid "Menus language:"
++<<<<<<< HEAD
+msgstr "ภาษาเมนู:"
++=======
+ msgstr "ภาษาขà¸à¸‡à¹€à¸¡à¸™à¸¹:"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_interface.h:515
msgid "Look and feel"
@@@ -27426,6 -27405,9 +28419,12 @@@ msgstr "AAAA;
msgid "Media Manager List"
msgstr "รายà¸à¸²à¸£à¸•à¸±à¸§à¸ˆà¸±à¸”à¸à¸²à¸£à¸ªà¸·à¹ˆà¸"
++<<<<<<< HEAD
++=======
+ #~ msgid "Show Details"
+ #~ msgstr "à¹à¸ªà¸”งรายละเà¸à¸µà¸¢à¸”"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid ""
#~ "Magnify a part of the video. You can select which part of the image "
#~ "should be magnified."
@@@ -27671,6 -27653,9 +28670,12 @@@
#~ msgid "Password for HTTP Proxy"
#~ msgstr "รหัสผ่านขà¸à¸‡à¸žà¸£à¹‡à¸à¸à¸‹à¸µ HTTP "
++<<<<<<< HEAD
++=======
+ #~ msgid "TV (digital)"
+ #~ msgstr "TV (ดิจิทัล)"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Warning: the key is already assigned to \""
#~ msgstr "ขà¸à¹€à¸•à¸·à¸à¸™: ปุ่มนี้ถูà¸à¹ƒà¸Šà¹‰à¹à¸¥à¹‰à¸§à¹ƒà¸™à¸à¸²à¸£ \""
@@@ -27945,14 -27930,6 +28950,17 @@@
#~ msgstr "à¹à¸ªà¸”งà¹à¸•à¹ˆà¸ˆà¸ (ไร้à¹à¸–บเครื่à¸à¸‡à¸¡à¸·à¸)"
#, fuzzy
++<<<<<<< HEAD
+#~ msgid "Show Details"
+#~ msgstr "ราบละเà¸à¸µà¸¢à¸”ตัวà¸à¹ˆà¸²à¸™-ลงรหัส"
+
+#, fuzzy
+#~ msgid "TV (digital)"
+#~ msgstr "โทรทัศน์ - ดิจิทัล"
+
+#, fuzzy
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#~ msgid "Greek, Modern ()"
#~ msgstr "à¸à¸£à¸µà¸ (ปัจจุบัน)"
@@@ -27978,7 -27955,7 +28986,11 @@@
#, fuzzy
#~ msgid "Refresh"
++<<<<<<< HEAD
+#~ msgstr "ปรับเรียà¸à¸£à¸²à¸¢à¸à¸²à¸£"
++=======
+ #~ msgstr "ปุ่มเรียà¸à¸‹à¹‰à¸³ (Browser Refresh)"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Subtitles/OSD"
@@@ -28227,7 -28204,7 +29239,11 @@@
#, fuzzy
#~ msgid "Refresh list"
++<<<<<<< HEAD
+#~ msgstr "ปรับเรียà¸à¸£à¸²à¸¢à¸à¸²à¸£"
++=======
+ #~ msgstr "รายà¸à¸²à¸£à¸¥à¸¹à¸à¹€à¸¥à¹ˆà¸™"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "VLC cannot open ANY capture device.Check the error log for details."
@@@ -28567,7 -28544,7 +29583,11 @@@
#, fuzzy
#~ msgid "Preferred Subtitle Language"
++<<<<<<< HEAD
+#~ msgstr "ภาษาบทบรรยายที่ควรเลืà¸à¸à¹ƒà¸Šà¹‰"
++=======
+ #~ msgstr "ภาษาขà¸à¸‡à¹€à¸ªà¸µà¸¢à¸‡à¸—ี่ควรเลืà¸à¸à¹ƒà¸Šà¹‰"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Force Bold"
@@@ -28731,7 -28708,7 +29751,11 @@@
#, fuzzy
#~ msgid "Allow checking for VLC updates"
++<<<<<<< HEAD
+#~ msgstr "ตรวจหารุ่นปรับปรุ่งขà¸à¸‡ VLC à¸à¸¢à¹ˆà¸²à¸‡à¸ªà¸¡à¹ˆà¸³à¹€à¸ªà¸¡à¸"
++=======
+ #~ msgstr "ตรวจหาà¸à¸²à¸£à¸›à¸£à¸±à¸šà¸›à¸£à¸¸à¸‡à¸‚à¸à¸‡ VLC"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Save and Continue"
@@@ -28903,7 -28880,7 +29927,11 @@@
#, fuzzy
#~ msgid "Enable desktop mode "
++<<<<<<< HEAD
+#~ msgstr "เปิดใช้รูปà¹à¸šà¸šà¸‹à¸à¸£à¹Œà¸Ÿà¹à¸§à¸£à¹Œ"
++=======
+ #~ msgstr "ใช้รูปà¹à¸šà¸šà¸žà¸·à¹‰à¸™à¸«à¸¥à¸±à¸‡"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Stream Name"
@@@ -28955,7 -28932,7 +29983,11 @@@
#, fuzzy
#~ msgid "Output File"
++<<<<<<< HEAD
+#~ msgstr "à¹à¸Ÿà¹‰à¸¡à¸—ี่ได้"
++=======
+ #~ msgstr "à¹à¸Ÿà¹‰à¸¡à¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œ"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Input Media"
@@@ -29043,7 -29020,7 +30075,11 @@@
#, fuzzy
#~ msgid "Preferred subtitles language"
++<<<<<<< HEAD
+#~ msgstr "ภาษาบทบรรยายที่ควรเลืà¸à¸à¹ƒà¸Šà¹‰"
++=======
+ #~ msgstr "ภาษาขà¸à¸‡à¹€à¸ªà¸µà¸¢à¸‡à¸—ี่ควรเลืà¸à¸à¹ƒà¸Šà¹‰"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Subtitles effects"
@@@ -29223,7 -29200,7 +30259,11 @@@
#, fuzzy
#~ msgid "Refresh Streams"
++<<<<<<< HEAD
+#~ msgstr "ปรับเรียà¸à¸£à¸²à¸¢à¸à¸²à¸£"
++=======
+ #~ msgstr "จัดà¸à¸²à¸£à¸à¸£à¸°à¹à¸ª"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Enqueue"
diff --combined po/tl.po
index ce849ae,084e3d1..3799212
--- a/po/tl.po
+++ b/po/tl.po
@@@ -10,7 -10,7 +10,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2005-02-01 14:25+0000\n"
"Last-Translator: Adi Nugroho <adi at internux.co.id>\n"
"Language-Team: Tagalog\n"
@@@ -138,7 -138,7 +142,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -465,10 -465,10 +473,17 @@@ msgid "&About
msgstr "_Bahin sa"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -511,17 -511,17 +526,29 @@@ msgid "Save...
msgstr ""
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr ""
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr ""
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -606,7 -606,7 +633,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr ""
@@@ -1296,20 -1296,20 +1327,36 @@@ msgstr "
msgid "Decoded format"
msgstr "_Fayl"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1710,7 -1710,7 +1757,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
#, fuzzy
@@@ -1795,7 -1795,7 +1846,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr ""
@@@ -1819,7 -1819,7 +1874,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -2011,7 -2011,7 +2070,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr ""
@@@ -2063,7 -2063,7 +2126,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2072,7 -2072,7 +2139,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2128,7 -2128,7 +2199,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2303,7 -2303,7 +2378,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2433,12 -2433,12 +2512,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2446,7 -2446,7 +2534,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2757,7 -2757,7 +2849,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3578,7 -3578,7 +3674,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3603,8 -3603,8 +3703,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3686,10 -3686,10 +3791,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3702,10 -3702,10 +3814,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr ""
@@@ -3714,9 -3714,9 +3833,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3955,9 -3955,9 +4080,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4387,7 -4387,7 +4518,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4588,12 -4588,12 +4723,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr ""
@@@ -5359,7 -5359,7 +5503,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "Mahitungod sa Aplikasyon"
@@@ -7775,7 -7775,7 +7923,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8571,7 -8571,7 +8723,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9730,7 -9730,7 +9886,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "_Set-ap"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "_Set-ap"
@@@ -9766,7 -9766,7 +9926,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "_Set-ap"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "_Set-ap"
@@@ -9776,32 -9776,32 +9940,56 @@@
msgid "Last audio device"
msgstr "M_adungan"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
++=======
+ #: modules/audio_output/auhal.c:166
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "HAL AudioUnit output"
msgstr "_Set-ap"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "M_adungan"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -11026,26 -11026,26 +11214,42 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
#, fuzzy
msgid "Silver"
msgstr "_Fayl"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
@@@ -11053,21 -11053,21 +11257,33 @@@
msgid "White"
msgstr "_Fayl"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11075,61 -11075,61 +11291,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11267,7 -11267,7 +11519,11 @@@ msgstr "_Fayl
msgid "Subtitle renderers using libass"
msgstr "_Fayl"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13121,10 -13121,10 +13377,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -13239,8 -13239,8 +13502,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13592,9 -13592,9 +13860,15 @@@ msgstr "
msgid "Opening"
msgstr "M_adungan"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -15558,7 -15558,7 +15832,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Teletext"
msgstr "_Fayl"
@@@ -15753,7 -15753,7 +16031,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15852,9 -15852,9 +16134,15 @@@ msgstr "_Fayl
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
#, fuzzy
msgid "Save"
@@@ -16004,7 -16004,7 +16292,11 @@@ msgstr "_Makit-an
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -16025,7 -16025,7 +16317,11 @@@ msgstr "
msgid "Backward"
msgstr "Mahitungod sa Aplikasyon"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16035,7 -16035,7 +16331,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16056,89 -16056,89 +16356,160 @@@ msgstr "_Makit-an
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "_Fayl"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "_Makit-an"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "_Fayl"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
#, fuzzy
msgid "Effects"
msgstr "_Makit-an"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to go to the previous playlist item."
msgstr "_Fayl"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -16179,7 -16179,7 +16550,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16380,8 -16380,8 +16755,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
#, fuzzy
msgid "Custom"
@@@ -16480,37 -16480,37 +16860,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Remove old preferences?"
msgstr "_Preperenses"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16666,7 -16666,7 +17078,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Lock Aspect Ratio"
msgstr "Mahitungod sa Aplikasyon"
@@@ -16805,7 -16805,7 +17221,11 @@@ msgstr "
msgid "Hide Others"
msgstr "_Makit-an"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show All"
msgstr "_Fayl"
@@@ -16902,15 -16902,15 +17322,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16928,30 -16928,30 +17360,56 @@@ msgstr "_Makit-an
msgid "Audio Device"
msgstr "M_adungan"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Fullscreen Video Device"
msgstr "_Makit-an"
@@@ -16961,7 -16961,7 +17419,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "_Fayl"
@@@ -17210,7 -17210,7 +17672,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -17398,7 -17398,7 +17864,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr "_Fayl"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
#, fuzzy
msgid "Font size"
@@@ -17652,13 -17652,13 +18122,21 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
#, fuzzy
msgid "Preferences"
msgstr "_Preperenses"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17854,26 -17854,22 +18332,42 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Display Settings"
msgstr "_Set-ap"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
#, fuzzy
msgid "Font color"
msgstr "M_adungan"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
@@@ -17881,113 -17877,113 +18375,205 @@@
msgid "Font"
msgstr "_Makit-an"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "_Fayl"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "M_adungan"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "M_adungan"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
#, fuzzy
msgid "Display"
msgstr "_Set-ap"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Output module"
msgstr "_Makit-an"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
++=======
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Video snapshots"
msgstr "_Makit-an"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
++=======
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Folder"
msgstr "_Fayl"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
#, fuzzy
msgid "Reset Preferences"
msgstr "_Preperenses"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18000,37 -17996,37 +18586,67 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose"
msgstr "Gawas sa Program"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Invalid combination"
msgstr "_Nabigit"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -20100,21 -20096,21 +20716,37 @@@ msgstr "_Fayl
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
#, fuzzy
msgid "Create"
msgstr "M_adungan"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "You must set a name for the profile."
msgstr "_Fayl"
@@@ -23647,47 -23643,47 +24279,83 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr "_Fayl"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font size in pixels"
msgstr "_Makit-an"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "Mahitungod sa Aplikasyon"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23696,97 -23692,97 +24364,177 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "Mahitungod sa Aplikasyon"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "Mahitungod sa Aplikasyon"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "M_adungan"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Smaller"
msgstr "_Fayl"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/tr.po
index 7bd2ee8,c509432..e355624
--- a/po/tr.po
+++ b/po/tr.po
@@@ -18,7 -18,7 +18,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-11-09 17:14+0000\n"
"Last-Translator: Kaya Zeren <kayazeren at gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -148,7 -148,7 +152,11 @@@ msgstr "ÇeÅŸitli ses ayarları ve modÃ
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -497,10 -497,10 +505,17 @@@ msgid "&About
msgstr "H&akkında"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -539,17 -539,17 +554,29 @@@ msgid "Save...
msgstr "Kaydedin..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Tümü Yinelensin"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Biri Yinelensin"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -657,7 -657,7 +684,11 @@@ msgstr "En çok süzgeç sayısına (%u
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Kapalı"
@@@ -1360,22 -1360,22 +1391,38 @@@ msgstr "Kare hızı
msgid "Decoded format"
msgstr "Çözülen biçim"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Seçtiğiniz giriş açılamadı"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Seçtiğiniz giriş açılamadı"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC, '%s' ortam kaynağı adresini (MRL) açamıyor. Ayrıntılar için günlük "
"dosyasına bakın."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC, giriş biçimini tanıyamadı"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC, giriş biçimini tanıyamadı"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1806,7 -1806,7 +1853,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1898,7 -1898,7 +1949,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Hiçbiri"
@@@ -1929,7 -1929,7 +1984,11 @@@ msgstr "
"VLC tarafından kullanılan görüntü çıkışı yöntemi buradan belirlenir. "
"Varsayılan olarak eldeki en iyi yöntem kendiliğinden seçilir."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Görüntü kullanılsın"
@@@ -2137,7 -2137,7 +2196,11 @@@ msgstr "
"kullanmayı dener."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Her zaman üstte"
@@@ -2192,7 -2192,7 +2255,11 @@@ msgstr "Fare imleci ve tam ekran deneti
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2201,7 -2201,7 +2268,11 @@@ msgstr "Taramasızlık
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Taramasızlık kipi"
@@@ -2260,7 -2260,7 +2331,11 @@@ msgstr "
"engellenir. Böylece bilgisayarda bir işlem yapılmasa dahi uyku ya da hazırda "
"bekleme durumuna geçilmez."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Pencere dekorları"
@@@ -2462,7 -2462,7 +2537,11 @@@ msgstr "
"sahiptir (1:1). 16:9 bir ekran kullanıldığında, doğru oranı korumak için bu "
"değerin 4:3 seçilmesi gerekebilir."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Kare atlansın"
@@@ -2611,12 -2611,12 +2690,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2624,7 -2624,7 +2712,11 @@@ msgid "Default
msgstr "Varsayılan"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2974,7 -2974,7 +3066,11 @@@ msgid "You can completely disable the s
msgstr "Buradan, alt görüntü işleme tamamen devre dışı bırakılabilir."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3953,7 -3953,7 +4049,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "Bu ayarlar \"kısayol\" olarak bilinen genel VLC tuş tanımlarıdır."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Etkisiz olsun"
@@@ -3979,8 -3979,8 +4079,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4061,10 -4061,10 +4166,17 @@@ msgid "Slower (fine)
msgstr "Daha YavaÅŸ (Hassas)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4079,10 -4079,10 +4191,17 @@@ msgstr "
"seçin."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Önceki"
@@@ -4092,9 -4092,9 +4211,15 @@@ msgid "Select the hotkey to use to ski
msgstr ""
"Oynatma listesinde önceki ögeye geçmek için kullanılacak kestirme tuşu seçin."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4343,9 -4343,9 +4468,15 @@@ msgid "Select the key to decrease audi
msgstr "Sesi kısmak için kullanılacak kısayol tuşunu seçin."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Sesi Kapatın"
@@@ -4762,7 -4762,7 +4893,11 @@@ msgstr "Varolan ses aygıtları boyunc
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "FotoÄŸraf"
@@@ -4969,12 -4969,12 +5104,21 @@@ msgstr "Ä°ndiriliyor...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Ä°ptal"
@@@ -5739,7 -5739,7 +5883,11 @@@ msgstr "Kırp
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "En boy oranı"
@@@ -8219,7 -8219,7 +8367,11 @@@ msgstr "Ekran GiriÅŸi
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Ekran"
@@@ -8975,7 -8975,7 +9127,11 @@@ msgstr "En Yüksek Düzey #
msgid "Volume Set"
msgstr "Ses Ayarı"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10157,7 -10157,7 +10313,11 @@@ msgstr "Çevresel Ses 7.1
msgid "ALSA audio output"
msgstr "ALSA ses çıkışı"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Ses çıkışı hata verdi"
@@@ -10190,7 -10190,7 +10350,11 @@@ msgstr "AudioQueue (iOS / Mac OS) ses Ã
msgid "Android AudioTrack audio output"
msgstr "Android AudioTrack ses çıkışı"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "iOS için AudioUnit çıkışı"
@@@ -10198,21 -10198,21 +10362,37 @@@
msgid "Last audio device"
msgstr "Son ses cihazı"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit çıkışı"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit çıkışı"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Seçili ses aygıtı öncelikli olarak başka bir program tarafından kullanılıyor."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Ses aygıtı yapılandırılmamış"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Ses aygıtı yapılandırılmamış"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10221,11 -10221,11 +10401,19 @@@ msgstr "
"Kurulumu\" aracı ile yapılandırmalısınız. VLC sadece çift kanal çıkış "
"verecektir."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Sistem ses çıkış cihazı"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Sistem ses çıkış cihazı"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Kodlanmış Çıkış)"
@@@ -11516,46 -11516,46 +11704,74 @@@ msgstr "Gölge
msgid "Outline"
msgstr "Taslak"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Siyah"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Gri"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Gümüş"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Beyaz"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Bordo"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Kırmızı"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11563,61 -11563,61 +11779,97 @@@ msgid "Fuchsia
msgstr "Parlak pembe"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Sarı"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Zeytin yeÅŸili"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "YeÅŸil"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Deniz mavisi"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Fosforlu yeÅŸil"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Eflatun"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Lacivert"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Mavi"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11772,7 -11772,7 +12024,11 @@@ msgstr "Altyazılar (gelişmiş)
msgid "Subtitle renderers using libass"
msgstr "libass kullanan altyazı görüntüleyiciler"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Yazı tipi önbelleği oluşturuluyor"
@@@ -13784,10 -13784,10 +14040,17 @@@ msgid "Fast
msgstr "Hızlı"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normal"
@@@ -13898,8 -13898,8 +14161,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus denetim arayüzü"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14251,9 -14251,9 +14519,15 @@@ msgstr "Ä°lkdeÄŸer veriliyor
msgid "Opening"
msgstr "Açılıyor"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Duraklat"
@@@ -16198,7 -16198,7 +16472,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG Aktarılan Akış Tekleyicisi"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -16387,7 -16387,7 +16665,11 @@@ msgid "VLC media player Help
msgstr "VLC ortam oynatıcısı Yardım"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Ä°ndeks"
@@@ -16475,9 -16475,9 +16757,15 @@@ msgstr "Yeni profilin adını yazın:
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Kaydet"
@@@ -16623,7 -16623,7 +16911,11 @@@ msgstr "
"Yer imlerinin çalışması için akışın oynatılıyor ya da duraklatılmış olması "
"gerekir."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Zamana Atla"
@@@ -16643,7 -16643,7 +16935,11 @@@ msgstr "Seçili ortamı oynatın ya da
msgid "Backward"
msgstr "Gerilet"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16655,7 -16655,7 +16951,11 @@@ msgstr "
msgid "Forward"
msgstr "Ä°leri"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16679,23 -16679,15 +16979,35 @@@ msgstr "Tam Ekran Kipini Aç/Kapat
msgid "Click to enable fullscreen video playback."
msgstr "Tam ekran görüntü oynatımı için tıklayın."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "Geçerli ortamda geriye doğru gitmek için tıklayıp basılı tutun."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "Geçerli ortamda ileriye doğru gitmek için tıklayıp basılı tutun."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Oynatmayı durdurmak için tıklayın."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Oynatma Listesini Görüntüle/Gizle"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Oynatmayı durdurmak için tıklayın."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Oynatma Listesini Görüntüle/Gizle"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -16703,12 -16695,12 +17015,20 @@@ msgstr "
"Görüntü çıkışı ile oynatma listesi arasında gidip gelmek için tıklayın. Ana "
"pencerede oynatılan bir görüntü yoksa, oynatma listesi gizlenir."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Yinele"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -16716,15 -16708,15 +17036,27 @@@ msgstr "
"Yineleme kipini değiştirmek için tıklayın. 3 durum bulunur: Biri Yinelensin, "
"Tümü Yinelensin ve Kapalı."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Karıştır"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "Rastgele oynatmayı açmak ya da kapatmak için tıklayın."
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Karıştır"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "Rastgele oynatmayı açmak ya da kapatmak için tıklayın."
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -16732,24 -16724,24 +17064,44 @@@ msgstr "
"Ses düzeyini değiştirmek için bu kaydırıcı üzerinde düğmeye basılı tutarken, "
"fareye tıklayıp hareket ettirin."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Sesi kapatmak ya da açmak için tıklayın."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Tam Ses"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Sesi en yüksek düzeyde çalmak için tıklayın."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Sesi kapatmak ya da açmak için tıklayın."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Tam Ses"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Sesi en yüksek düzeyde çalmak için tıklayın."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Etkiler"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -16757,14 -16749,22 +17109,33 @@@ msgstr "
"Dengeleyici ve diğer süzgeçlerin bulunduğu Ses Etkileri panelini "
"görüntülemek için tıklayın."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Önceki oynatma listesi ögesine geçmek için tıklayın."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Sonraki oynatma listesi ögesine geçmek için tıklayın."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Önceki oynatma listesi ögesine geçmek için tıklayın."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Sonraki oynatma listesi ögesine geçmek için tıklayın."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "Geçerli ortamda geriye doğru gitmek için tıklayıp basılı tutun."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "Geçerli ortamda ileriye doğru gitmek için tıklayıp basılı tutun."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Dönüştür & Akış"
@@@ -16800,7 -16800,7 +17171,11 @@@ msgstr "Çıktı için yer seçin
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16988,8 -16988,8 +17363,13 @@@ msgid "A SDP export is requested, but n
msgstr "SDP verme işlemi istendi ancak İnternet adresi yazılmamış."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Özel"
@@@ -17092,36 -17092,36 +17472,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "Bir daha sorma"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "VLC media playback"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "CrashLog bulunamadı"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "VLC media playback"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "CrashLog bulunamadı"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Devam"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Çökme ile ilgili hiç bir iz bulunamadı."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Eski ayarlar silinsin mi?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Eski sürüme ait VLC ayar dosyaları bulundu."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Çöpe at ve VLC yazılımını yeniden başlat."
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Çökme ile ilgili hiç bir iz bulunamadı."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Eski ayarlar silinsin mi?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Eski sürüme ait VLC ayar dosyaları bulundu."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Çöpe at ve VLC yazılımını yeniden başlat."
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC Hata Ayıklama Günlüğü (%s).rtf"
@@@ -17301,7 -17301,7 +17713,11 @@@ msgstr "
"Bu seçenek, değişik durumlarda, arayüzün kendi kendine simgelerini "
"deÄŸiÅŸtirebilmesine izin verir."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "En Boy Oranını Kilitle"
@@@ -17432,7 -17432,7 +17848,11 @@@ msgstr "VLC Yazılımını Gizle
msgid "Hide Others"
msgstr "DiÄŸerlerini Gizle"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Tümü Görüntülensin"
@@@ -17517,15 -17517,15 +17937,27 @@@ msgstr "Ä°z EÅŸleÅŸtirme
msgid "A→B Loop"
msgstr "A→B Çevrim"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Oynattıktan Sonra VLC Kapansın"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Ä°leriye Sar"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Oynattıktan Sonra VLC Kapansın"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Ä°leriye Sar"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Geriye Sar"
@@@ -17541,30 -17541,30 +17973,56 @@@ msgstr "Sesi Kısın
msgid "Audio Device"
msgstr "Ses Aygıtı"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Yarı boyut"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Normal boyut"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Ä°ki kat boyut"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Ekrana Sığdır"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Yarı boyut"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Normal boyut"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Ä°ki kat boyut"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Ekrana Sığdır"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Ãœstte Gezdir"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Tam ekran Görüntü Aygıtı"
@@@ -17573,7 -17573,7 +18031,11 @@@
msgid "Post processing"
msgstr "Art Ä°ÅŸleme"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Altyazı dosyası ekle"
@@@ -17812,7 -17812,7 +18274,11 @@@ msgid "Play another media synchronously
msgstr "Başka bir ortam eş zamanlı olarak oynatılsın"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Seçin..."
@@@ -18000,7 -18000,7 +18466,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Altyazı kod çözme"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Yazı tipi boyutu"
@@@ -18229,12 -18229,12 +18699,20 @@@ msgstr "Meta kaydedilirken hata
msgid "VLC was unable to save the meta data."
msgstr "VLC meta versini kaydedemedi."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Ayarlar"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Tümünü Sıfırla"
@@@ -18413,130 -18413,125 +18891,238 @@@ msgstr "Growl uyarılarını etkinleşt
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "VLC oynatımı sırasında iTunes duraklatılsın"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Varsayılan Kodlama"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Görüntü Ayarları"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Varsayılan Kodlama"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Görüntü Ayarları"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Yazı tipi rengi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Yazı tipi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Altyazı dilleri"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Altyazı dilleri"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Tercih edilen altyazı dili"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "EÃœG etkinleÅŸtir"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "EÃœG etkinleÅŸtir"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Matlık"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Koyuyu dayat"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Koyuyu dayat"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Çerçeve rengi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Çerçeve kalınlığı"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Tam ekran kipinde siyah ekranlar"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Tam ekran kipinde siyah ekranlar"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Göster"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Çıkış modülü"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Görüntü fotoğrafları"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Klasör"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Biçim"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Önek"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Ardışık numaralandır"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Son denetleme: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Hiç denetlenmemiş."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Çıkış modülü"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Görüntü fotoğrafları"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Klasör"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Biçim"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Önek"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Ardışık numaralandır"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Son denetleme: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Hiç denetlenmemiş."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "En düşük gecikme"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Düşük gecikme"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Yüksek gecikme"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Daha yüksek gecikme"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Ayarları Sıfırlayın"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18558,20 -18553,20 +19144,37 @@@ msgstr "
"\n"
"Devam etmek istediÄŸinize emin misiniz?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Görüntü fotoğraflarının kaydedileceği klasörü seçin."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Seçin"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Kayıtların saklanacağı klasör ya da dosya adını seçin."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Görüntü fotoğraflarının kaydedileceği klasörü seçin."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Seçin"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Kayıtların saklanacağı klasör ya da dosya adını seçin."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18579,16 -18574,16 +19182,29 @@@ msgstr "
"Şunun için yeni kısayol tuşlarına basın:\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Geçersiz kombinasyon"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Malesef bu tuşlar kısayol tuşu olarak atanamaz."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Geçersiz kombinasyon"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Malesef bu tuşlar kısayol tuşu olarak atanamaz."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Şu kombinasyon zaten kullanılıyor \"%@\"."
@@@ -20676,20 -20671,20 +21292,36 @@@ msgstr "Seçilen profili sil
msgid "Create a new profile"
msgstr "Yeni bir profil oluÅŸtur"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Ekle"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "Bu çoklayıcı VLC tarafından sağlanmıyor: Eksik olabilir."
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Profil Adı Kayıp"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr "Bu çoklayıcı VLC tarafından sağlanmıyor: Eksik olabilir."
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Profil Adı Kayıp"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Profile bir ad vermelisiniz."
@@@ -24234,23 -24229,23 +24866,43 @@@ msgstr "Akış Çıkışı DönüşümÃ
msgid "Overlays/Subtitles"
msgstr "Bindirmeler/Altyazılar"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Eş Aralıklı Yazı Tipi"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Kullanmak istediğiniz yazı tipinin yazı tipi ailesi"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Kullanmak istediğiniz yazı tipi dosyasının adı"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Yazı tipi boyutu"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Eş Aralıklı Yazı Tipi"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Kullanmak istediğiniz yazı tipinin yazı tipi ailesi"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Kullanmak istediğiniz yazı tipi dosyasının adı"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Yazı tipi boyutu"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24259,11 -24254,11 +24911,19 @@@ msgstr "
"Görüntü üzerine eklenecek metnin varsayılan boyutu. 0 dışında bir değer "
"seçtiğinizde, bağıl yazı tipi boyutunun yerine geçer."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Metin matlığı"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Metin matlığı"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24271,12 -24266,12 +24931,20 @@@ msgstr "
"Görüntü üzerine eklenecek metnin matlığı (saydamlığın tersi). 0 tamamen "
"saydam, 255 tamamen mat."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Varsayılan yazı rengi"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24289,12 -24284,12 +24957,20 @@@ msgstr "
"mavi rengi tanımlar. #000000 = siyah, #FF0000 = kırmızı, #00FF00 = yeşil, "
"#FFFF00 = sarı (kırmızı + yeşil), #FFFFFF = beyaz"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Bağıl yazı tipi boyutu"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24303,59 -24298,59 +24979,111 @@@ msgstr "
"Görüntü üzerine eklenecek metnin varsayılan bağıl boyutu. Kesin bir yazı "
"tipi büyüklüğü belirtirseniz, yaklaşık büyüklük değerinin yerine geçer."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Art alan matlığı"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Art alan rengi"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Çerçeve matlığı"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Gölge matlığı"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Gölge rengi"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Gölge açısı"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Gölge uzaklığı"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Art alan matlığı"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Art alan rengi"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Çerçeve matlığı"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Gölge matlığı"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Gölge rengi"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Gölge açısı"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Gölge uzaklığı"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Daha küçük"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Küçük"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Büyük"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Daha Büyük"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "YUVP görüntüleyiciyi kullan"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "YUVP görüntüleyiciyi kullan"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24363,23 -24358,23 +25091,43 @@@ msgstr "
"Bu seçenek, metni \"paletize YUV\" kullanarak görüntüler. Yalnızca DVB "
"altyazıları kodlamak istiyorsanız kullanmak gerekir."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Ä°nce"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Kalın"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Metin Görüntüleyici"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 Metin Görüntüleyici"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Ä°nce"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Kalın"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Metin Görüntüleyici"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 Metin Görüntüleyici"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/uk.po
index e4808c9,7f91044..22cbac5
--- a/po/uk.po
+++ b/po/uk.po
@@@ -10,7 -10,7 +10,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-22 09:57+0000\n"
"Last-Translator: Ðндрій Бандура <andriykopanytsia at gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -141,7 -141,7 +145,11 @@@ msgstr "Інші модулі та уÑ
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -488,10 -488,10 +496,17 @@@ msgid "&About
msgstr "&Про програму"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -530,17 -530,17 +545,29 @@@ msgid "Save...
msgstr "Зберегти…"
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Повторювати вÑе"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Повторювати раз"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -646,7 -646,7 +673,11 @@@ msgstr "ДоÑÑгнуто макÑим
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Вимкнути"
@@@ -1346,22 -1346,22 +1377,38 @@@ msgstr "ЧаÑтота кадрів
msgid "Decoded format"
msgstr "Декодований формат"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ введеннÑ"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ введеннÑ"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ MRL „%s“. Щоб отримати докладнішу інформацію, "
"дивітьÑÑ Ð¶ÑƒÑ€Ð½Ð°Ð»."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ формат введеннÑ"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ формат введеннÑ"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1794,7 -1794,7 +1841,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1882,7 -1882,7 +1933,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Ðічого"
@@@ -1912,7 -1912,7 +1967,11 @@@ msgstr "
"Стандартний метод Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ÐµÐ¾, викориÑтовуваний VLC. Стандартно, "
"найкращий доÑтупний метод вибираєтьÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Увімкнути відео"
@@@ -2119,7 -2119,7 +2178,11 @@@ msgstr "
"ÑпоÑіб Ñк Ñтандартний."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Завжди над іншими вікнами"
@@@ -2176,7 -2176,7 +2239,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2185,7 -2185,7 +2252,11 @@@ msgstr "УÑÑƒÐ½ÐµÐ½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ·Ñ€Ñ
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Режим уÑÑƒÐ½ÐµÐ½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ·Ñ€ÑдковоÑÑ‚Ñ–"
@@@ -2243,7 -2243,7 +2314,11 @@@ msgstr "
"Ð¦Ñ Ð¾Ñ†Ñ–Ñ Ð·ÑƒÐ¿Ð¸Ð½ÑÑ” демон ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¶Ð¸Ð²Ð»ÐµÐ½Ð½Ñм під Ñ‡Ð°Ñ Ð±ÑƒÐ´ÑŒ-Ñкого Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð»Ñ "
"Ð·Ð°Ð¿Ð¾Ð±Ñ–Ð³Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ñƒ комп’ютера в режим Ñну внаÑлідок неактивноÑÑ‚Ñ–."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "ÐžÑ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ñ–ÐºÐ½Ð°"
@@@ -2447,7 -2447,7 +2522,11 @@@ msgstr "
"Ñторін екрана — 16:9, то, ймовірно, потрібно змінити цей параметр на 4:3, "
"щоб зберегти правильні пропорції."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "ПропуÑкати кадри"
@@@ -2594,12 -2594,12 +2673,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2607,7 -2607,7 +2695,11 @@@ msgid "Default
msgstr "Стандартно"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2957,7 -2957,7 +3049,11 @@@ msgid "You can completely disable the s
msgstr "Можна повніÑÑ‚ÑŽ вимкнути обробку шарів."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3911,7 -3911,7 +4007,11 @@@ msgstr "
"Ці Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð°ÑŽÑ‚ÑŒ за прив'Ñзку глобальних комбінацій клавіш VLC "
"(„гарÑчі клавіші“)."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ігнорувати"
@@@ -3937,8 -3937,8 +4037,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4019,10 -4019,10 +4124,17 @@@ msgid "Slower (fine)
msgstr "Повільніше (точно)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4037,10 -4037,10 +4149,17 @@@ msgstr "
"відтвореннÑ."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Попередній"
@@@ -4051,9 -4051,9 +4170,15 @@@ msgstr "
"Виберіть гарÑчу клавішу Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ Ð½Ð° попередній елемент ÑпиÑку "
"відтвореннÑ."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4288,9 -4288,9 +4413,15 @@@ msgid "Select the key to decrease audi
msgstr "Виберіть гарÑчу клавішу Ð´Ð»Ñ Ð·Ð¼ÐµÐ½ÑˆÐµÐ½Ð½Ñ Ð³ÑƒÑ‡Ð½Ð¾ÑÑ‚Ñ– звуку."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Вимкнути звук"
@@@ -4712,7 -4712,7 +4843,11 @@@ msgstr "Циклічно перемик
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Стоп-кадр"
@@@ -4918,12 -4918,12 +5053,21 @@@ msgstr "Триває завантаже
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "СкаÑувати"
@@@ -5687,7 -5687,7 +5831,11 @@@ msgstr "Обрізати
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Ð¡Ð¿Ñ–Ð²Ð²Ñ–Ð´Ð½Ð¾ÑˆÐµÐ½Ð½Ñ Ñторін"
@@@ -8185,7 -8185,7 +8333,11 @@@ msgstr "Ð’Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð· екранÐ
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Екран"
@@@ -8937,7 -8937,7 +9089,11 @@@ msgstr "ÐœÐ°ÐºÑ Ð³ÑƒÑ‡Ð½ #
msgid "Volume Set"
msgstr "Задати гучніÑÑ‚ÑŒ"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10121,7 -10121,7 +10277,11 @@@ msgstr "ÐžÑ‚Ð¾Ñ‡ÐµÐ½Ð½Ñ 7.1
msgid "ALSA audio output"
msgstr "Ð’Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ через ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Помилка виводу звуку"
@@@ -10154,7 -10154,7 +10314,11 @@@ msgstr "Ð’Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ A
msgid "Android AudioTrack audio output"
msgstr "Вивід звуку через Android AudioTrack"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "Вивід звуку через AudioUnit Ð´Ð»Ñ iOS"
@@@ -10162,21 -10162,21 +10326,37 @@@
msgid "Last audio device"
msgstr "ОÑтанній звуковий приÑтрій"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Вивід звуку через HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Вивід звуку через HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Вибраний приÑтрій Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ викориÑтовуєтьÑÑ Ð²Ð¸ÐºÐ»ÑŽÑ‡Ð½Ð¾ іншою програмою."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Звуковий приÑтрій не Ñконфігуровано"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Звуковий приÑтрій не Ñконфігуровано"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -10184,11 -10184,11 +10364,19 @@@ msgstr "
"Ви маєте Ñконфігурувати Ваш звуковий шар за допомогою утиліти „Параметри "
"звуку Midi“ в /Програмах/Утилітах. Зараз викориÑтовуєтьÑÑ Ñтереорежим."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "СиÑтемний приÑтрій Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "СиÑтемний приÑтрій Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Закодований вивід)"
@@@ -11486,46 -11486,46 +11674,74 @@@ msgstr "Тінь
msgid "Outline"
msgstr "ОбведеннÑ"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Чорний"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Сірий"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Срібний"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Білий"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Темно-бордовий"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Червоний"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11533,61 -11533,61 +11749,97 @@@ msgid "Fuchsia
msgstr "ÑинÑво-червоний"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Жовтий"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Оливковий"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Зелений"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Зеленувато-голубий"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Лимонний"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Пурпуровий"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "МорÑький"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Блакитний"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11738,7 -11738,7 +11990,11 @@@ msgstr "Субтитри (додаткÐ
msgid "Subtitle renderers using libass"
msgstr "Рендери Ñубтитрів з викориÑтаннÑм libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Побудова кешу шрифтів"
@@@ -13749,10 -13749,10 +14005,17 @@@ msgid "Fast
msgstr "Швидкий"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Звичайна"
@@@ -13860,8 -13860,8 +14123,13 @@@ msgid "D-Bus control interface
msgstr "Ð†Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14212,9 -14212,9 +14480,15 @@@ msgstr "ІніціалізаціÑ
msgid "Opening"
msgstr "ВідкриттÑ"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Призупинити"
@@@ -16206,7 -16206,7 +16480,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "ДемультиплекÑор MPEG TS"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "ТелетекÑÑ‚"
@@@ -16394,7 -16394,7 +16672,11 @@@ msgid "VLC media player Help
msgstr "Допомога медіапрогравача VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "ІндекÑ"
@@@ -16482,9 -16482,9 +16764,15 @@@ msgstr "Введіть ім'Ñ Ð½Ð¾Ð²Ð¾
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Зберегти"
@@@ -16628,7 -16628,7 +16916,11 @@@ msgid "The stream must be playing or pa
msgstr ""
"Потік повинен перебувати в режимі Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð°Ð±Ð¾ паузи Ð´Ð»Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ закладок."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Перейти до чаÑу"
@@@ -16648,7 -16648,7 +16940,11 @@@ msgstr "Клацніть Ð´Ð»Ñ Ð²Ñ–Ð´Ñ
msgid "Backward"
msgstr "Ðазад"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16660,7 -16660,7 +16956,11 @@@ msgstr "
msgid "Forward"
msgstr "Вперед"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16684,23 -16684,15 +16984,35 @@@ msgstr "Перемкнути повно
msgid "Click to enable fullscreen video playback."
msgstr "ÐатиÑніть Ð´Ð»Ñ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ð· повноекранного Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ÐµÐ¾."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "ÐатиÑніть Ñ– утримуйте, щоб перемотати назад поточний медіафайл."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "ÐатиÑніть Ñ– утримуйте, щоб перемотати вперед поточний медіафайл."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "ÐатиÑніть Ð´Ð»Ñ Ð·ÑƒÐ¿Ð¸Ð½ÐºÐ¸ відтвореннÑ."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Показати/приховати ÑпиÑок відтвореннÑ"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "ÐатиÑніть Ð´Ð»Ñ Ð·ÑƒÐ¿Ð¸Ð½ÐºÐ¸ відтвореннÑ."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Показати/приховати ÑпиÑок відтвореннÑ"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -16709,12 -16701,12 +17021,20 @@@ msgstr "
"відео. Якщо в оÑновному вікні не видно відео, то ви можете приховати ÑпиÑок "
"Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ†Ñ–Ñ”ÑŽ кнопкою."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Повторювати"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -16722,15 -16714,15 +17042,27 @@@ msgstr "
"Клацніть, щоб змінити режим повтореннÑ. Можливі 3 Ñтани: повторювати одну "
"позицію, повторювати вÑе Ñ– вимкн."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Перемішати"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "ÐатиÑніть Ð´Ð»Ñ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð½Ñ/Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ð²Ð¸Ð¿Ð°Ð´ÐºÐ¾Ð²Ð¾Ð³Ð¾ відтвореннÑ."
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Перемішати"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "ÐатиÑніть Ð´Ð»Ñ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð½Ñ/Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ð²Ð¸Ð¿Ð°Ð´ÐºÐ¾Ð²Ð¾Ð³Ð¾ відтвореннÑ."
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -16738,24 -16730,24 +17070,44 @@@ msgstr "
"Клацніть і, утримуючи кнопку миші, переміщайте повзунок, щоб змінити "
"гучніÑÑ‚ÑŒ."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "ÐатиÑніть Ð´Ð»Ñ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð½Ñ/Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Повна гучніÑÑ‚ÑŒ"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "ÐатиÑніть Ð´Ð»Ñ Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ на макÑимальній гучноÑÑ‚Ñ–."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "ÐатиÑніть Ð´Ð»Ñ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð½Ñ/Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Повна гучніÑÑ‚ÑŒ"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "ÐатиÑніть Ð´Ð»Ñ Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ на макÑимальній гучноÑÑ‚Ñ–."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Ефекти"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -16763,14 -16755,22 +17115,33 @@@ msgstr "
"Клацніть, щоб відкрити панель аудіофільтрів, що включає еквалайзер і інші "
"фільтри."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "ÐатиÑніть Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ñƒ до попереднього елементу ÑпиÑку відтвореннÑ."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "ÐатиÑніть Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ñƒ до наÑтупного елемента ÑпиÑку відтвореннÑ."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "ÐатиÑніть Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ñƒ до попереднього елементу ÑпиÑку відтвореннÑ."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "ÐатиÑніть Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ñƒ до наÑтупного елемента ÑпиÑку відтвореннÑ."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "ÐатиÑніть Ñ– утримуйте, щоб перемотати назад поточний медіафайл."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "ÐатиÑніть Ñ– утримуйте, щоб перемотати вперед поточний медіафайл."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Конвертувати/Передати"
@@@ -16806,7 -16806,7 +17177,11 @@@ msgstr "Виберіть розташу
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16993,8 -16993,8 +17368,13 @@@ msgid "A SDP export is requested, but n
msgstr "Вибрано екÑпорт SDP, але відповідну адреÑу не вказано."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Довільно"
@@@ -17096,36 -17096,36 +17476,68 @@@ msgstr "
msgid "Don't ask again"
msgstr "Ðе запитувати знову"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "Ð’Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñƒ VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Журнал збою не знайдено"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "Ð’Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñƒ VLC"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Журнал збою не знайдено"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Продовжити"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Ðе можу знайти нічого від попереднього збою."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Видалити Ñтарі параметри?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Ми щойно виÑвили Ñтарі файли налаштувань VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "ПереміÑтити до кошика та перезапуÑтити VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Ðе можу знайти нічого від попереднього збою."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Видалити Ñтарі параметри?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Ми щойно виÑвили Ñтарі файли налаштувань VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "ПереміÑтити до кошика та перезапуÑтити VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "Журнал Ð½Ð°Ð»Ð°Ð³Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ VLC (%s).rtf"
@@@ -17303,7 -17303,7 +17715,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr "Ð¦Ñ Ð¾Ð¿Ñ†Ñ–Ñ Ð´Ð°Ñ” змогу інтерфейÑу змінювати іконку в різних випадках."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Заблокувати ÑÐ¿Ñ–Ð²Ð²Ñ–Ð´Ð½Ð¾ÑˆÐµÐ½Ð½Ñ Ñторін"
@@@ -17435,7 -17435,7 +17851,11 @@@ msgstr "Приховати VLC
msgid "Hide Others"
msgstr "Приховати інше"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Показати вÑе"
@@@ -17520,15 -17520,15 +17940,27 @@@ msgstr "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ Ð´Ð¾
msgid "A→B Loop"
msgstr "Цикл A→B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Вийти піÑÐ»Ñ Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Крок вперед"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Вийти піÑÐ»Ñ Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Крок вперед"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Крок назад"
@@@ -17544,30 -17544,30 +17976,56 @@@ msgstr "Зменшити гучніÑÑ‚
msgid "Audio Device"
msgstr "Звуковий приÑтрій"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Половина розміру"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Ðормальний розмір"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Подвійний розмір"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Екранний розмір"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Половина розміру"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Ðормальний розмір"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Подвійний розмір"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Екранний розмір"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Зверху вÑÑ–Ñ… вікон"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "ПриÑтрій повноекранного відео"
@@@ -17576,7 -17576,7 +18034,11 @@@
msgid "Post processing"
msgstr "ПоÑÑ‚-обробка"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Додати файл Ñубтитрів…"
@@@ -17816,7 -17816,7 +18278,11 @@@ msgid "Play another media synchronously
msgstr "Відтворити Ñинхронно інше медіа"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Вибрати…"
@@@ -18004,7 -18004,7 +18470,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "ÐšÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñубтитрів"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Розмір шрифту"
@@@ -18233,12 -18233,12 +18703,20 @@@ msgstr "Помилка збережен
msgid "VLC was unable to save the meta data."
msgstr "VLC не зміг зберегти метадані."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Параметри"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "ПерезапуÑк уÑього"
@@@ -18417,130 -18417,125 +18895,238 @@@ msgstr "Увімкнути Ñповіщ
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Призупинити iTunes під Ñ‡Ð°Ñ Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Стандартне кодуваннÑ"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Параметри диÑплею"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Стандартне кодуваннÑ"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Параметри диÑплею"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Колір шрифту"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Шрифт"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Мови Ñубтитрів"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Мови Ñубтитрів"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Переважна мова Ñубтитрів"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Увімкнути OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Увімкнути OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "ÐепрозоріÑÑ‚ÑŒ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "ПримуÑово викориÑтовувати жирний шрифт"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "ПримуÑово викориÑтовувати жирний шрифт"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Колір контура"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Товщина обведеннÑ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Робити чорним екран Ð´Ð»Ñ Ð¿Ð¾Ð²Ð½Ð¾ÐµÐºÑ€Ð°Ð½Ð½Ð¾Ð³Ð¾ режиму"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Робити чорним екран Ð´Ð»Ñ Ð¿Ð¾Ð²Ð½Ð¾ÐµÐºÑ€Ð°Ð½Ð½Ð¾Ð³Ð¾ режиму"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "ДиÑплей"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Модуль виводу"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Стоп-кадри"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Каталог"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Формат"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "ПрефікÑ"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "ПоÑлідовна нумераціÑ"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "ОÑÑ‚Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ°: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Ще не було перевірки."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Модуль виводу"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Стоп-кадри"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Каталог"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Формат"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "ПрефікÑ"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "ПоÑлідовна нумераціÑ"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "ОÑÑ‚Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ°: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Ще не було перевірки."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Ðайнижча затримка"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Ðизька затримка"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "ВиÑока затримка"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Вища затримка"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "ПерезапуÑк параметрів"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18562,20 -18557,20 +19148,37 @@@ msgstr "
"\n"
"Ви Ñправді хочете продовжити?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Оберіть каталог, до Ñкого зберігати Ñтоп-кадри"
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Вибрати"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Виберіть каталог або файл, куди зберігатимутьÑÑ Ð·Ð°Ð¿Ð¸Ñи."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Оберіть каталог, до Ñкого зберігати Ñтоп-кадри"
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Вибрати"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Виберіть каталог або файл, куди зберігатимутьÑÑ Ð·Ð°Ð¿Ð¸Ñи."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18583,16 -18578,16 +19186,29 @@@ msgstr "
"ÐатиÑніть клавішу длÑ\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Ðеправильна комбінаціÑ"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Ðа жаль, ці клавіші не можуть бути комбінацією гарÑчих клавіш."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Ðеправильна комбінаціÑ"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Ðа жаль, ці клавіші не можуть бути комбінацією гарÑчих клавіш."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Ð¦Ñ ÐºÐ¾Ð¼Ð±Ñ–Ð½Ð°Ñ†Ñ–Ñ Ð²Ð¶Ðµ зайнÑта \"%@\"."
@@@ -20673,20 -20668,20 +21289,36 @@@ msgstr "Видалити обраниÐ
msgid "Create a new profile"
msgstr "Створити новий профіль"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Створити"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "Цей мікÑер не входить до Ñкладу VLC: він може бути відÑутнім."
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Ðе виÑтачає імені профілю"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr "Цей мікÑер не входить до Ñкладу VLC: він може бути відÑутнім."
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Ðе виÑтачає імені профілю"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Ви маєте вÑтановити Ñ–Ð¼â€™Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ."
@@@ -24232,23 -24227,23 +24864,43 @@@ msgstr "Перекодувати вих
msgid "Overlays/Subtitles"
msgstr "Шари/Ñубтитри"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "Моноширинний шрифт"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Родина шрифту, Ñкий ви хочете викориÑтовувати"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Ðазва файлу викориÑтовуваного шрифту"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Розмір шрифту в пікÑелÑÑ…"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "Моноширинний шрифт"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Родина шрифту, Ñкий ви хочете викориÑтовувати"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Ðазва файлу викориÑтовуваного шрифту"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Розмір шрифту в пікÑелÑÑ…"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -24257,11 -24252,11 +24909,19 @@@ msgstr "
"Стандартний розмір шрифтів, Ñкі будуть виводитиÑÑ Ð½Ð° відео. Якщо Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ "
"цього параметра відмінне від 0, то воно перепише відноÑний розмір шрифту."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "ÐепрозоріÑÑ‚ÑŒ текÑту"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "ÐепрозоріÑÑ‚ÑŒ текÑту"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -24269,12 -24264,12 +24929,20 @@@ msgstr "
"ÐепрозоріÑÑ‚ÑŒ текÑту, Ñкий буде виводитиÑÑ Ð½Ð° відео. 0 = прозорий, 255 = "
"повніÑÑ‚ÑŽ непрозорий."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Стандартний колір текÑту"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24287,12 -24282,12 +24955,20 @@@ msgstr "
"потім зелений і жовтий. #000000 = чорний, #FF0000 = червоний, #00FF00 = "
"зелений, #FFF00 = жовтий (червоний + зелений), #FFFFFF = білий"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "ВідноÑний розмір шрифту"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -24301,59 -24296,59 +24977,111 @@@ msgstr "
"Стандартний відноÑний розмір шрифтів, Ñкі буде виводитиÑÑ Ð½Ð° відео. Якщо "
"зазначений абÑолютний розмір шрифту, відноÑний буде ігноровано."
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "ÐепрозоріÑÑ‚ÑŒ тла"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Колір тла"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "ÐепрозоріÑÑ‚ÑŒ контура"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "ÐепрозоріÑÑ‚ÑŒ тіні"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Колір тіні"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Кут тіні"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Довжина тіні"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "ÐепрозоріÑÑ‚ÑŒ тла"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Колір тла"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "ÐепрозоріÑÑ‚ÑŒ контура"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "ÐепрозоріÑÑ‚ÑŒ тіні"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Колір тіні"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Кут тіні"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Довжина тіні"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Менший"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Маленький"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Великий"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Більший"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "ВикориÑтовувати генератор YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "ВикориÑтовувати генератор YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
@@@ -24361,23 -24356,23 +25089,43 @@@ msgstr "
"Генерує шрифти, викориÑтовуючи «YUV з палітрою». Цей параметр необхідний "
"тільки Ñкщо Ви бажаєте кодувати у Ñубтитри DVB"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Тонкі"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "ТовÑÑ‚Ñ–"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Генератор текÑту"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Генератор шрифтів Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Тонкі"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "ТовÑÑ‚Ñ–"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Генератор текÑту"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Генератор шрифтів Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/uz.po
index 23e2a78,9894e76..e43a1f3
--- a/po/uz.po
+++ b/po/uz.po
@@@ -8,8 -8,8 +8,13 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
+"PO-Revision-Date: 2013-11-18 10:08+0000\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
+ "PO-Revision-Date: 2013-10-14 09:49+0000\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"Last-Translator: Umidjon Almasov <u.almasov at gmail.com>\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/vlc-trans/language/"
"uz/)\n"
@@@ -139,7 -139,7 +144,11 @@@ msgstr "Boshqa ovoz moslamalari va modu
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -236,7 -236,7 +245,11 @@@ msgstr "Ovoz dekoderlarining va koderla
#: include/vlc_config_cat.h:117
msgid "Subtitle codecs"
++<<<<<<< HEAD
+msgstr "Tagsarlavha kodeklari"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: include/vlc_config_cat.h:118
msgid "Settings for subtitle, teletext and CC decoders and encoders."
@@@ -453,10 -453,10 +466,17 @@@ msgid "&About
msgstr "&Dastur haqida"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -495,17 -495,17 +515,29 @@@ msgid "Save...
msgstr "Saqlash..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Hammasini qaytarish"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Bittasini qaytarish"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -585,7 -585,7 +617,11 @@@ msgstr "Filtrlar eng katta soniga (%u)
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "O'chirish"
@@@ -991,11 -991,11 +1027,19 @@@ msgstr "Menyu
#: src/config/keys.c:105
msgid "Mouse Wheel Down"
++<<<<<<< HEAD
+msgstr "Sichqoncha g'ildiragi pastga"
+
+#: src/config/keys.c:106
+msgid "Mouse Wheel Left"
+msgstr "Sichqoncha g'ildiragi chapga"
++=======
+ msgstr ""
+
+ #: src/config/keys.c:106
+ msgid "Mouse Wheel Left"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/config/keys.c:107
msgid "Mouse Wheel Right"
@@@ -1249,20 -1249,20 +1293,36 @@@ msgstr "
msgid "Decoded format"
msgstr "Kodlanmagan format"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Kiritishni ochib bo'lmadi"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Kiritishni ochib bo'lmadi"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "'%s' MRLni ochib bo'lmadi. Tafsilotlar uchun logni ko'ring."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "Kiritish formatini aniqlab bo'lmadi"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "Kiritish formatini aniqlab bo'lmadi"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1658,7 -1658,7 +1718,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1740,7 -1740,7 +1804,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Yo'q"
@@@ -1764,7 -1764,7 +1832,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Video yoqish"
@@@ -1803,7 -1803,7 +1875,11 @@@ msgstr "
#: src/libvlc-module.c:264
msgid "Video X coordinate"
++<<<<<<< HEAD
+msgstr "Video X koordinati"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:266
msgid ""
@@@ -1813,7 -1813,7 +1889,11 @@@ msgstr "
#: src/libvlc-module.c:269
msgid "Video Y coordinate"
++<<<<<<< HEAD
+msgstr "Video Y koordinati"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:271
msgid ""
@@@ -1823,7 -1823,7 +1903,11 @@@ msgstr "
#: src/libvlc-module.c:274
msgid "Video title"
++<<<<<<< HEAD
+msgstr "Video sarlavhasi"
++=======
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:276
msgid ""
@@@ -1954,9 -1954,9 +2038,15 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
+msgid "Always on top"
+msgstr "Doim yuqorida"
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
+ msgid "Always on top"
+ msgstr ""
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: src/libvlc-module.c:313
msgid "Always place the video window on top of other windows."
@@@ -2005,7 -2005,7 +2095,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2014,7 -2014,7 +2108,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2070,7 -2070,7 +2168,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2239,7 -2239,7 +2341,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2367,12 -2367,12 +2473,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2380,7 -2380,7 +2495,11 @@@ msgid "Default
msgstr "Andoza"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2683,7 -2683,7 +2802,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3504,7 -3504,7 +3627,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3528,8 -3528,8 +3655,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3609,10 -3609,10 +3741,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3625,10 -3625,10 +3764,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr ""
@@@ -3637,9 -3637,9 +3783,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3874,9 -3874,9 +4026,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4290,7 -4290,7 +4448,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4489,12 -4489,12 +4651,21 @@@ msgstr "Yuklab olinmoqda ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Bekor qilish"
@@@ -5252,7 -5252,7 +5423,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7548,7 -7548,7 +7723,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8280,7 -8280,7 +8459,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9391,7 -9391,7 +9574,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9422,7 -9422,7 +9609,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9430,30 -9430,30 +9621,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10619,46 -10619,46 +10834,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10666,61 -10666,61 +10909,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10850,7 -10850,7 +11129,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12637,10 -12637,10 +12920,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -12745,8 -12745,8 +13035,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13082,9 -13082,9 +13377,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -14962,7 -14962,7 +15263,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15141,7 -15141,7 +15446,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15229,9 -15229,9 +15538,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr ""
@@@ -15370,7 -15370,7 +15685,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15390,7 -15390,7 +15709,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15400,7 -15400,7 +15723,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15420,84 -15420,84 +15747,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15533,7 -15533,7 +15931,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15716,8 -15716,8 +16118,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -15810,36 -15810,36 +16217,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15991,7 -15991,7 +16430,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16120,7 -16120,7 +16563,11 @@@ msgstr "
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr ""
@@@ -16205,15 -16205,15 +16652,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16229,30 -16229,30 +16688,56 @@@ msgstr "
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16261,7 -16261,7 +16746,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16489,7 -16489,7 +16978,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -16660,7 -16660,7 +17153,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -16889,12 -16889,12 +17386,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17071,129 -17071,125 +17576,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Shrift rangi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17206,35 -17202,35 +17819,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19172,20 -19168,20 +19815,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22488,45 -22484,45 +23147,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22535,93 -22531,93 +23230,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
@@@ -27386,7 -27382,7 +28161,11 @@@ msgstr "
#, fuzzy
#~ msgid "Subtitles codecs"
++<<<<<<< HEAD
+#~ msgstr "Tagsarlavha kodeklari"
++=======
+ #~ msgstr "Subtitrlar"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Settings for subtitles, teletext and CC decoders and encoders."
@@@ -27491,7 -27487,7 +28270,11 @@@
#, fuzzy
#~ msgid "Subtitle Codec"
++<<<<<<< HEAD
+#~ msgstr "Tagsarlavha kodeklari"
++=======
+ #~ msgstr "Subtitr"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "Output Method"
@@@ -27527,7 -27523,7 +28310,11 @@@
#, fuzzy
#~ msgid "Subtitles effects"
++<<<<<<< HEAD
+#~ msgstr "Tagsarlavha kodeklari"
++=======
+ #~ msgstr "Subtitrlar"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
#~ msgid "DVB"
diff --combined po/vi.po
index 3585226,4269025..d223157
--- a/po/vi.po
+++ b/po/vi.po
@@@ -9,7 -9,7 +9,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-08-18 11:14+0000\n"
"Last-Translator: ppanhh <ppanhh at gmail.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -140,7 -140,7 +144,11 @@@ msgstr "Tổng hợp thiết láºp audi
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -498,10 -498,10 +506,17 @@@ msgid "&About
msgstr "&Thông tin vỠVLC"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -540,17 -540,17 +555,29 @@@ msgid "Save...
msgstr "LÆ°u..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Lặp lại tất cả"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Lặp lại một lần"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -714,7 -714,7 +741,11 @@@ msgstr "Số lượng tối đa dà nh c
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Vô hiệu"
@@@ -1413,22 -1413,22 +1444,38 @@@ msgstr "Tỉ lệ Frame
msgid "Decoded format"
msgstr "Äịnh dạng giải mã"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Gặp lá»—i khi tác Ä‘á»™ng lên dữ liệu được nháºp và o"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Gặp lá»—i khi tác Ä‘á»™ng lên dữ liệu được nháºp và o"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC không thể mở MRL '%s'. Kiểm tra log hay pháºt nháºt ký chÆ°Æ¡ng trình để "
"biết thêm."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC không thể nháºn diện được định dạng dữ liệu nháºp và o"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC không thể nháºn diện được định dạng dữ liệu nháºp và o"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1870,7 -1870,7 +1917,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1958,7 -1958,7 +2009,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Không"
@@@ -1990,7 -1990,7 +2045,11 @@@ msgstr "
"Phương thức xuất dữ liệu đầu ra nà y đối với video được sỠdụng bởi VLC. "
"PhÆ°Æ¡ng thức nà y được lá»±a chá»n theo chế Ä‘á»™ tá»± Ä‘á»™ng nhằm đạt hiệu quả cao nhất."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Báºt tÃnh năng Video"
@@@ -2204,7 -2204,7 +2263,11 @@@ msgstr "
"dạng các thông số mặc định."
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Luôn luôn đặt trên cùng"
@@@ -2264,7 -2264,7 +2327,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2273,7 -2273,7 +2340,11 @@@ msgstr "Chống quét mà nh
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Chế độ chống quét mà nh/deinterlace"
@@@ -2331,7 -2331,7 +2402,11 @@@ msgstr "
"Tắt phần thông báo quản lý Ä‘iện năng khi Ä‘ang hiển thị audio/video, Ä‘iá»u nà y "
"nhằm tránh cho việc trình chiếu bị tạm dừng đột ngột vì một lý do nà o đó."
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Há»a tiết cá»a sổ"
@@@ -2546,7 -2546,7 +2621,11 @@@ msgstr "
"có các điểm ảnh vuông (1:1). Nhưng nếu bạn sở hữu thiết bị có mà n hình 16:9, "
"bạn cần thay đổi tỉ lệ nà y thà nh 4:3 nhằm có được phần hiển thị tốt nhất."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "BỠqua khung hình"
@@@ -2700,12 -2700,12 +2779,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2713,7 -2713,7 +2801,11 @@@ msgid "Default
msgstr "Mặc định"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -3072,7 -3072,7 +3164,11 @@@ msgstr "
"Bạn có thể hoà n toà n vô hiệu hóa tiến trình xá» lý hình ảnh Ä‘i kèm vá»›i phụ Ä‘á»."
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -4090,7 -4090,7 +4186,11 @@@ msgstr "
"Các thiết láºp nà y sẽ được sá» dụng trong toà n bá»™ các tiến trình mà VLC thá»±c "
"hiện, hay còn gá»i là \"phÃm tắt\"."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Bá» qua"
@@@ -4116,8 -4116,8 +4216,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -4197,10 -4197,10 +4302,17 @@@ msgid "Slower (fine)
msgstr "Cháºm hÆ¡n (tốt)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -4213,10 -4213,10 +4325,17 @@@ msgid "Select the hotkey to use to ski
msgstr "Sá» dụng phÃm tắt để nhảy đến táºp tin kế tiếp trong danh sách"
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Trước đó"
@@@ -4225,9 -4225,9 +4344,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "Sá» dụng phÃm tắt để lùi vá» táºp tin kế tiếp trong danh sách."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4466,9 -4466,9 +4591,15 @@@ msgid "Select the key to decrease audi
msgstr "Chá»n phÃm tắt để giảm âm lượng."
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Tắt âm thanh"
@@@ -4888,7 -4888,7 +5019,11 @@@ msgstr "Lướt qua các thiết bị a
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Hình chụp"
@@@ -5095,12 -5095,12 +5230,21 @@@ msgstr "Äang tải...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Hủy bá»"
@@@ -5864,7 -5864,7 +6008,11 @@@ msgstr "Bá»
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Tỉ lệ đồng dạng"
@@@ -8390,7 -8390,7 +8538,11 @@@ msgstr "Dữ liệu mà n hình đầu v
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Mà n hình"
@@@ -9148,7 -9148,7 +9300,11 @@@ msgstr "Âlượng tối đa #
msgid "Volume Set"
msgstr "Chỉnh âm lượng"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10352,7 -10352,7 +10508,11 @@@ msgstr "Surround 7.1
msgid "ALSA audio output"
msgstr "Dữ liệu đầu ra ALSA audio"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "Thất bị với dữ liệu đầu ra audio"
@@@ -10385,7 -10385,7 +10545,11 @@@ msgstr "Äịnh dạng audio đầu ra
msgid "Android AudioTrack audio output"
msgstr "Äịnh dạng audio đầu ra cho "
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "ÄÆ¡n vị audio đầu ra cho iOS"
@@@ -10393,32 -10393,32 +10557,56 @@@
msgid "Last audio device"
msgstr "Thiết bị audio trước đó"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL AudioUnit đầu ra"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL AudioUnit đầu ra"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
"Thiết bị audio đầu ra được chá»n hoà n toà n bị tiếm quyá»n sá» dụng bởi má»™t "
"chương trình khác."
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "Thiết bị audio nà y vẫn chưa được chỉnh thông số"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "Thiết bị audio nà y vẫn chưa được chỉnh thông số"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "Hệ thống thiết bị âm thanh đầu ra"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "Hệ thống thiết bị âm thanh đầu ra"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (dữ liệu đầu ra được mã hóa)"
@@@ -11725,46 -11725,46 +11913,74 @@@ msgstr "Äổ bóng
msgid "Outline"
msgstr "ÄÆ°á»ng biên"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Äen"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Xám"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Bạc"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Trắng"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Nâu sẫm"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Äá»"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11772,61 -11772,61 +11988,97 @@@ msgid "Fuchsia
msgstr "Hoa vân anh"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "VÃ ng"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "MÃ u oliu"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Xanh lá"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Mòng két"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Äá» chanh lá"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Äá» tÃa"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Hải quân"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Xanh da trá»i"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11982,7 -11982,7 +12234,11 @@@ msgstr "Phụ đỠ(nâng cao)
msgid "Subtitle renderers using libass"
msgstr "Render phụ đỠsỠdụng libass"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Äang xây dá»±ng kiểu chữ cho bá»™ nhá»› đệm"
@@@ -13983,10 -13983,10 +14239,17 @@@ msgid "Fast
msgstr "Nhan"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Bình thÆ°á»ng"
@@@ -14094,8 -14094,8 +14357,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -14440,9 -14440,9 +14708,15 @@@ msgstr "Äang khởi tạo
msgid "Opening"
msgstr "Äang mở"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Tạm dừng"
@@@ -16371,7 -16371,7 +16645,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Tách kênh luồng váºn chuyển MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletext"
@@@ -16564,7 -16564,7 +16842,11 @@@ msgid "VLC media player Help
msgstr "Trợ giúp"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Danh mục"
@@@ -16652,9 -16652,9 +16934,15 @@@ msgstr "Äiá»n và o tên cho hồ sÆ¡
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "LÆ°u"
@@@ -16800,7 -16800,7 +17088,11 @@@ msgstr "
"Luồng dữ liệu phải được phát hoặc là tạm dừng để phần đánh dấu có thể hoạt "
"Ä‘á»™ng."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Nhảy đến thá»i gian"
@@@ -16820,7 -16820,7 +17112,11 @@@ msgstr "Click để phát hoặc tạm
msgid "Backward"
msgstr "Quay lại"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16832,7 -16832,7 +17128,11 @@@ msgstr "
msgid "Forward"
msgstr "Tiếp theo"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16857,25 -16857,15 +17157,37 @@@ msgid "Click to enable fullscreen vide
msgstr ""
"Click để báºt tÃnh năng hiển thị Ä‘iá»u khiển toà n mà n hình đối vá»›i video."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "Click và giữ để quay vỠđối tượng đằng sau so vá»›i táºp tin hiện tại."
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+"Click và giữ để Ä‘i đến đối tượng phÃa trÆ°á»›c so vá»›i táºp tin Ä‘ang phát hiện "
+"tại."
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "Click để dừng lại việc phát lại."
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Hiển thị/Ẩn danh sách"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "Click để dừng lại việc phát lại."
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Hiển thị/Ẩn danh sách"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -16884,12 -16874,12 +17196,20 @@@ msgstr "
"danh sách nà o trong cá»a sổ chÃnh, thì tùy chá»n nà y sẽ cho phép VLC ẩn Ä‘i "
"danh sách được phát."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Lặp lại"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
@@@ -16897,15 -16887,15 +17217,27 @@@ msgstr "
"Click để thay đổi chế độ lặp lại. Có 3 trạng thái: lặp lại một đối tượng, "
"lặp lại tất cả và tắt chế độ lặp lại."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Shuffle"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "Click để báºt hoặc vô hiệu tÃnh năng phát lại tá»± Ä‘á»™ng."
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Shuffle"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "Click để báºt hoặc vô hiệu tÃnh năng phát lại tá»± Ä‘á»™ng."
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
@@@ -16913,24 -16903,24 +17245,44 @@@ msgstr "
"Click và duy chuyển chuá»™t trong khi ấn giữ phÃm để sá» dụng thanh trượt nhằm "
"đổi âm thanh."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "Click để tắt/không tắt âm thanh audio."
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Âm lượng tối đa"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "Click để phát audio ở âm lượng tối đa."
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "Click để tắt/không tắt âm thanh audio."
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Âm lượng tối đa"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "Click để phát audio ở âm lượng tối đa."
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Hiệu ứng"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
@@@ -16938,14 -16928,24 +17290,35 @@@ msgstr "
"Click để hiển thị khung Ä‘iá»u khiển hiệu ứng audio bao gồm bá»™ cân bằng âm và "
"các bá»™ lá»c chuyên sâu khác."
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "Click để đi đến đối tượng trước đó trong danh sách."
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "Click để đi đến đối tượng tiếp theo trong danh sách."
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "Click để đi đến đối tượng trước đó trong danh sách."
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "Click để đi đến đối tượng tiếp theo trong danh sách."
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "Click và giữ để quay vỠđối tượng đằng sau so vá»›i táºp tin hiện tại."
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+ "Click và giữ để Ä‘i đến đối tượng phÃa trÆ°á»›c so vá»›i táºp tin Ä‘ang phát hiện "
+ "tại."
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "Chuyển đổi & Phân luồng dữ liệu"
@@@ -16981,7 -16981,7 +17354,11 @@@ msgstr "Chá»n má»™t vị trà để xu
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -17174,8 -17174,8 +17551,13 @@@ msgstr "
"chưa được cung cấp."
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Tá»± chá»n"
@@@ -17279,37 -17279,37 +17661,69 @@@ msgstr "
msgid "Don't ask again"
msgstr "Không há»i lại lần nữa"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "Chế độ phát lại của VLC"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Không tìm thấy báo cáo lỗi hệ thống"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "Chế độ phát lại của VLC"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Không tìm thấy báo cáo lỗi hệ thống"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Tiếp tục"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Không tìm thấy dấu vết vỠlần bị tắt đột ngột trước đó."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Loại bỠcác tùy chỉnh cũ?"
+
+#: modules/gui/macosx/intf.m:1937
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Không tìm thấy dấu vết vỠlần bị tắt đột ngột trước đó."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Loại bỠcác tùy chỉnh cũ?"
+
+ #: modules/gui/macosx/intf.m:1922
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "We just found an older version of VLC's preferences files."
msgstr ""
"Chúng tôi vừa tìm thấy má»™t táºp tin tùy biến của VLC nhÆ°ng ở phiên bản cÅ© hÆ¡n."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Di chuyển đến thùng rác và khởi động lại VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Di chuyển đến thùng rác và khởi động lại VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "Nháºt trình lá»—i của VLC (%s).rtf"
@@@ -17495,7 -17495,7 +17909,11 @@@ msgstr "
"Tùy chá»n nà y sẽ cho phép giao diện thay đổi các biểu tượng hiển thị theo "
"những dịp lễ, tết, hay sự kiện nà o đó."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Khóa tỉ lệ khung hình"
@@@ -17629,7 -17629,7 +18047,11 @@@ msgstr "Ẩn VLC
msgid "Hide Others"
msgstr "Ẩn các thà nh phần khác"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Hiển thị tất cả"
@@@ -17714,15 -17714,15 +18136,27 @@@ msgstr "Äồng bá»™ hóa Track
msgid "A→B Loop"
msgstr "Lặp từ A→B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Thoát sau khi phát xong"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Tiến tới"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Thoát sau khi phát xong"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Tiến tới"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Lùi vá»"
@@@ -17738,30 -17738,30 +18172,56 @@@ msgstr "Giảm âm lượng
msgid "Audio Device"
msgstr "Thiết bị audio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "KÃch thÆ°á»›c phân đôi"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "KÃch thÆ°á»›c bình thÆ°á»ng"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "KÃch thÆ°á»›c gấp đôi"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Vừa vặn với mà n hình"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "KÃch thÆ°á»›c phân đôi"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "KÃch thÆ°á»›c bình thÆ°á»ng"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "KÃch thÆ°á»›c gấp đôi"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Vừa vặn với mà n hình"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Nổi lên trên cùng"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Thiết bị hiển thị video toà n mà n hình"
@@@ -17770,7 -17770,7 +18230,11 @@@
msgid "Post processing"
msgstr "Tiá»n xá» lý"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "Thêm táºp tin phụ Ä‘á»..."
@@@ -18011,7 -18011,7 +18475,11 @@@ msgid "Play another media synchronously
msgstr "Phát táºp tin khác theo chế Ä‘á»™ đồng bá»™ hóa"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Chá»n..."
@@@ -18199,7 -18199,7 +18667,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "Mã hóa phụ Ä‘á»"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "KÃch thÆ°á»›c kiểu chữ"
@@@ -18428,12 -18428,12 +18900,20 @@@ msgstr "Lỗi khi lưu các thông tin
msgid "VLC was unable to save the meta data."
msgstr "VLC không thể lưu các thông tin bổ sung."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Tùy Biến"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Thiết láºp lại toà n bá»™"
@@@ -18615,130 -18615,125 +19095,238 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Dừng lại iTunes trong suốt chế độ phát lại của VLC"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Mã hóa mặc định"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Thiết láºp hiển thị"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Mã hóa mặc định"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Thiết láºp hiển thị"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Mà u Chữ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Kiểu chữ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "Ngôn ngữ của phụ Ä‘á»"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "Ngôn ngữ của phụ Ä‘á»"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "Ngôn ngữ phụ Ä‘á» Æ°a thÃch"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Cho phép hiển thị trên mà n hình"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Cho phép hiển thị trên mà n hình"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Äá»™ má»"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Bắt buá»™c in Ä‘áºm"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Bắt buá»™c in Ä‘áºm"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Mà u của Ä‘Æ°á»ng nét biên"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Äá»™ dà y nét chữ"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Hiển thị mà n hình mà u đen trong chế độ toà n mà n hình"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Hiển thị mà n hình mà u đen trong chế độ toà n mà n hình"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Hiển thị"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Phương thức xuất dữ liệu"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Chụp hình Video"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Thư mục"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Äịnh dạng"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Tiá»n tố"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Äánh số theo thứ tá»± liên tiếp"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Lần cuối cùng kiểm tra và o: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Vẫn chưa thực hiện việc kiểm tra."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Phương thức xuất dữ liệu"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Chụp hình Video"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Thư mục"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Äịnh dạng"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Tiá»n tố"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Äánh số theo thứ tá»± liên tiếp"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Lần cuối cùng kiểm tra và o: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Vẫn chưa thực hiện việc kiểm tra."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Äá»™ trá»… thấp nhất"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Äá»™ trá»… thấp"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Äá»™ trá»… cao"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Äá»™ trá»… cao hÆ¡n"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Thiết láºp lại toà n bá»™ Tùy Biến"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18760,20 -18755,20 +19348,37 @@@ msgstr "
"\n"
"Bạn có chắc muốn thực hiện thao tác nà y không?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Chá»n thÆ° mục mà bạn sẽ lÆ°u phần ảnh chụp các cảnh của video."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Chá»n"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "Chá»n thÆ° mục hoặc Ä‘iá»n và o tên táºp tin nhằm lÆ°u lại phần ghi âm."
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Chá»n thÆ° mục mà bạn sẽ lÆ°u phần ảnh chụp các cảnh của video."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Chá»n"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "Chá»n thÆ° mục hoặc Ä‘iá»n và o tên táºp tin nhằm lÆ°u lại phần ghi âm."
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18781,16 -18776,16 +19386,29 @@@ msgstr "
"Ấn phÃm má»›i cho\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Kết hợp không hợp lệ."
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "Rất đáng tiếc, những phÃm nà y không thể gán thà nh phÃm tắt được."
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Kết hợp không hợp lệ."
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "Rất đáng tiếc, những phÃm nà y không thể gán thà nh phÃm tắt được."
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Việc kết hợp đã được thực hiện bởi \"%@\"."
@@@ -20846,20 -20841,20 +21464,36 @@@ msgstr "Xóa hồ sÆ¡ đã chá»n
msgid "Create a new profile"
msgstr "Tạo một hồ sơ mới"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Tạo"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "Thiết tên hồ sơ"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "Thiết tên hồ sơ"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Bạn cần thiết láºp tên cho hồ sÆ¡ nà y."
@@@ -24303,45 -24298,45 +24937,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "KÃch thÆ°á»›c kiểu chữ bằng pixel"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "KÃch thÆ°á»›c kiểu chữ bằng pixel"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Mà u sắc văn bản mặc định"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -24350,93 -24345,93 +25020,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Äá»™ má» của hình ná»n"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Mà u của hình ná»n"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Äá»™ má» của Ä‘Æ°á»ng nét biên"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Äá»™ má» của bóng"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Mà u của bóng"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Góc đổ bóng"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Khoảng cách đổ bóng"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Äá»™ má» của hình ná»n"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Mà u của hình ná»n"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Äá»™ má» của Ä‘Æ°á»ng nét biên"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Äá»™ má» của bóng"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Mà u của bóng"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Góc đổ bóng"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Khoảng cách đổ bóng"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "NhỠhơn"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Nhá»"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Lá»›n"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Lớn hơn"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "SỠdụng trình render YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "SỠdụng trình render YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Má»ng"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "DÃ y"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Trình render văn bản"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Render kiểu chữ dạng Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Má»ng"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "DÃ y"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Trình render văn bản"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Render kiểu chữ dạng Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/vlc.pot
index 74c743b,74d1179..5a1a3a1
--- a/po/vlc.pot
+++ b/po/vlc.pot
@@@ -6,9 -6,9 +6,15 @@@
#, fuzzy
msgid ""
msgstr ""
++<<<<<<< HEAD
+"Project-Id-Version: vlc 2.1.2\n"
+"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "Project-Id-Version: vlc 2.1.1\n"
+ "Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@@ -132,7 -132,7 +138,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -439,10 -439,10 +449,17 @@@ msgid "&About
msgstr ""
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -481,17 -481,17 +498,29 @@@ msgid "Save...
msgstr ""
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr ""
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr ""
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -571,7 -571,7 +600,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr ""
@@@ -1229,20 -1229,20 +1262,36 @@@ msgstr "
msgid "Decoded format"
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1633,7 -1633,7 +1682,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1715,7 -1715,7 +1768,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr ""
@@@ -1739,7 -1739,7 +1796,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr ""
@@@ -1929,7 -1929,7 +1990,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr ""
@@@ -1980,7 -1980,7 +2045,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -1989,7 -1989,7 +2058,11 @@@ msgstr "
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr ""
@@@ -2045,7 -2045,7 +2118,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr ""
@@@ -2214,7 -2214,7 +2291,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr ""
@@@ -2342,12 -2342,12 +2423,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2355,7 -2355,7 +2445,11 @@@ msgid "Default
msgstr ""
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2658,7 -2658,7 +2752,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3470,7 -3470,7 +3568,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr ""
@@@ -3494,8 -3494,8 +3596,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3575,10 -3575,10 +3682,17 @@@ msgid "Slower (fine)
msgstr ""
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3591,10 -3591,10 +3705,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr ""
@@@ -3603,9 -3603,9 +3724,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3840,9 -3840,9 +3967,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr ""
@@@ -4256,7 -4256,7 +4389,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr ""
@@@ -4453,12 -4453,12 +4590,21 @@@ msgstr "
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr ""
@@@ -5214,7 -5214,7 +5360,11 @@@ msgstr "
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr ""
@@@ -7510,7 -7510,7 +7660,11 @@@ msgstr "
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr ""
@@@ -8242,7 -8242,7 +8396,11 @@@ msgstr "
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9353,7 -9353,7 +9511,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr ""
@@@ -9384,7 -9384,7 +9546,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9392,30 -9392,30 +9558,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr ""
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -10581,46 -10581,46 +10771,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10628,61 -10628,61 +10846,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr ""
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10812,7 -10812,7 +11066,11 @@@ msgstr "
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -12599,10 -12599,10 +12857,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr ""
@@@ -12707,8 -12707,8 +12972,13 @@@ msgid "D-Bus control interface
msgstr ""
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13044,9 -13044,9 +13314,15 @@@ msgstr "
msgid "Opening"
msgstr ""
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr ""
@@@ -14925,7 -14925,7 +15201,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr ""
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr ""
@@@ -15104,7 -15104,7 +15384,11 @@@ msgid "VLC media player Help
msgstr ""
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr ""
@@@ -15192,9 -15192,9 +15476,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr ""
@@@ -15333,7 -15333,7 +15623,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr ""
@@@ -15353,7 -15353,7 +15647,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15363,7 -15363,7 +15661,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15383,84 -15383,84 +15685,155 @@@ msgstr "
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15496,7 -15496,7 +15869,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15679,8 -15679,8 +16056,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr ""
@@@ -15773,36 -15773,36 +16155,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -15954,7 -15954,7 +16368,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr ""
@@@ -16083,7 -16083,7 +16501,11 @@@ msgstr "
msgid "Hide Others"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr ""
@@@ -16168,15 -16168,15 +16590,27 @@@ msgstr "
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr ""
@@@ -16192,30 -16192,30 +16626,56 @@@ msgstr "
msgid "Audio Device"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr ""
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr ""
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr ""
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr ""
@@@ -16224,7 -16224,7 +16684,11 @@@
msgid "Post processing"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16452,7 -16452,7 +16916,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr ""
@@@ -16623,7 -16623,7 +17091,11 @@@ msgstr "
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr ""
@@@ -16852,12 -16852,12 +17324,20 @@@ msgstr "
msgid "VLC was unable to save the meta data."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr ""
@@@ -17034,129 -17034,125 +17514,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17169,35 -17165,35 +17757,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19135,20 -19131,20 +19753,36 @@@ msgstr "
msgid "Create a new profile"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr ""
@@@ -22451,45 -22447,45 +23085,81 @@@ msgstr "
msgid "Overlays/Subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22498,93 -22494,93 +23168,173 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/wa.po
index d38fba6,d78cfbc..187e3ae
--- a/po/wa.po
+++ b/po/wa.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-09 08:20+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Walloon (http://www.transifex.com/projects/p/vlc-trans/"
@@@ -138,7 -138,7 +142,11 @@@ msgstr "Apontiaedjes eyet modules odio
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -462,10 -462,10 +470,17 @@@ msgid "&About
msgstr "&Ã…d fwait"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -504,17 -504,17 +519,29 @@@ msgid "Save...
msgstr "Schaper..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Repeter totafwait"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Repeter ene feye"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -621,7 -621,7 +648,11 @@@ msgstr "Li nombe macsimom di passetes (
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "Dismete"
@@@ -1285,21 -1285,21 +1316,37 @@@ msgstr "Frecwince do cåde
msgid "Decoded format"
msgstr "Discôdêye cogne"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "Voste intrêye n' pout nén esse drovowe"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "Voste intrêye n' pout nén esse drovowe"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
"VLC n' a nén parvinou a drovi li MRL '%s'. Verifyî li djournå po les detays."
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC n' pout recnoxhe li cogne d'intrêye"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC n' pout recnoxhe li cogne d'intrêye"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1713,7 -1713,7 +1760,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1795,7 -1795,7 +1846,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Nole"
@@@ -1826,7 -1826,7 +1881,11 @@@ msgstr "
"Çouci est l' metôde di rexhowe videyo eployeye pa VLC. L' prémetowe "
"kidujhance est d' tchozei otomaticmint li meyeuse metôde disponibe."
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Mete en alaedje videyo"
@@@ -2030,7 -2030,7 +2089,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Tofer al copete"
@@@ -2090,7 -2090,7 +2153,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2099,7 -2099,7 +2166,11 @@@ msgstr "Disinterlacî
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Môde di disinterlaçmint"
@@@ -2155,7 -2155,7 +2226,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "GÃ¥liotaedjes del finiesse"
@@@ -2339,7 -2339,7 +2414,11 @@@ msgstr "
"waitroûles ont des picsels cwårés (1:1). Si vos avoz on waitroûle 16:9, vos "
"pôrîz aveur mezåjhe di candjî çoula e 4:3 po wårder les proporcions."
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Passer houte les cådes"
@@@ -2474,12 -2474,12 +2553,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2487,7 -2487,7 +2575,11 @@@ msgid "Default
msgstr "Prémetou"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2808,7 -2808,7 +2900,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3666,7 -3666,7 +3762,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Passer houte"
@@@ -3690,8 -3690,8 +3790,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3774,10 -3774,10 +3879,17 @@@ msgid "Slower (fine)
msgstr "Pus londjin (fén)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3792,10 -3792,10 +3904,17 @@@ msgstr "
"djivêye a djouwer."
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Di dvant"
@@@ -3806,9 -3806,9 +3925,15 @@@ msgstr "
"Tchoezixhoz l' rascourti a eployî po passer houte å cayet di dvant dins l' "
"djivêye a djouwer."
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4048,9 -4048,9 +4173,15 @@@ msgid "Select the key to decrease audi
msgstr "Tchoezixhoz l' tape po dischinde l' volume odio"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Moya"
@@@ -4464,7 -4464,7 +4595,11 @@@ msgstr "Blouke emey les éndjins odio d
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Waitroûlêye"
@@@ -4664,12 -4664,12 +4799,21 @@@ msgstr "Dj' aberwete...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Rinoncî"
@@@ -5436,7 -5436,7 +5580,11 @@@ msgstr "Côper dvins
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "Rapoirt lårdjeur/hôteur"
@@@ -7751,7 -7751,7 +7899,11 @@@ msgstr "Intrêye del waitroûle
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Waitroûle"
@@@ -8490,7 -8490,7 +8642,11 @@@ msgstr "Vol macs #
msgid "Volume Set"
msgstr "Defini l' volume"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9604,7 -9604,7 +9760,11 @@@ msgstr "
msgid "ALSA audio output"
msgstr "Rexhowe odio ALSA"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "L' rexhowe odio a fwait berwete"
@@@ -9637,7 -9637,7 +9797,11 @@@ msgstr "Rexhowe odio AudioQueue (iOS /
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9645,30 -9645,30 +9809,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "Rexhowe HAL AudioUnit"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "Rexhowe HAL AudioUnit"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "L' éndjin odio n' est nén apontyî"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "L' éndjin odio n' est nén apontyî"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr ""
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (Ecôdêye Rexhowe)"
@@@ -10839,46 -10839,46 +11027,74 @@@ msgstr "Ombe
msgid "Outline"
msgstr "Cotoû"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Noer"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Gris"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Ã…rdjint"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Blanc"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Maron"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Rodje"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10886,61 -10886,61 +11102,97 @@@ msgid "Fuchsia
msgstr "Fucsiyå"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Djaene"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Olîve"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Vert"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "Bleu sarcele"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "Vert clair"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Poûrpe"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Bleu marine"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Bleu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11078,7 -11078,7 +11330,11 @@@ msgstr "Sortites (sipepieus)
msgid "Subtitle renderers using libass"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "Costrure li muchete des fontes"
@@@ -12875,10 -12875,10 +13131,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Normå"
@@@ -12987,8 -12987,8 +13250,13 @@@ msgid "D-Bus control interface
msgstr "Eterface di controle D-Bus"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13328,9 -13328,9 +13596,15 @@@ msgstr "Dj' enonde
msgid "Opening"
msgstr "Drovaedje"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Djoker"
@@@ -15231,7 -15231,7 +15505,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Dismultiplecseu do floû d' berwetaedje MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "Teletecse"
@@@ -15410,7 -15410,7 +15688,11 @@@ msgid "VLC media player Help
msgstr "Aidance do djouweu d' media VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Indecse"
@@@ -15502,9 -15502,9 +15784,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Schaper"
@@@ -15643,7 -15643,7 +15931,11 @@@ msgstr "Nole intrêye di trovêye
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Aler a"
@@@ -15663,7 -15663,7 +15955,11 @@@ msgstr "
msgid "Backward"
msgstr "En erî"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15673,7 -15673,7 +15969,11 @@@ msgstr "
msgid "Forward"
msgstr "Èn avant"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15693,84 -15693,84 +15993,155 @@@ msgstr "Discandjî l' môde forrimpli l
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "Mostrer/Catchî l' djivêye a djouwer"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "Mostrer/Catchî l' djivêye a djouwer"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "Repeter"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "Comaxhî"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "Comaxhî"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "Volule a fond"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "Volule a fond"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Efets"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15806,7 -15806,7 +16177,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15989,8 -15989,8 +16364,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Da vosse"
@@@ -16083,38 -16083,38 +16463,70 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Tcheryî pus lon"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Dji n' a savou trover d' arote d'on tcheyaedje e rak di dvant."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Oister les ancyinnes preferinces?"
+
+#: modules/gui/macosx/intf.m:1937
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Dji n' a savou trover d' arote d'on tcheyaedje e rak di dvant."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Oister les ancyinnes preferinces?"
+
+ #: modules/gui/macosx/intf.m:1922
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "We just found an older version of VLC's preferences files."
msgstr ""
"Nos vnan djusse di trover ene pus viye modêye do fitchî des preferince di "
"VLC."
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Taper å batch et renonder VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Taper å batch et renonder VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16268,7 -16268,7 +16680,11 @@@ msgstr "
"Cisse tchuze permet a l' eterface di candjî ses imådjetes a sacwantès "
"etrevéns."
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Aclawer l' rapoirt lårdjeur/hôteur"
@@@ -16397,7 -16397,7 +16813,11 @@@ msgstr "Catchî VLC
msgid "Hide Others"
msgstr "Catchî les ôtes"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Mostrer tertos"
@@@ -16482,15 -16482,15 +16902,27 @@@ msgstr "Sincronijhaedje do Boket
msgid "A→B Loop"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Cwiter après l' djouwaedje"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Aler en avant"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Cwiter après l' djouwaedje"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Aler en avant"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Aler en erî"
@@@ -16506,30 -16506,30 +16938,56 @@@ msgstr "Dischinde Volume
msgid "Audio Device"
msgstr "Éndjin Odio"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Dimey Grandeu"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Grandeu Normåle"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Dobe Grandeu"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Adjinçner al waitroûle"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Dimey Grandeu"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Grandeu Normåle"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Dobe Grandeu"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Adjinçner al waitroûle"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Balter al copete"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Éndjin videyo forrimpli li waitroûle"
@@@ -16538,7 -16538,7 +16996,11 @@@
msgid "Post processing"
msgstr "Après traitmint"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr ""
@@@ -16766,7 -16766,7 +17228,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Tchoezi..."
@@@ -16937,7 -16937,7 +17403,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Grandeu del fonte"
@@@ -17166,12 -17166,12 +17636,20 @@@ msgstr "Aroke do tins di l' schapaedje
msgid "VLC was unable to save the meta data."
msgstr "VLC n' a savou nén schaper les meta-dnêyes."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Preferinces"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Rimete a zero"
@@@ -17350,129 -17350,125 +17828,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Prémetou ecôdaedje"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Apontiaedjes do håynaedje"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Prémetou ecôdaedje"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Apontiaedjes do håynaedje"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Coleur del fonte"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Fonte"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Mete en alaedje OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Mete en alaedje OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "Spexheur"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "Foirci l' crås"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "Foirci l' crås"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "Coleur do cotoû"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "Sipexheu do cotoû"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "HÃ¥yner"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Module di rexhowe"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Waitroûlêyes videyo"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Ridant"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Cogne"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Betchete "
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Secwinciel di limerotaedje"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Dierin verifyiaedje so: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Module di rexhowe"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Waitroûlêyes videyo"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Ridant"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Cogne"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Betchete "
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Secwinciel di limerotaedje"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Dierin verifyiaedje so: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Li pus basse latince"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Basse latince"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Hôte latince"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Pus hôte latince"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Rimete a zero les preferinces"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17485,20 -17481,20 +18071,37 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Tchoezixhoz l' ridant po schaper vos waitroûlêyes videyo."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Tchoezi"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Tchoezixhoz l' ridant po schaper vos waitroûlêyes videyo."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Tchoezi"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -17506,16 -17502,16 +18109,29 @@@ msgstr "
"Tchôkî novea tape po\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Combinåcion nén valide"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Combinåcion nén valide"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19483,20 -19479,20 +20099,36 @@@ msgstr "Disfacer li tchoezi profil
msgid "Create a new profile"
msgstr "Fé on novea profil"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Ahiver"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " Li No do Profil Manke"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " Li No do Profil Manke"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Vos divoz defini on no pol profil."
@@@ -22819,34 -22815,34 +23451,62 @@@ msgstr "Covierser l' rexhowe do floû
msgid "Overlays/Subtitles"
msgstr "Ricovris/Sortites"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "Famile di fonte pol fonte ki vos vloz eployî"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "Fitchî fonte pol font ki vos vloz eployî"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "Grandeu del fonte e picsels"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "Famile di fonte pol fonte ki vos vloz eployî"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "Fitchî fonte pol font ki vos vloz eployî"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "Grandeu del fonte e picsels"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "Spexheur do tecse"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "Spexheur do tecse"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
@@@ -22854,12 -22850,12 +23514,20 @@@ msgstr "
"Li spexheur (contråve di voeyoûte) do tecse ki serè håynêye sol videyo. 0 = "
"transparint, 255 = ttafwaitmint spès. "
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "Prémetowe coleur do tecse"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22872,93 -22868,93 +23540,173 @@@ msgstr "
"pwis pol vert, adon-pwis pol bleu. #000000 = noer, #FF0000 = rodje, #00FF00 "
"= vert, #FFFF00 = djaene (rodje + vert), #FFFFFF = blanc"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "Grandeu relative del fonte"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "Spexheur do fond"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "Coleur do fond"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "Spexheur do cotoû"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "Spexheur del ombe"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "Coleur del ombe"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "Inglêye del ombe"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "Discalaedje del ombe"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "Spexheur do fond"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "Coleur do fond"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "Spexheur do cotoû"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "Spexheur del ombe"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "Coleur del ombe"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "Inglêye del ombe"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "Discalaedje del ombe"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "Pus ptit"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "Pitit"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "Grand"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "Pus grand"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "Eployî l' moteur di rindou YUVP"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "Eployî l' moteur di rindou YUVP"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "Tene"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "Spès"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "Moteur di rindou do tecse"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Moteur di rindou di fonte Freetype2"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "Tene"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "Spès"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "Moteur di rindou do tecse"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Moteur di rindou di fonte Freetype2"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/zh_CN.po
index b63238b,36ce18f..b0c0df3
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -10,7 -10,7 +10,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-09-09 08:20+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Chinese (China) <vlc at lidian.info>\n"
@@@ -138,7 -138,7 +142,11 @@@ msgstr "其它音频设置与模å—。
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -465,10 -465,10 +473,17 @@@ msgid "&About
msgstr "关于(&A)"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -507,17 -507,17 +522,29 @@@ msgid "Save...
msgstr "ä¿å˜..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "全部é‡å¤"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "é‡å¤ä¸€æ¬¡"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -618,7 -618,7 +645,11 @@@ msgstr "已达到滤镜的最大数é‡
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "å…³é—"
@@@ -1311,20 -1311,20 +1342,36 @@@ msgstr "帧率
msgid "Decoded format"
msgstr "已解ç æ ¼å¼"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "æ‚¨çš„è¾“å…¥æ— æ³•è¢«æ‰“å¼€"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "æ‚¨çš„è¾“å…¥æ— æ³•è¢«æ‰“å¼€"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC æ— æ³•æ‰“å¼€ MRL '%s'。请检查日志获å–详细信æ¯ã€‚"
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC æ— æ³•è¯†åˆ«è¾“å…¥æ ¼å¼"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC æ— æ³•è¯†åˆ«è¾“å…¥æ ¼å¼"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1732,7 -1732,7 +1779,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1814,7 -1814,7 +1865,11 @@@ msgstr "è¿™å…许以ç¨ä½Žæˆ–ç¨é«˜çš„é
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "æ— "
@@@ -1841,7 -1841,7 +1896,11 @@@ msgid "
"automatically select the best method available."
msgstr "这是 VLC 使用的视频输出模å—。默认的行为是自动选择最佳的å¯ç”¨æ¨¡å—。"
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "å¼€å¯è§†é¢‘"
@@@ -2035,7 -2035,7 +2094,11 @@@ msgstr "
"覆盖是您显å¡çš„ç¡¬ä»¶åŠ é€ŸåŠŸèƒ½ (直接渲染视频的能力)。VLC 将默认å°è¯•ä½¿ç”¨å®ƒã€‚"
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "总在最å‰"
@@@ -2086,7 -2086,7 +2149,11 @@@ msgstr "在 x 毫秒åŽéšè—å…‰æ ‡å’Œå
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2095,7 -2095,7 +2162,11 @@@ msgstr "å交错
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "å交错模å¼"
@@@ -2151,7 -2151,7 +2222,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr "在æ’放时ç¦æ¢ç”µæºç®¡ç†ï¼Œé˜²æ¢è®¡ç®—æœºç”±äºŽé•¿æ—¶é—´æ— æ´»åŠ¨è€Œè¢«å…³é—。"
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "窗å£è£…饰"
@@@ -2335,7 -2335,7 +2410,11 @@@ msgstr "
"è¿™å¯ä»¥å¼ºåˆ¶è®¾ç½®é«˜å®½æ¯”。许多显示器有æ£æ–¹å½¢çš„åƒç´ (1:1)。如果您有一个 16:9 çš„å±"
"幕，您就需è¦æ›´æ”¹æ¤ä¸º 4:3 æ¥ä¿æŒåŒ€ç§°ã€‚ "
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "跳帧"
@@@ -2467,12 -2467,12 +2546,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2480,7 -2480,7 +2568,11 @@@ msgid "Default
msgstr "默认"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2807,7 -2807,7 +2899,11 @@@ msgid "You can completely disable the s
msgstr "您å¯ä»¥å®Œå…¨å…³é—åç”»é¢å¤„ç†ã€‚"
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3679,7 -3679,7 +3775,11 @@@ msgstr "æ’放列表å¯ä»¥ä½¿ç”¨æ ‘å½¢ç
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "这些设置被绑定为全局的 VLC 按键，也被称作 \"çƒé”®\"。"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "忽略"
@@@ -3703,8 -3703,8 +3803,13 @@@ msgstr "é¼ æ ‡æ»šè½®çºµè½´å¯æŽ§åˆ¶éŸ³é
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3784,10 -3784,10 +3889,17 @@@ msgid "Slower (fine)
msgstr "较慢 (好)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3800,10 -3800,10 +3912,17 @@@ msgid "Select the hotkey to use to ski
msgstr "选择用于跳到下一个æ’放列表项目的çƒé”®ã€‚"
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "上一个"
@@@ -3812,9 -3812,9 +3931,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr "选择用于跳到上一个æ’放列表项目的çƒé”®ã€‚"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4049,9 -4049,9 +4174,15 @@@ msgid "Select the key to decrease audi
msgstr "选择用于å‡å°éŸ³é‡çš„按键。"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "é™éŸ³"
@@@ -4465,7 -4465,7 +4596,11 @@@ msgstr "在å¯ç”¨çš„音频设备之间å
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "截图"
@@@ -4667,12 -4667,12 +4802,21 @@@ msgstr "æ£åœ¨ä¸‹è½½...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "å–消"
@@@ -5432,7 -5432,7 +5576,11 @@@ msgstr "è£å‰ª
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "高宽比"
@@@ -7809,7 -7809,7 +7957,11 @@@ msgstr "å±å¹•è¾“å…¥
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "å±å¹•"
@@@ -8549,7 -8549,7 +8701,11 @@@ msgstr "æœ€å¤§éŸ³é‡ #
msgid "Volume Set"
msgstr "音é‡è®¾ç½®"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9691,7 -9691,7 +9847,11 @@@ msgstr "环绕 7.1
msgid "ALSA audio output"
msgstr "ALSA 音频输出"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "音频输出失败"
@@@ -9724,7 -9724,7 +9884,11 @@@ msgstr "AudioQueue (iOS / Mac OS) 音é¢
msgid "Android AudioTrack audio output"
msgstr "Android AudioTrack 音频输出"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr "iOS AudioUnit 输出"
@@@ -9732,20 -9732,20 +9896,36 @@@
msgid "Last audio device"
msgstr "上次使用的音频设备"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr "HAL 音频å•å…ƒè¾“出"
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr "HAL 音频å•å…ƒè¾“出"
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr "选择的音频设备æ£åœ¨è¢«å…¶å®ƒåº”用程åºä½¿ç”¨ã€‚"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "未设置音频设备"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "未设置音频设备"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
@@@ -9753,11 -9753,11 +9933,19 @@@ msgstr "
"您应该在 /应用程åº/工具ä¸çš„ \"音频 midi 设置\" ä¸è®¾ç½®æ‚¨çš„扬声器摆放ä½ç½®ã€‚VLC "
"å°†åªä»¥ç«‹ä½“声模å¼è¾“出。"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "系统声音输出设备"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "系统声音输出设备"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (已编ç 的输出)"
@@@ -10984,46 -10984,46 +11172,74 @@@ msgstr "阴影
msgid "Outline"
msgstr "轮廓"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "黑色"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "ç°è‰²"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "银色"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "白色"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "æ —è‰²"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "红色"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11031,61 -11031,61 +11247,97 @@@ msgid "Fuchsia
msgstr "紫红色"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "黄色"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "橄榄绿"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "绿色"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "凫è“色"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "酸橙绿色"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "紫色"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "è—é’色"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "è“色"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11222,7 -11222,7 +11474,11 @@@ msgstr "å—幕 (高级)
msgid "Subtitle renderers using libass"
msgstr "使用 libass 渲染å—幕"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "æ£åœ¨åˆ›å»ºå—体缓å˜"
@@@ -13141,10 -13141,10 +13397,17 @@@ msgid "Fast
msgstr "å¿«"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "普通"
@@@ -13251,8 -13251,8 +13514,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus 控制界é¢"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13594,9 -13594,9 +13862,15 @@@ msgstr "æ£åœ¨åˆå§‹åŒ–
msgid "Opening"
msgstr "æ£åœ¨æ‰“å¼€"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "æš‚åœ"
@@@ -15495,7 -15495,7 +15769,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG ä¼ è¾“æµåŽ»å¤ç”¨å™¨"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "电报"
@@@ -15680,7 -15680,7 +15958,11 @@@ msgid "VLC media player Help
msgstr "VLC media player 帮助"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "索引"
@@@ -15768,9 -15768,9 +16050,15 @@@ msgstr "输入新é…置文件的å称:
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "ä¿å˜"
@@@ -15911,7 -15911,7 +16199,11 @@@ msgstr "找ä¸åˆ°è¾“å…¥
msgid "The stream must be playing or paused for bookmarks to work."
msgstr "必须是一个æ£åœ¨æ’放或暂åœçš„æµä¹¦ç¾æ‰èƒ½å·¥ä½œã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "跳转到时间"
@@@ -15931,7 -15931,7 +16223,11 @@@ msgstr "点击å¯æ’放或暂åœå½“å‰å
msgid "Backward"
msgstr "å—退"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15941,7 -15941,7 +16237,11 @@@ msgstr "点击å¯è½¬åˆ°æ’放列表ä¸ç
msgid "Forward"
msgstr "å¿«è¿›"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15961,23 -15961,15 +16261,35 @@@ msgstr "切æ¢å…¨å±æ¨¡å¼
msgid "Click to enable fullscreen video playback."
msgstr "点击å¯å¯ç”¨å…¨å±è§†é¢‘回放。"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr "按ä½å¯å¯¹å½“å‰åª’体快退æ’放。"
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr "按ä½å¯å¯¹å½“å‰åª’体快进æ’放。"
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr "点击å¯åœæ¢å›žæ”¾ã€‚"
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "显示/éšè—æ’放列表"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr "点击å¯åœæ¢å›žæ”¾ã€‚"
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "显示/éšè—æ’放列表"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
@@@ -15985,62 -15977,70 +16297,121 @@@ msgstr "
"点击å¯åœ¨è§†é¢‘输出与æ’放列表之间切æ¢ã€‚如果主窗å£ä¸æ²¡æœ‰è§†é¢‘显示，则å¯ä»¥éšè—æ’放"
"列表。"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr "é‡å¤"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr "点击å¯æ›´æ”¹é‡å¤æ¨¡å¼ã€‚有3 ç§çŠ¶æ€å¯é€‰: å•æ›²é‡å¤ã€å…¨éƒ¨é‡å¤ã€ä¸é‡å¤ã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr "éšæœº"
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr "点击å¯å¯ç”¨æˆ–ç¦ç”¨éšæœºå›žæ”¾ã€‚"
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr "éšæœº"
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr "点击å¯å¯ç”¨æˆ–ç¦ç”¨éšæœºå›žæ”¾ã€‚"
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr "在本滑动区域按ä½å·¦é”®å¹¶ç§»åŠ¨é¼ æ ‡å¯æ›´æ”¹éŸ³é‡å¤§å°ã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr "点击å¯é™éŸ³æˆ–å–消é™éŸ³ã€‚"
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr "最大音é‡"
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr "点击å¯ä»¥æœ€å¤§éŸ³é‡æ’放音频。"
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr "点击å¯é™éŸ³æˆ–å–消é™éŸ³ã€‚"
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr "最大音é‡"
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr "点击å¯ä»¥æœ€å¤§éŸ³é‡æ’放音频。"
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "效果"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr "点击å¯æ˜¾ç¤ºâ€œéŸ³é¢‘效果â€é¢æ¿ï¼Œå…¶ä¸å«æœ‰å‡è¡¡å™¨åŠå…¶ä»–过滤器ç‰åŠŸèƒ½ã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr "点击å¯è½¬åˆ°æ’放列表ä¸çš„å‰ä¸€é¡¹ã€‚"
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr "点击å¯è½¬åˆ°æ’放列表ä¸çš„åŽä¸€é¡¹ã€‚"
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr "点击å¯è½¬åˆ°æ’放列表ä¸çš„å‰ä¸€é¡¹ã€‚"
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr "点击å¯è½¬åˆ°æ’放列表ä¸çš„åŽä¸€é¡¹ã€‚"
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr "按ä½å¯å¯¹å½“å‰åª’体快退æ’放。"
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr "按ä½å¯å¯¹å½“å‰åª’体快进æ’放。"
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr "è½¬æ¢ & "
@@@ -16076,7 -16076,7 +16447,11 @@@ msgstr "选择一个输出ä½ç½®
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16260,8 -16260,8 +16635,13 @@@ msgid "A SDP export is requested, but n
msgstr "已请求 SDP 导出，但未æä¾› URL。"
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "自定义"
@@@ -16358,36 -16358,36 +16738,68 @@@ msgstr "仅会æ交您的默认电åé
msgid "Don't ask again"
msgstr "ä¸å†è¯¢é—®"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr "VLC 媒体回放"
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "找ä¸åˆ°å´©æºƒæ—¥å¿—"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr "VLC 媒体回放"
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "找ä¸åˆ°å´©æºƒæ—¥å¿—"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "继ç»"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "找ä¸åˆ°ä»»ä½•ä¸Šæ¬¡å´©æºƒçš„痕迹。"
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "è¦ç§»é™¤æ—§çš„å‚æ•°å—?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "我们å‘现了一个旧版本的 VLC å‚数文件。"
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "移动到回收站并é‡æ–°å¯åŠ¨ VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "找ä¸åˆ°ä»»ä½•ä¸Šæ¬¡å´©æºƒçš„痕迹。"
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "è¦ç§»é™¤æ—§çš„å‚æ•°å—?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "我们å‘现了一个旧版本的 VLC å‚数文件。"
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "移动到回收站并é‡æ–°å¯åŠ¨ VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "VLC 调试日志 (%s).rtf"
@@@ -16550,7 -16550,7 +16962,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr "本选项å…许界é¢åœ¨å„ç§æƒ…å†µä¸‹è‡ªåŠ¨æ›´æ”¹å›¾æ ‡ã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "é”定宽高比"
@@@ -16681,7 -16681,7 +17097,11 @@@ msgstr "éšè— VLC
msgid "Hide Others"
msgstr "éšè—其它"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "全部显示"
@@@ -16766,15 -16766,15 +17186,27 @@@ msgstr "轨é“åŒæ¥
msgid "A→B Loop"
msgstr "A→B 循环"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "æ’放åŽé€€å‡º"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "å‘å‰æ¥è¿›"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "æ’放åŽé€€å‡º"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "å‘å‰æ¥è¿›"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "å‘åŽæ¥è¿›"
@@@ -16790,30 -16790,30 +17222,56 @@@ msgstr "å‡å°éŸ³é‡
msgid "Audio Device"
msgstr "音频设备"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "一åŠå°ºå¯¸"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "普通尺寸"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "åŒå€å°ºå¯¸"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "适åˆå±å¹•"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "一åŠå°ºå¯¸"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "普通尺寸"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "åŒå€å°ºå¯¸"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "适åˆå±å¹•"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "悬浮在顶部"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "å…¨å±å¹•è§†é¢‘设备"
@@@ -16822,7 -16822,7 +17280,11 @@@
msgid "Post processing"
msgstr "预处ç†"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "æ·»åŠ å—幕文件..."
@@@ -17059,7 -17059,7 +17521,11 @@@ msgid "Play another media synchronously
msgstr "åŒæ—¶æ’放一个其它的媒体"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "选择..."
@@@ -17239,7 -17239,7 +17705,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "å—幕编ç "
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "å—体"
@@@ -17468,12 -17468,12 +17938,20 @@@ msgstr "在ä¿å˜å…ƒæ—¶å‘é€é”™è¯¯
msgid "VLC was unable to save the meta data."
msgstr "VLC æ— æ³•ä¿å˜å…ƒæ•°æ®ã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "å‚数设置"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "全部é‡ç½®"
@@@ -17650,130 -17650,125 +18128,238 @@@ msgstr "å¯ç”¨ Growl 通知（æ’放列
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "在 VLC 回放过程ä¸æš‚åœ iTunes æ’放"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "默认编ç "
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "显示设置"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "默认编ç "
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "显示设置"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "å—体颜色"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "å—体"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "å—幕è¯è¨€"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "å—幕è¯è¨€"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "å好å—幕è¯è¨€"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "å¼€å¯ OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "å¼€å¯ OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "ä¸é€æ˜Žåº¦"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "å¼ºåˆ¶åŠ ç²—"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "å¼ºåˆ¶åŠ ç²—"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "轮廓颜色"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "轮廓宽度"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "å…¨å±å¹•æ¨¡å¼ä¸çš„黑å±"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "å…¨å±å¹•æ¨¡å¼ä¸çš„黑å±"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "显示"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "输出模å¼"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "显示截图"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "文件夹"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "æ ¼å¼"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "å‰ç¼€"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "顺åºç¼–ç "
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "上次检查于: %@"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "尚未执行检查。"
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "输出模å¼"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "显示截图"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "文件夹"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "æ ¼å¼"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "å‰ç¼€"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "顺åºç¼–ç "
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "上次检查于: %@"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "尚未执行检查。"
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "最低潜ä¼æ—¶é—´"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "低潜ä¼"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "高潜ä¼æ—¶é—´"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "较高潜ä¼æ—¶é—´"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "é‡ç½®é¦–选项"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17794,20 -17789,20 +18380,37 @@@ msgstr "
"\n"
"是å¦ç¡®å®šè¦ç»§ç»?"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "选择您的视频截图è¦ä¿å˜çš„文件夹。"
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "选择"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr "选择å˜å‚¨å½•åˆ¶å†…容的目录或文件å。"
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "选择您的视频截图è¦ä¿å˜çš„文件夹。"
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "选择"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr "选择å˜å‚¨å½•åˆ¶å†…容的目录或文件å。"
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -17815,16 -17810,16 +18418,29 @@@ msgstr "
"请为下述功能按新键\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "æ— æ•ˆçš„ç»„åˆ"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr "很é—æ†¾ï¼Œè¿™äº›æŒ‰é”®æ— æ³•è¢«åˆ†é…为çƒé”®å¿«æ·æ–¹å¼ã€‚"
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "æ— æ•ˆçš„ç»„åˆ"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr "很é—æ†¾ï¼Œè¿™äº›æŒ‰é”®æ— æ³•è¢«åˆ†é…为çƒé”®å¿«æ·æ–¹å¼ã€‚"
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "æ¤ç»„åˆå·²ç»è¢« \"%@\" 使用。"
@@@ -19836,20 -19831,20 +20452,36 @@@ msgstr "åˆ é™¤é€‰ä¸çš„é…置文件
msgid "Create a new profile"
msgstr "创建新的é…置文件"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "创建"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr "该混æµå™¨å¹¶éžç”± VLC 直接æä¾›: å¯èƒ½å·²ç»ä¸¢å¤±ã€‚"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr "é…置文件å称缺失"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr "该混æµå™¨å¹¶éžç”± VLC 直接æä¾›: å¯èƒ½å·²ç»ä¸¢å¤±ã€‚"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr "é…置文件å称缺失"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "您必须为é…置文件设定一个å称。"
@@@ -23264,23 -23259,23 +23896,43 @@@ msgstr "转ç æµè¾“出
msgid "Overlays/Subtitles"
msgstr "覆盖/å—幕输出"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr "ç‰å®½å—体"
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "您è¦ä½¿ç”¨å—体的å—体集"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "您所è¦ä½¿ç”¨å—体的å—体文件"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "以åƒç´ 为å•ä½çš„å—体大å°"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr "ç‰å®½å—体"
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "您è¦ä½¿ç”¨å—体的å—体集"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "您所è¦ä½¿ç”¨å—体的å—体文件"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "以åƒç´ 为å•ä½çš„å—体大å°"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
@@@ -23289,23 -23284,23 +23941,39 @@@ msgstr "
"这是将会在视频上渲染的默认å—体大å°ã€‚如果设置任æ„ä¸ç‰äºŽ 0 的值就将会覆盖相对å—"
"体大å°ã€‚"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "文本ä¸é€æ˜Žåº¦"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "文本ä¸é€æ˜Žåº¦"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
"å°†è¦åœ¨è§†é¢‘上渲染的文本ä¸é€æ˜Žåº¦ (相对于é€æ˜Žåº¦)。0 = é€æ˜Žã€255 = 完全ä¸é€æ˜Žã€‚"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "文本默认色彩"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23317,12 -23312,12 +23985,20 @@@ msgstr "
"红，然åŽæ˜¯ç»¿ã€è“。#000000 = 黑ã€#FF0000 = 红ã€#00FF00 = 绿ã€#FFFF00 = 黄 (红 "
"+ 绿)ã€#FFFFFF = 白"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "相对å—体大å°"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -23331,81 -23326,81 +24007,153 @@@ msgstr "
"这是一个将被在视频上渲染的默认的相对å—体大å°ã€‚如果设置了ç»å¯¹å—体大å°ï¼Œç›¸å¯¹å¤§"
"å°å°†è¢«è¦†ç›–。"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "背景ä¸é€æ˜Žåº¦"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "背景颜色"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "轮廓ä¸é€æ˜Žåº¦"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "阴影ä¸é€æ˜Žåº¦"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "阴影颜色"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "阴影角度"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "阴影è·ç¦»"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "背景ä¸é€æ˜Žåº¦"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "背景颜色"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "轮廓ä¸é€æ˜Žåº¦"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "阴影ä¸é€æ˜Žåº¦"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "阴影颜色"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "阴影角度"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "阴影è·ç¦»"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "较å°"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "å°"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "大"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "较大"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "使用 YUVP 渲染器"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "使用 YUVP 渲染器"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr "æ¤æ¸²æŸ“器å—体使用 \"è‹ç™½çš„ YUV\"。æ¤é€‰é¡¹ä»…在您è¦ç¼–ç 到 DVB å—幕时æ‰éœ€è¦"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "æµ…"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "æ·±"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "文本渲染器"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 å—体渲染器"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "æµ…"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "æ·±"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "文本渲染器"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 å—体渲染器"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/zh_TW.po
index 9243b66,8633771..fa7a664
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@@ -13,7 -13,7 +13,11 @@@ msgid "
msgstr ""
"Project-Id-Version: VLC - Trans\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2013-10-22 06:55+0000\n"
"Last-Translator: taijuin lee <taijuin at gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/vlc-"
@@@ -142,7 -142,7 +146,11 @@@ msgstr "音訊è¨å®šé›œé …與模組。
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -454,10 -454,10 +462,17 @@@ msgid "&About
msgstr "關於(&A)"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -496,17 -496,17 +511,29 @@@ msgid "Save...
msgstr "儲å˜..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "é‡è¤‡å…¨éƒ¨"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "é‡è¤‡ä¸€é¦–"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -606,7 -606,7 +633,11 @@@ msgstr "已經é”到éŽæ¿¾å™¨çš„最大æ
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Disable"
msgstr "åœç”¨"
@@@ -1299,20 -1299,20 +1330,36 @@@ msgstr "ç•«é¢é€ŸçŽ‡
msgid "Decoded format"
msgstr "è§£ç¢¼æ ¼å¼"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr "無法開啟您的輸入"
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr "無法開啟您的輸入"
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr "VLC 無法開啟 MRL「%sã€ã€‚詳細資訊請閱讀記錄檔。"
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr "VLC 無法辨è˜è¼¸å…¥æ ¼å¼"
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr "VLC 無法辨è˜è¼¸å…¥æ ¼å¼"
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1715,7 -1715,7 +1762,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1797,7 -1797,7 +1848,11 @@@ msgstr "讓音訊在éžæ£å¸¸é€Ÿåº¦æ’æ
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "ç„¡"
@@@ -1824,7 -1824,7 +1879,11 @@@ msgid "
"automatically select the best method available."
msgstr "VLC 所使用的視訊輸出方å¼ï¼Œé è¨å‹•ä½œç‚ºè‡ªå‹•é¸æ“‡æœ€ä½³çš„å¯ç”¨æ–¹å¼ã€‚"
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "啟用視訊"
@@@ -2016,7 -2016,7 +2075,11 @@@ msgstr "
"試啟用這個功能。"
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "è¦–çª—ç½®é ‚"
@@@ -2067,7 -2067,7 +2130,11 @@@ msgstr "n 毫秒後隱è—æ»‘é¼ æ¸¸æ¨™å’
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2076,7 -2076,7 +2143,11 @@@ msgstr "去交錯
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "去交錯模å¼"
@@@ -2132,7 -2132,7 +2203,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr "æ’放期間抑制電æºç®¡ç†æœå‹™ï¼Œä»¥é¿å…é›»è…¦å› ç‚ºç„¡æ´»å‹•è€Œé€²å…¥ä¼‘çœ ã€‚"
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "視窗è£é£¾"
@@@ -2309,7 -2309,7 +2384,11 @@@ msgstr "
"強制套用螢幕的長寬比例。大多數的螢幕使用方形åƒç´ (1:1)。若您使用的是 16:9 螢"
"幕，您也許會需è¦è¨å®šç‚º 4:3 以ä¿æŒæ¯”例。"
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "è·³éŽç•«é¢"
@@@ -2438,12 -2438,12 +2517,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2451,7 -2451,7 +2539,11 @@@ msgid "Default
msgstr "é è¨"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2760,7 -2760,7 +2852,11 @@@ msgid "You can completely disable the s
msgstr "您å¯ä»¥å®Œå…¨åœç”¨åœ–å½¢å—幕處ç†ã€‚"
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3588,7 -3588,7 +3684,11 @@@ msgstr "æ’放清單å¯ä»¥åƒç›®éŒ„一æ
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr "這些è¨å®šç‚º VLC 的全域按éµç¶å®šï¼Œä¹Ÿå°±æ˜¯ã€Œç†±éµã€ã€‚"
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "忽略"
@@@ -3612,8 -3612,8 +3712,13 @@@ msgstr "æ»‘é¼ æ»¾è¼ªå¯ä»¥æŽ§åˆ¶éŸ³é‡ã
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3693,10 -3693,10 +3798,17 @@@ msgid "Slower (fine)
msgstr "放慢(微調)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3709,10 -3709,10 +3821,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "上一個"
@@@ -3721,9 -3721,9 +3840,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -3958,9 -3958,9 +4083,15 @@@ msgid "Select the key to decrease audi
msgstr ""
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "éœéŸ³"
@@@ -4374,7 -4374,7 +4505,11 @@@ msgstr "循環切æ›å¯ç”¨çš„音訊è£ç
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "抓圖"
@@@ -4573,12 -4573,12 +4708,21 @@@ msgstr "ä¸‹è¼‰ä¸ ...
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "å–消"
@@@ -5336,7 -5336,7 +5480,11 @@@ msgstr "è£å‰ª
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Aspect ratio"
msgstr "長寬比例"
@@@ -7635,7 -7635,7 +7783,11 @@@ msgstr "螢幕輸入
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "ç•«é¢"
@@@ -8370,7 -8370,7 +8522,11 @@@ msgstr "Vol max #
msgid "Volume Set"
msgstr ""
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -9488,7 -9488,7 +9644,11 @@@ msgstr "環繞 7.1
msgid "ALSA audio output"
msgstr "ALSA 音訊輸出"
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Audio output failed"
msgstr "音訊輸出失敗"
@@@ -9521,7 -9521,7 +9681,11 @@@ msgstr "AudioQueue (iOS / Mac OS) 音è¨
msgid "Android AudioTrack audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "AudioUnit output for iOS"
msgstr ""
@@@ -9529,30 -9529,30 +9693,54 @@@
msgid "Last audio device"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
+msgid "Audio device is not configured"
+msgstr "尚未è¨å®šéŸ³è¨Šè£ç½®"
+
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:578
+ msgid "Audio device is not configured"
+ msgstr "尚未è¨å®šéŸ³è¨Šè£ç½®"
+
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
+msgid "System Sound Output Device"
+msgstr "系統音效輸出è£ç½®"
+
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1139
+ msgid "System Sound Output Device"
+ msgstr "系統音效輸出è£ç½®"
+
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr "%s (編碼的輸出)"
@@@ -10733,46 -10733,46 +10921,74 @@@ msgstr "é™°å½±
msgid "Outline"
msgstr "輪廓"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "黑"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "ç°"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "銀"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "白"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "ç´…"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -10780,61 -10780,61 +10996,97 @@@ msgid "Fuchsia
msgstr ""
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "黃"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "æ©„æ¬–ç¶ "
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "ç¶ "
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "ç´«"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "æµ·è—"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "è—"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -10964,7 -10964,7 +11216,11 @@@ msgstr "å—幕 (進階)
msgid "Subtitle renderers using libass"
msgstr "使用 libass çš„å—幕æ繪引擎"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr "建立å—åž‹å¿«å–ä¸"
@@@ -12760,10 -12760,10 +13016,17 @@@ msgid "Fast
msgstr ""
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "æ£å¸¸"
@@@ -12868,8 -12868,8 +13131,13 @@@ msgid "D-Bus control interface
msgstr "D-Bus 控制介é¢"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13207,9 -13207,9 +13475,15 @@@ msgstr "åˆå§‹åŒ–ä¸
msgid "Opening"
msgstr "é–‹å•Ÿä¸"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "æš«åœ"
@@@ -15095,7 -15095,7 +15369,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "MPEG Transport Stream 解多工器"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "æ–‡å—廣æ’"
@@@ -15274,7 -15274,7 +15552,11 @@@ msgid "VLC media player Help
msgstr "VLC 媒體æ’放器說明"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "索引"
@@@ -15362,9 -15362,9 +15644,15 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "儲å˜"
@@@ -15503,7 -15503,7 +15791,11 @@@ msgstr "
msgid "The stream must be playing or paused for bookmarks to work."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "跳至時間"
@@@ -15523,7 -15523,7 +15815,11 @@@ msgstr "
msgid "Backward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -15533,7 -15533,7 +15829,11 @@@ msgstr "
msgid "Forward"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -15553,84 -15553,84 +15853,155 @@@ msgstr "切æ›å…¨èž¢å¹•æ¨¡å¼
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
+msgid "Click to stop playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:474
+msgid "Show/Hide Playlist"
+msgstr "顯示/éš±è—æ’放清單"
+
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
+ msgid "Click to stop playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:440
+ msgid "Show/Hide Playlist"
+ msgstr "顯示/éš±è—æ’放清單"
+
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
msgid "Repeat"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
+msgid "Click to mute or unmute the audio."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:492
+msgid "Full Volume"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
+ msgid "Click to mute or unmute the audio."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:458
+ msgid "Full Volume"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "效果"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
msgid "Convert & Stream"
msgstr ""
@@@ -15666,7 -15666,7 +16037,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -15850,8 -15850,8 +16225,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "自訂"
@@@ -15944,36 -15944,36 +16324,68 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
+msgid "VLC media playback"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
+ msgid "VLC media playback"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "繼續"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr ""
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr ""
@@@ -16129,7 -16129,7 +16541,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "鎖定長寬比例"
@@@ -16258,7 -16258,7 +16674,11 @@@ msgstr "éš±è— VLC
msgid "Hide Others"
msgstr "éš±è—其他"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "顯示全部"
@@@ -16343,15 -16343,15 +16763,27 @@@ msgstr "軌é“åŒæ¥
msgid "A→B Loop"
msgstr "A→B 段回放"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "æ’放後離開"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "å‰é€²"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "æ’放後離開"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "å‰é€²"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "後退"
@@@ -16367,30 -16367,30 +16799,56 @@@ msgstr "é™ä½ŽéŸ³é‡
msgid "Audio Device"
msgstr "音訊è£ç½®"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "一åŠå¤§å°"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "æ£å¸¸å¤§å°"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "å…©å€å¤§å°"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "é©æ‡‰ç•«é¢"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "一åŠå¤§å°"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "æ£å¸¸å¤§å°"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "å…©å€å¤§å°"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "é©æ‡‰ç•«é¢"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "æµ®åœ¨é ‚ç«¯"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "全螢幕視訊è£ç½®"
@@@ -16399,7 -16399,7 +16857,11 @@@
msgid "Post processing"
msgstr "後處ç†"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Add Subtitle File..."
msgstr "åŠ å…¥å—幕檔..."
@@@ -16627,7 -16627,7 +17089,11 @@@ msgid "Play another media synchronously
msgstr ""
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "é¸æ“‡..."
@@@ -16798,7 -16798,7 +17264,11 @@@ msgstr "FPS
msgid "Subtitle encoding"
msgstr "å—幕編碼"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "å—型大å°"
@@@ -17027,12 -17027,12 +17497,20 @@@ msgstr "儲å˜ä¸ä»‹è³‡è¨Šæ™‚發生錯è
msgid "VLC was unable to save the meta data."
msgstr "VLC 無法儲å˜ä¸ä»‹è³‡æ–™ã€‚"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "å好è¨å®š"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "全部é‡è¨"
@@@ -17209,129 -17209,125 +17687,237 @@@ msgstr "
msgid "Lua HTTP"
msgstr "Lua HTTP"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+msgid "Control iTunes during playback"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "é è¨ç·¨ç¢¼"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "顯示è¨å®š"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "é è¨ç·¨ç¢¼"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "顯示è¨å®š"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "å—åž‹é¡è‰²"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "å—åž‹"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
+msgid "Subtitle languages"
+msgstr "å—幕語言"
+
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
+ msgid "Subtitle languages"
+ msgstr "å—幕語言"
+
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
msgid "Preferred subtitle language"
msgstr "å好的å—幕語言"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "啟用 OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "啟用 OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "ä¸é€æ˜Žåº¦"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr "強制使用粗體"
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr "強制使用粗體"
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
msgid "Outline color"
msgstr "輪廓é¡è‰²"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr "輪廓厚度"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "全螢幕模å¼ä¸‹è®“螢幕變黑"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "全螢幕模å¼ä¸‹è®“螢幕變黑"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "顯示"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "輸出模組"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "視訊抓圖"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "資料夾"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "æ ¼å¼"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "å‰ç½®æª”å"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "循åºç·¨è™Ÿ"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "上次檢查時間："
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "尚未檢查。"
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "輸出模組"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "視訊抓圖"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "資料夾"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "æ ¼å¼"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "å‰ç½®æª”å"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "循åºç·¨è™Ÿ"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "上次檢查時間："
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "尚未檢查。"
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "最低延é²"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "低延é²"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "高延é²"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "較高延é²"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "é‡ç½®å好è¨å®š"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -17344,35 -17340,35 +17930,65 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "é¸æ“‡"
+
+#: modules/gui/macosx/simple_prefs.m:1303
+msgid "Choose the directory or filename where the records will be stored."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "é¸æ“‡"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
+ msgid "Choose the directory or filename where the records will be stored."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "無效的組åˆ"
+
+#: modules/gui/macosx/simple_prefs.m:1500
+msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "無效的組åˆ"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
+ msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr ""
@@@ -19326,20 -19322,20 +19942,36 @@@ msgstr "刪除é¸æ“‡çš„è¨å®šæª”
msgid "Create a new profile"
msgstr "建立新的è¨å®šæª”"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "建立"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
+msgid " Profile Name Missing"
+msgstr " è¨å®šæª”å稱éºå¤±"
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
+ msgid " Profile Name Missing"
+ msgstr " è¨å®šæª”å稱éºå¤±"
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "æ‚¨å¿…é ˆç‚ºè¨å®šæª”命å。"
@@@ -22659,45 -22655,45 +23291,81 @@@ msgstr "轉碼串æµè¼¸å‡º
msgid "Overlays/Subtitles"
msgstr "é‡ç–Šåœ–層/å—幕"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr "您想使用的å—型家æ—"
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr "您想使用的å—型檔"
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
+msgid "Font size in pixels"
+msgstr "å—åž‹åƒç´ 大å°"
+
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr "您想使用的å—型家æ—"
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr "您想使用的å—型檔"
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
+ msgid "Font size in pixels"
+ msgstr "å—åž‹åƒç´ 大å°"
+
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr "è¨å®šç•«åœ¨è¦–訊上的å—åž‹çš„é è¨å¤§å°ã€‚輸入éžé›¶å€¼å°‡è¦†è¼‰ç›¸å°å—型大å°ã€‚"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
+msgid "Text opacity"
+msgstr "æ–‡å—ä¸é€æ˜Žåº¦"
+
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:165
+ msgid "Text opacity"
+ msgstr "æ–‡å—ä¸é€æ˜Žåº¦"
+
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr "æ繪在視訊上的文å—çš„ä¸é€æ˜Žåº¦ã€‚0 = é€æ˜Žï¼Œ255 = 完全ä¸é€æ˜Žã€‚"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr "æ–‡å—é è¨é¡è‰²"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -22709,12 -22705,12 +23377,20 @@@ msgstr "
"ç¶ è‰²ï¼Œæœ€å¾Œè—色。#000000 = 黑色，#FF0000 = 紅色，#00FF00 = ç¶ è‰²ï¼Œ#FFFF00 = 黃"
"色(紅色 + ç¶ è‰²)，#FFFFFF = 白色"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr "相å°å—型大å°"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
@@@ -22722,81 -22718,81 +23398,153 @@@
msgstr ""
"在視訊上顯示的é è¨ç›¸å°å—型大å°ã€‚若已è¨å®šçµ•å°å—型大å°å‰‡ç›¸å°å¤§å°å°‡è¢«è¦†è¼‰ã€‚"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
+msgid "Background opacity"
+msgstr "背景ä¸é€æ˜Žåº¦"
+
+#: modules/text_renderer/freetype.c:182
+msgid "Background color"
+msgstr "背景é¡è‰²"
+
+#: modules/text_renderer/freetype.c:184
+msgid "Outline opacity"
+msgstr "輪廓ä¸é€æ˜Žåº¦"
+
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr "é™°å½±ä¸é€æ˜Žåº¦"
+
+#: modules/text_renderer/freetype.c:189
+msgid "Shadow color"
+msgstr "é™°å½±é¡è‰²"
+
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr "陰影角度"
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr "é™°å½±è·é›¢"
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:180
+ msgid "Background opacity"
+ msgstr "背景ä¸é€æ˜Žåº¦"
+
+ #: modules/text_renderer/freetype.c:181
+ msgid "Background color"
+ msgstr "背景é¡è‰²"
+
+ #: modules/text_renderer/freetype.c:183
+ msgid "Outline opacity"
+ msgstr "輪廓ä¸é€æ˜Žåº¦"
+
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr "é™°å½±ä¸é€æ˜Žåº¦"
+
+ #: modules/text_renderer/freetype.c:188
+ msgid "Shadow color"
+ msgstr "é™°å½±é¡è‰²"
+
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr "陰影角度"
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr "é™°å½±è·é›¢"
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Smaller"
msgstr "較å°"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr "å°"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr "大"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr "較大"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr "使用 YUVP æ繪引擎"
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr "使用 YUVP æ繪引擎"
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr "ç´°"
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr "ç²—"
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr "æ–‡å—æ繪引擎"
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr "Freetype2 å—åž‹æ繪引擎"
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr "ç´°"
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr "ç²—"
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr "æ–‡å—æ繪引擎"
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr "Freetype2 å—åž‹æ繪引擎"
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined po/zu.po
index f79179f,290acfc..de74b3d
--- a/po/zu.po
+++ b/po/zu.po
@@@ -6,7 -6,7 +6,11 @@@ msgid "
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: vlc-devel at videolan.org\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-12-07 17:17+0100\n"
++=======
+ "POT-Creation-Date: 2013-11-11 19:12+0100\n"
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
"PO-Revision-Date: 2011-03-09 11:32+0200\n"
"Last-Translator: sipho <sipho at translate.org.za>\n"
"Language-Team: SIpho\n"
@@@ -143,7 -143,7 +147,11 @@@ msgstr "
#: src/libvlc-module.c:1510 modules/access/imem.c:64
#: modules/gui/macosx/ConvertAndSave.m:175 modules/gui/macosx/MainMenu.m:390
#: modules/gui/macosx/output.m:151 modules/gui/macosx/playlistinfo.m:102
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:410
++=======
+ #: modules/gui/macosx/simple_prefs.m:273 modules/gui/macosx/simple_prefs.m:409
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:378
#: modules/gui/qt4/components/info_panels.cpp:552
#: modules/gui/qt4/components/simple_preferences.cpp:224
@@@ -469,10 -469,10 +477,17 @@@ msgid "&About
msgstr "&Mayelana"
#: include/vlc_intf_strings.h:65 modules/control/rc.c:72
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:438 modules/gui/macosx/MainMenu.m:350
+#: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+#: modules/gui/macosx/MainMenu.m:1194 modules/gui/macosx/MainMenu.m:1195
+#: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/playlist.m:517
++=======
+ #: modules/gui/macosx/ControlsBar.m:404 modules/gui/macosx/MainMenu.m:350
+ #: modules/gui/macosx/MainMenu.m:457 modules/gui/macosx/MainMenu.m:464
+ #: modules/gui/macosx/MainMenu.m:1189 modules/gui/macosx/MainMenu.m:1190
+ #: modules/gui/macosx/MainMenu.m:1191 modules/gui/macosx/playlist.m:517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:550 modules/gui/qt4/ui/open.h:243
msgid "Play"
@@@ -511,17 -511,17 +526,29 @@@ msgid "Save...
msgstr "Gcina..."
#: include/vlc_intf_strings.h:77 modules/gui/macosx/CoreInteraction.m:404
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1475
++=======
+ #: modules/gui/macosx/MainMenu.m:364 modules/gui/macosx/MainMenu.m:1470
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat All"
msgstr "Phinda konke"
#: include/vlc_intf_strings.h:78 modules/gui/macosx/CoreInteraction.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1470
++=======
+ #: modules/gui/macosx/MainMenu.m:363 modules/gui/macosx/MainMenu.m:1465
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Repeat One"
msgstr "Phinda eyodwa"
#: include/vlc_intf_strings.h:79 src/libvlc-module.c:1398
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1465
++=======
+ #: modules/gui/macosx/MainMenu.m:362 modules/gui/macosx/MainMenu.m:1460
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:119
#: modules/gui/qt4/components/controller.hpp:132
msgid "Random"
@@@ -602,7 -602,7 +629,11 @@@ msgstr "
#: src/audio_output/output.c:220 src/audio_output/output.c:267
#: src/config/core.c:407 src/input/es_out.c:902 src/libvlc-module.c:540
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:1000 modules/video_filter/postproc.c:234
++=======
+ #: modules/gui/macosx/MainWindow.m:967 modules/video_filter/postproc.c:234
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Disable"
msgstr "Vumela"
@@@ -1317,20 -1317,20 +1348,36 @@@ msgstr "Isikalo sikazimele
msgid "Decoded format"
msgstr "Kuhumushiwe"
++<<<<<<< HEAD
+#: src/input/input.c:2427
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2428
++=======
+ #: src/input/input.c:2426
+ msgid "Your input can't be opened"
+ msgstr ""
+
+ #: src/input/input.c:2427
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "VLC is unable to open the MRL '%s'. Check the log for details."
msgstr ""
++<<<<<<< HEAD
+#: src/input/input.c:2549
+msgid "VLC can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2550
++=======
+ #: src/input/input.c:2548
+ msgid "VLC can't recognize the input's format"
+ msgstr ""
+
+ #: src/input/input.c:2549
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid ""
"The format of '%s' cannot be detected. Have a look at the log for details."
@@@ -1745,7 -1745,7 +1792,11 @@@ msgstr "
#: modules/audio_output/kai.c:106 modules/codec/x264.c:434
#: modules/gui/macosx/simple_prefs.m:110
#: modules/gui/qt4/components/simple_preferences.cpp:125
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:558
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:566
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_output/kva.c:62 modules/video_output/xcb/xvideo.c:878
#: modules/gui/qt4/ui/profiles.h:727 modules/gui/qt4/ui/profiles.h:730
msgid "Auto"
@@@ -1834,7 -1834,7 +1885,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:204 modules/gui/macosx/open.m:252
#: modules/gui/macosx/open.m:278 modules/gui/macosx/open.m:279
#: modules/gui/qt4/components/interface_widgets.cpp:429
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
++=======
+ #: modules/text_renderer/freetype.c:214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/dialogs/create_stream.html:196
msgid "None"
msgstr "Lutho"
@@@ -1859,7 -1859,7 +1914,11 @@@ msgid "
"automatically select the best method available."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:396
++=======
+ #: src/libvlc-module.c:249 modules/gui/macosx/simple_prefs.m:395
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/display.c:42 modules/gui/qt4/ui/sprefs_video.h:340
msgid "Enable video"
msgstr "Vumela ividiyo"
@@@ -2060,7 -2060,7 +2119,11 @@@ msgid "
msgstr ""
#: src/libvlc-module.c:311 src/video_output/vout_intf.c:274
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:399 modules/gui/qt4/ui/sprefs_video.h:347
++=======
+ #: modules/gui/macosx/simple_prefs.m:398 modules/gui/qt4/ui/sprefs_video.h:347
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Always on top"
msgstr "Phezulu njalo"
@@@ -2113,7 -2113,7 +2176,11 @@@ msgstr "
#: src/libvlc-module.c:338 src/libvlc-module.c:340
#: src/video_output/interlacing.c:180 modules/gui/macosx/MainMenu.m:406
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:408
++=======
+ #: modules/gui/macosx/MainMenu.m:407 modules/gui/macosx/simple_prefs.m:407
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/convert.cpp:95
#: modules/video_filter/deinterlace/deinterlace.c:97
#: share/lua/http/dialogs/create_stream.html:346
@@@ -2122,7 -2122,7 +2189,11 @@@ msgstr "i-Deinterlace
#: src/libvlc-module.c:348 src/video_output/interlacing.c:196
#: modules/gui/macosx/MainMenu.m:408 modules/gui/macosx/MainMenu.m:409
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:409
++=======
+ #: modules/gui/macosx/simple_prefs.m:408
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/deinterlace/deinterlace.c:53
msgid "Deinterlace mode"
msgstr "Isimo se-Deinterlace"
@@@ -2180,7 -2180,7 +2251,11 @@@ msgid "
"computer being suspended because of inactivity."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:398
++=======
+ #: src/libvlc-module.c:374 modules/gui/macosx/simple_prefs.m:397
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:343
msgid "Window decorations"
msgstr "Ukuhlothiswa kwewindi"
@@@ -2363,7 -2363,7 +2438,11 @@@ msgid "
"order to keep proportions."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:401
++=======
+ #: src/libvlc-module.c:468 modules/gui/macosx/simple_prefs.m:400
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Skip frames"
msgstr "Yeqa ozimele"
@@@ -2497,12 -2497,12 +2576,21 @@@ msgstr "
#: src/libvlc-module.c:540 src/video_output/vout_intf.c:96
#: src/video_output/vout_intf.c:114 modules/access/dshow/dshow.cpp:92
#: modules/access/dshow/dshow.cpp:99 modules/access/dshow/dshow.cpp:119
++<<<<<<< HEAD
+#: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:834
+#: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+#: modules/gui/macosx/prefs_widgets.m:1214
+#: modules/gui/macosx/prefs_widgets.m:1287
+#: modules/gui/macosx/simple_prefs.m:520 modules/gui/macosx/simple_prefs.m:674
+#: modules/gui/macosx/simple_prefs.m:923 modules/gui/macosx/VideoEffects.m:57
++=======
+ #: modules/access/dshow/dshow.cpp:2032 modules/audio_output/directx.c:830
+ #: modules/gui/macosx/AudioEffects.m:86 modules/gui/macosx/MainMenu.m:601
+ #: modules/gui/macosx/prefs_widgets.m:1214
+ #: modules/gui/macosx/prefs_widgets.m:1287
+ #: modules/gui/macosx/simple_prefs.m:519 modules/gui/macosx/simple_prefs.m:672
+ #: modules/gui/macosx/simple_prefs.m:922 modules/gui/macosx/VideoEffects.m:57
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:545
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
#: modules/video_filter/rss.c:184 modules/video_output/msw/directx.c:1458
@@@ -2510,7 -2510,7 +2598,11 @@@ msgid "Default
msgstr "Ngokwakhona"
#: src/libvlc-module.c:540 modules/gui/macosx/AudioEffects.m:112
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:998 modules/gui/macosx/wizard.m:351
++=======
+ #: modules/gui/macosx/MainWindow.m:965 modules/gui/macosx/wizard.m:351
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/extended_panels.cpp:1024
#: modules/gui/qt4/ui/equalizer.h:133 modules/gui/qt4/ui/vlm.h:289
msgid "Enable"
@@@ -2833,7 -2833,7 +2925,11 @@@ msgid "You can completely disable the s
msgstr ""
#: src/libvlc-module.c:703 src/libvlc-module.c:1634 src/text/iso-639_def.h:145
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:385
++=======
+ #: modules/gui/macosx/simple_prefs.m:384
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/stream_out/transcode/transcode.c:219
#: modules/gui/qt4/ui/sprefs_subtitles.h:286
msgid "On Screen Display"
@@@ -3694,7 -3694,7 +3790,11 @@@ msgstr "
msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1938
++=======
+ #: src/libvlc-module.c:1197 modules/gui/macosx/intf.m:1923
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Ignore"
msgstr "Ziba"
@@@ -3721,8 -3721,8 +3821,13 @@@ msgstr "
#: src/libvlc-module.c:1203 src/video_output/vout_intf.c:284
#: modules/gui/macosx/MainMenu.m:395 modules/gui/macosx/MainMenu.m:471
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1502 modules/gui/macosx/MainMenu.m:1512
+#: modules/gui/macosx/simple_prefs.m:397
++=======
+ #: modules/gui/macosx/MainMenu.m:1497 modules/gui/macosx/MainMenu.m:1507
+ #: modules/gui/macosx/simple_prefs.m:396
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:116
#: modules/gui/qt4/ui/sprefs_video.h:342
msgid "Fullscreen"
@@@ -3809,10 -3809,10 +3914,17 @@@ msgid "Slower (fine)
msgstr "Kancane (kahle)"
#: src/libvlc-module.c:1223 modules/control/hotkeys.c:208
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:760
+#: modules/gui/macosx/ControlsBar.m:761 modules/gui/macosx/fspanel.m:420
+#: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+#: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1461
++=======
+ #: modules/gui/macosx/about.m:274 modules/gui/macosx/ControlsBar.m:726
+ #: modules/gui/macosx/ControlsBar.m:727 modules/gui/macosx/fspanel.m:420
+ #: modules/gui/macosx/MainMenu.m:361 modules/gui/macosx/MainMenu.m:459
+ #: modules/gui/macosx/MainMenu.m:467 modules/gui/macosx/MainMenu.m:1456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:318
#: modules/gui/macosx/wizard.m:1559
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:339
@@@ -3825,10 -3825,10 +3937,17 @@@ msgid "Select the hotkey to use to ski
msgstr ""
#: src/libvlc-module.c:1225 modules/control/hotkeys.c:212
++<<<<<<< HEAD
+#: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:749
+#: modules/gui/macosx/ControlsBar.m:750 modules/gui/macosx/fspanel.m:416
+#: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+#: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1460
++=======
+ #: modules/gui/macosx/about.m:275 modules/gui/macosx/ControlsBar.m:715
+ #: modules/gui/macosx/ControlsBar.m:716 modules/gui/macosx/fspanel.m:416
+ #: modules/gui/macosx/MainMenu.m:360 modules/gui/macosx/MainMenu.m:460
+ #: modules/gui/macosx/MainMenu.m:466 modules/gui/macosx/MainMenu.m:1455
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:120 modules/notify/notify.c:337
msgid "Previous"
msgstr "Okwedlule"
@@@ -3837,9 -3837,9 +3956,15 @@@
msgid "Select the hotkey to use to skip to the previous item in the playlist."
msgstr ""
++<<<<<<< HEAD
+#: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:470
+#: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+#: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1456
++=======
+ #: src/libvlc-module.c:1227 modules/gui/macosx/ControlsBar.m:436
+ #: modules/gui/macosx/MainMenu.m:351 modules/gui/macosx/MainMenu.m:458
+ #: modules/gui/macosx/MainMenu.m:465 modules/gui/macosx/MainMenu.m:1451
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:115
#: modules/gui/qt4/dialogs/vlm.cpp:556 modules/gui/qt4/ui/streampanel.h:180
msgid "Stop"
@@@ -4091,9 -4091,9 +4216,15 @@@ msgid "Select the key to decrease audi
msgstr "Khatha ifayela ozogcina kulo"
#: src/libvlc-module.c:1296 modules/access/v4l2/v4l2.c:181
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:489 modules/gui/macosx/MainMenu.m:380
+#: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+#: modules/gui/macosx/MainMenu.m:1493
++=======
+ #: modules/gui/macosx/ControlsBar.m:455 modules/gui/macosx/MainMenu.m:380
+ #: modules/gui/macosx/MainMenu.m:461 modules/gui/macosx/MainMenu.m:470
+ #: modules/gui/macosx/MainMenu.m:1488
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Mute"
msgstr "Thulisa"
@@@ -4559,7 -4559,7 +4690,11 @@@ msgstr "
#: src/libvlc-module.c:1560 src/video_output/vout_intf.c:290
#: modules/gui/macosx/MainMenu.m:397 modules/gui/macosx/MainMenu.m:472
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1501
++=======
+ #: modules/gui/macosx/MainMenu.m:1496
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/controller.hpp:117
msgid "Snapshot"
msgstr "Ukuthatha isithombe"
@@@ -4773,12 -4773,12 +4908,21 @@@ msgstr "Layisha ungenisa i-plugin
#: modules/gui/macosx/MainWindow.m:179 modules/gui/macosx/MainWindow.m:184
#: modules/gui/macosx/open.m:128 modules/gui/macosx/open.m:190
#: modules/gui/macosx/prefs.m:208 modules/gui/macosx/simple_prefs.m:324
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:414
+#: modules/gui/macosx/simple_prefs.m:842 modules/gui/macosx/VideoEffects.m:879
+#: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+#: modules/gui/qt4/components/open_panels.cpp:1343
+#: modules/gui/qt4/components/preferences_widgets.cpp:1424
+#: modules/gui/qt4/components/sout/profile_selector.cpp:427
++=======
+ #: modules/gui/macosx/simple_prefs.m:352 modules/gui/macosx/simple_prefs.m:413
+ #: modules/gui/macosx/simple_prefs.m:840 modules/gui/macosx/VideoEffects.m:879
+ #: modules/gui/macosx/VideoEffects.m:943 modules/gui/macosx/wizard.m:317
+ #: modules/gui/qt4/components/open_panels.cpp:1343
+ #: modules/gui/qt4/components/preferences_widgets.cpp:1424
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:435
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Cancel"
msgstr "Khansela"
@@@ -5553,7 -5553,7 +5697,11 @@@ msgstr "Lungisa
#: modules/access/linsys/linsys_hdsdi.c:78
#: modules/access/linsys/linsys_sdi.c:73 modules/demux/rawvid.c:59
#: modules/gui/macosx/MainMenu.m:400 modules/gui/macosx/MainMenu.m:401
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1315
++=======
+ #: modules/gui/macosx/MainMenu.m:1310
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Aspect ratio"
msgstr "Ukubheka ngobukhulu bokulinganiselwa"
@@@ -8036,7 -8036,7 +8184,11 @@@ msgstr "Ukufaka kokuthwebula kwesikrini
#: modules/access/screen/screen.c:98 modules/access/screen/xcb.c:69
#: modules/gui/macosx/MainMenu.m:609 modules/gui/macosx/open.m:207
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:495
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:679
++=======
+ #: modules/gui/macosx/open.m:1348 modules/gui/macosx/simple_prefs.m:677
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Screen"
msgstr "Isikrini"
@@@ -8849,7 -8849,7 +9001,11 @@@ msgstr "
msgid "Volume Set"
msgstr "Ivolumu"
++<<<<<<< HEAD
+#: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:486
++=======
+ #: modules/access/vcdx/info.c:69 modules/gui/macosx/ControlsBar.m:452
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/fspanel.m:463 modules/gui/qt4/dialogs/toolbar.cpp:365
#: modules/stream_out/raop.c:150 modules/gui/qt4/ui/sprefs_audio.h:413
msgid "Volume"
@@@ -10031,7 -10031,7 +10187,11 @@@ msgstr "I-Dolby Surround:
msgid "ALSA audio output"
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:395
++=======
+ #: modules/audio_output/alsa.c:368 modules/audio_output/auhal.c:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio output failed"
msgstr "Amafayela womsindo"
@@@ -10067,7 -10067,7 +10227,11 @@@ msgstr "
msgid "Android AudioTrack audio output"
msgstr "Izilungiselelo zomsindo"
++<<<<<<< HEAD
+#: modules/audio_output/audiounit_ios.c:93
++=======
+ #: modules/audio_output/audiounit_ios.c:89
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "AudioUnit output for iOS"
msgstr "Izilungiselelo zomsindo"
@@@ -10077,32 -10077,32 +10241,56 @@@
msgid "Last audio device"
msgstr "Isisetshenziswa somsindo"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:164
+msgid "HAL AudioUnit output"
+msgstr ""
+
+#: modules/audio_output/auhal.c:396
++=======
+ #: modules/audio_output/auhal.c:166
+ msgid "HAL AudioUnit output"
+ msgstr ""
+
+ #: modules/audio_output/auhal.c:381
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The selected audio output device is exclusively in use by another program."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:591
++=======
+ #: modules/audio_output/auhal.c:578
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Audio device is not configured"
msgstr "Igama lesisetshenziswa somsindo"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:592
++=======
+ #: modules/audio_output/auhal.c:579
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"You should configure your speaker layout with \"Audio Midi Setup\" in /"
"Applications/Utilities. VLC will output Stereo only."
msgstr ""
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1149
++=======
+ #: modules/audio_output/auhal.c:1139
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "System Sound Output Device"
msgstr "Izilungiselelo zomsindo"
++<<<<<<< HEAD
+#: modules/audio_output/auhal.c:1224
++=======
+ #: modules/audio_output/auhal.c:1214
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, c-format
msgid "%s (Encoded Output)"
msgstr ""
@@@ -11344,46 -11344,46 +11532,74 @@@ msgstr "
msgid "Outline"
msgstr ""
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:71
msgid "Black"
msgstr "Okumnyana"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:60 modules/video_filter/rss.c:72
msgid "Gray"
msgstr "Oku-Gray"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Silver"
msgstr "Isiliva"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/ball.c:120 modules/video_filter/marq.c:61
#: modules/video_filter/rss.c:72
msgid "White"
msgstr "Okumhlophe"
++<<<<<<< HEAD
+#: modules/codec/kate.c:210 modules/text_renderer/freetype.c:207
++=======
+ #: modules/codec/kate.c:210 modules/text_renderer/freetype.c:206
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:115 modules/text_renderer/win32text.c:89
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Maroon"
msgstr "Okunsundu ngokubomvu"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:427
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1006 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1001 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:72
msgid "Red"
msgstr "Okubomvu"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
@@@ -11391,61 -11391,61 +11607,97 @@@ msgid "Fuchsia
msgstr "i-Fuchsia"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:429
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1010 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1005 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Yellow"
msgstr "Okuphuzi"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:73
msgid "Olive"
msgstr "Ubuluhlaza ngokumdaka"
#: modules/codec/kate.c:211 modules/gui/macosx/MainMenu.m:428
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1008 modules/text_renderer/freetype.c:208
++=======
+ #: modules/gui/macosx/MainMenu.m:1003 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/ball.c:119 modules/video_filter/marq.c:62
#: modules/video_filter/rss.c:73
msgid "Green"
msgstr "Okuluhlaza satshani"
++<<<<<<< HEAD
+#: modules/codec/kate.c:211 modules/text_renderer/freetype.c:208
++=======
+ #: modules/codec/kate.c:211 modules/text_renderer/freetype.c:207
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:116 modules/text_renderer/win32text.c:90
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Teal"
msgstr "i-Teal"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:63
#: modules/video_filter/rss.c:74
msgid "Lime"
msgstr "i-Lime"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Purple"
msgstr "Ubunsomi"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Navy"
msgstr "Okuhlaza ngokunkankane"
#: modules/codec/kate.c:212 modules/gui/macosx/MainMenu.m:430
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1012 modules/text_renderer/freetype.c:209
++=======
+ #: modules/gui/macosx/MainMenu.m:1007 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/ball.c:120 modules/video_filter/colorthres.c:64
#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:74
msgid "Blue"
msgstr "Okuluhlaza sasibhakabhaka"
++<<<<<<< HEAD
+#: modules/codec/kate.c:212 modules/text_renderer/freetype.c:209
++=======
+ #: modules/codec/kate.c:212 modules/text_renderer/freetype.c:208
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:117 modules/text_renderer/win32text.c:91
#: modules/video_filter/colorthres.c:64 modules/video_filter/marq.c:64
#: modules/video_filter/rss.c:75
@@@ -11583,7 -11583,7 +11835,11 @@@ msgstr "Umugqa wezihlokwana
msgid "Subtitle renderers using libass"
msgstr "Ukufaka ikhodi ezihlokwaneni"
++<<<<<<< HEAD
+#: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
++=======
+ #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:498
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Building font cache"
msgstr ""
@@@ -13450,10 -13450,10 +13706,17 @@@ msgid "Fast
msgstr "Ngokushesha"
#: modules/codec/x264.c:429 modules/gui/macosx/MainMenu.m:357
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
+#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:196
+#: modules/text_renderer/freetype.c:215 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
+ #: modules/gui/qt4/components/simple_preferences.cpp:671
+ #: modules/misc/gnutls.c:64 modules/text_renderer/freetype.c:195
+ #: modules/text_renderer/freetype.c:214 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Normal"
msgstr "Okuvamile"
@@@ -13571,8 -13571,8 +13834,13 @@@ msgid "D-Bus control interface
msgstr "Isibonisi se-Qt"
#: modules/control/dbus/dbus_root.c:81 modules/gui/macosx/MainWindow.m:202
++<<<<<<< HEAD
+#: modules/gui/macosx/MainWindow.m:705 modules/gui/macosx/MainWindow.m:711
+#: modules/gui/macosx/MainWindow.m:1279 modules/gui/ncurses.c:1030
++=======
+ #: modules/gui/macosx/MainWindow.m:679 modules/gui/macosx/MainWindow.m:685
+ #: modules/gui/macosx/MainWindow.m:1246 modules/gui/ncurses.c:1030
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/help.cpp:91 modules/gui/qt4/main_interface.cpp:1013
#: modules/gui/qt4/main_interface.cpp:1017
#: modules/gui/qt4/main_interface.cpp:1056
@@@ -13936,9 -13936,9 +14204,15 @@@ msgstr "
msgid "Opening"
msgstr "Vula"
++<<<<<<< HEAD
+#: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:431
+#: modules/gui/macosx/MainMenu.m:1201 modules/gui/macosx/MainMenu.m:1202
+#: modules/gui/macosx/MainMenu.m:1203 modules/gui/qt4/menus.cpp:817
++=======
+ #: modules/control/rc.c:73 modules/gui/macosx/ControlsBar.m:397
+ #: modules/gui/macosx/MainMenu.m:1196 modules/gui/macosx/MainMenu.m:1197
+ #: modules/gui/macosx/MainMenu.m:1198 modules/gui/qt4/menus.cpp:817
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Pause"
msgstr "Misa kancane"
@@@ -15935,7 -15935,7 +16209,11 @@@ msgid "MPEG Transport Stream demuxer
msgstr "Ukusakaza kwesithuthi se-MPEG"
#: modules/demux/ts.c:171 modules/gui/macosx/MainMenu.m:424
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1538 modules/gui/qt4/dialogs/toolbar.cpp:429
++=======
+ #: modules/gui/macosx/MainMenu.m:1533 modules/gui/qt4/dialogs/toolbar.cpp:429
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Teletext"
msgstr "i-Teletext"
@@@ -16128,7 -16128,7 +16406,11 @@@ msgid "VLC media player Help
msgstr "Usizo lwesidlali semidiya se-VLC"
#: modules/gui/macosx/about.m:276 modules/gui/macosx/MainMenu.m:426
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:1004
++=======
+ #: modules/gui/macosx/MainMenu.m:999
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Index"
msgstr "Inkomba"
@@@ -16223,9 -16223,9 +16505,15 @@@ msgstr "Faka igama lefolda entsha:
#: modules/gui/macosx/ConvertAndSave.m:369
#: modules/gui/macosx/ConvertAndSave.m:401 modules/gui/macosx/output.m:457
#: modules/gui/macosx/playlist.m:716 modules/gui/macosx/prefs.m:207
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/VideoEffects.m:880
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/macosx/simple_prefs.m:351 modules/gui/macosx/simple_prefs.m:415
+ #: modules/gui/macosx/VideoEffects.m:880
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/vlm.h:301
msgid "Save"
msgstr "Gcina"
@@@ -16373,7 -16373,7 +16661,11 @@@ msgstr "
"Ukusakazwa kufanele kudlalwe noma kumiswe kancane ukuzi amaphawu wokubekisa "
"asebenze."
++<<<<<<< HEAD
+#: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1487
++=======
+ #: modules/gui/macosx/controls.m:53 modules/gui/macosx/MainMenu.m:1482
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Jump To Time"
msgstr "Eqela esikhathini"
@@@ -16394,7 -16394,7 +16686,11 @@@ msgstr "
msgid "Backward"
msgstr "Iya emuva"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:181
++=======
+ #: modules/gui/macosx/ControlsBar.m:57 modules/gui/macosx/ControlsBar.m:831
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the previous playlist item. Hold to skip backward through the "
"current media."
@@@ -16405,7 -16405,7 +16701,11 @@@ msgstr "
msgid "Forward"
msgstr "Iya phambili"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:182
++=======
+ #: modules/gui/macosx/ControlsBar.m:61 modules/gui/macosx/ControlsBar.m:832
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to go to the next playlist item. Hold to skip forward through the "
"current media."
@@@ -16426,89 -16426,89 +16726,160 @@@ msgstr "Izikrini ezimnyama esimeni sesi
msgid "Click to enable fullscreen video playback."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:173 modules/gui/macosx/fspanel.m:417
+msgid "Click and hold to skip backward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:174 modules/gui/macosx/fspanel.m:419
+msgid "Click and hold to skip forward through the current media."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:471
++=======
+ #: modules/gui/macosx/ControlsBar.m:437
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to stop playback."
msgstr "Khatha ifayela ozogcina kulo"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:474
++=======
+ #: modules/gui/macosx/ControlsBar.m:440
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Show/Hide Playlist"
msgstr "Bonisa uhlu lokudlalwayo"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:475
++=======
+ #: modules/gui/macosx/ControlsBar.m:441
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to switch between video output and playlist. If no video is shown in "
"the main window, this allows you to hide the playlist."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:478 modules/gui/qt4/dialogs/vlm.cpp:560
++=======
+ #: modules/gui/macosx/ControlsBar.m:444 modules/gui/qt4/dialogs/vlm.cpp:560
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: share/lua/http/index.html:241
#, fuzzy
msgid "Repeat"
msgstr "Phinda:"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:479
++=======
+ #: modules/gui/macosx/ControlsBar.m:445
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to change repeat mode. There are 3 states: repeat one, repeat all and "
"off."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:482 share/lua/http/index.html:239
+msgid "Shuffle"
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:484
+msgid "Click to enable or disable random playback."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:487 modules/gui/macosx/fspanel.m:464
++=======
+ #: modules/gui/macosx/ControlsBar.m:448 share/lua/http/index.html:239
+ msgid "Shuffle"
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:450
+ msgid "Click to enable or disable random playback."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:453 modules/gui/macosx/fspanel.m:464
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click and move the mouse while keeping the button pressed to use this slider "
"to change the volume."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:490
++=======
+ #: modules/gui/macosx/ControlsBar.m:456
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Click to mute or unmute the audio."
msgstr "Khatha ifayela ozogcina kulo"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:492
++=======
+ #: modules/gui/macosx/ControlsBar.m:458
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Full Volume"
msgstr "Ivolumu encane"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:493
+msgid "Click to play the audio at maximum volume."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:496 modules/gui/macosx/simple_prefs.m:309
++=======
+ #: modules/gui/macosx/ControlsBar.m:459
+ msgid "Click to play the audio at maximum volume."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:462 modules/gui/macosx/simple_prefs.m:309
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_audio.h:420
msgid "Effects"
msgstr "Imiphumela"
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:497
++=======
+ #: modules/gui/macosx/ControlsBar.m:463
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Click to show an Audio Effects panel featuring an equalizer and further "
"filters."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/ControlsBar.m:751 modules/gui/macosx/fspanel.m:416
+msgid "Click to go to the previous playlist item."
+msgstr ""
+
+#: modules/gui/macosx/ControlsBar.m:762 modules/gui/macosx/fspanel.m:420
+msgid "Click to go to the next playlist item."
+msgstr ""
+
++=======
+ #: modules/gui/macosx/ControlsBar.m:717 modules/gui/macosx/fspanel.m:416
+ msgid "Click to go to the previous playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:728 modules/gui/macosx/fspanel.m:420
+ msgid "Click to go to the next playlist item."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:744 modules/gui/macosx/fspanel.m:417
+ msgid "Click and hold to skip backward through the current media."
+ msgstr ""
+
+ #: modules/gui/macosx/ControlsBar.m:745 modules/gui/macosx/fspanel.m:419
+ msgid "Click and hold to skip forward through the current media."
+ msgstr ""
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/ConvertAndSave.m:152
#, fuzzy
msgid "Convert & Stream"
@@@ -16550,7 -16550,7 +16921,11 @@@ msgstr "
#: modules/gui/macosx/ConvertAndSave.m:161 modules/gui/macosx/open.m:138
#: modules/gui/macosx/open.m:367 modules/gui/macosx/output.m:136
#: modules/gui/macosx/prefs_widgets.m:1114
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:403
++=======
+ #: modules/gui/macosx/simple_prefs.m:333 modules/gui/macosx/simple_prefs.m:402
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/preferences_widgets.cpp:263
#: modules/gui/qt4/components/simple_preferences.cpp:421
#: modules/gui/qt4/components/sout/sout_widgets.cpp:98
@@@ -16747,8 -16747,8 +17122,13 @@@ msgid "A SDP export is requested, but n
msgstr ""
#: modules/gui/macosx/ConvertAndSave.m:1052
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:710 modules/gui/macosx/simple_prefs.m:734
+#: modules/gui/macosx/simple_prefs.m:1293
++=======
+ #: modules/gui/macosx/simple_prefs.m:708 modules/gui/macosx/simple_prefs.m:732
+ #: modules/gui/macosx/simple_prefs.m:1290
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:668
msgid "Custom"
msgstr "Ngokwezifiso"
@@@ -16841,37 -16841,37 +17221,69 @@@ msgstr "
msgid "Don't ask again"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1501 modules/gui/macosx/intf.m:1518
++=======
+ #: modules/gui/macosx/intf.m:1498 modules/gui/macosx/intf.m:1515
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "VLC media playback"
msgstr "Isidlali semidiya se-VLC"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "No CrashLog found"
+msgstr "Ayikho i-CrashLog etholakalayo"
+
+#: modules/gui/macosx/intf.m:1880 modules/gui/macosx/simple_prefs.m:843
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "No CrashLog found"
+ msgstr "Ayikho i-CrashLog etholakalayo"
+
+ #: modules/gui/macosx/intf.m:1877 modules/gui/macosx/simple_prefs.m:841
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/firstrun.cpp:109
msgid "Continue"
msgstr "Qhubeka"
++<<<<<<< HEAD
+#: modules/gui/macosx/intf.m:1880
+msgid "Couldn't find any trace of a previous crash."
+msgstr "Ayikwazanga ukuthola umkhondo wokusaphazeka kwangaphambilini."
+
+#: modules/gui/macosx/intf.m:1936
+msgid "Remove old preferences?"
+msgstr "Susa zonke izintandokazi?"
+
+#: modules/gui/macosx/intf.m:1937
+msgid "We just found an older version of VLC's preferences files."
+msgstr "Sithole inguqulo endala yamafayela wezintandokazi ze-VLC."
+
+#: modules/gui/macosx/intf.m:1938
+msgid "Move To Trash and Relaunch VLC"
+msgstr "Yisa kudothi bese uvula kabusha i-VLC"
+
+#: modules/gui/macosx/intf.m:2065
++=======
+ #: modules/gui/macosx/intf.m:1877
+ msgid "Couldn't find any trace of a previous crash."
+ msgstr "Ayikwazanga ukuthola umkhondo wokusaphazeka kwangaphambilini."
+
+ #: modules/gui/macosx/intf.m:1921
+ msgid "Remove old preferences?"
+ msgstr "Susa zonke izintandokazi?"
+
+ #: modules/gui/macosx/intf.m:1922
+ msgid "We just found an older version of VLC's preferences files."
+ msgstr "Sithole inguqulo endala yamafayela wezintandokazi ze-VLC."
+
+ #: modules/gui/macosx/intf.m:1923
+ msgid "Move To Trash and Relaunch VLC"
+ msgstr "Yisa kudothi bese uvula kabusha i-VLC"
+
+ #: modules/gui/macosx/intf.m:2049
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy, c-format
msgid "VLC Debug Log (%s).rtf"
msgstr "ifayela lokungena le-VLC Debug (%s).rtfd"
@@@ -17033,7 -17033,7 +17445,11 @@@ msgid "
"This option allows the interface to change its icon on various occasions."
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1317
++=======
+ #: modules/gui/macosx/macosx.m:110 modules/gui/macosx/MainMenu.m:1312
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Lock Aspect Ratio"
msgstr "Khiya ukubheka ngobukhulu bokulinganiselwaK"
@@@ -17174,7 -17174,7 +17590,11 @@@ msgstr "Fihla i-VLC
msgid "Hide Others"
msgstr "Fihla okunye"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:413
++=======
+ #: modules/gui/macosx/MainMenu.m:317 modules/gui/macosx/simple_prefs.m:412
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Show All"
msgstr "Bonisa konke"
@@@ -17265,15 -17265,15 +17685,27 @@@ msgstr "Ukuvumelanisa u&mugqa
msgid "A→B Loop"
msgstr "Ilubhu A->B"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1480
+msgid "Quit after Playback"
+msgstr "Phuma ngemva kokudlala"
+
+#: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1485
+msgid "Step Forward"
+msgstr "Iya phambili"
+
+#: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1486
++=======
+ #: modules/gui/macosx/MainMenu.m:366 modules/gui/macosx/MainMenu.m:1475
+ msgid "Quit after Playback"
+ msgstr "Phuma ngemva kokudlala"
+
+ #: modules/gui/macosx/MainMenu.m:367 modules/gui/macosx/MainMenu.m:1480
+ msgid "Step Forward"
+ msgstr "Iya phambili"
+
+ #: modules/gui/macosx/MainMenu.m:368 modules/gui/macosx/MainMenu.m:1481
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Step Backward"
msgstr "Iya emuva"
@@@ -17289,30 -17289,30 +17721,56 @@@ msgstr "Yehlisa ivolumu
msgid "Audio Device"
msgstr "Isisetshenziswa somsindo"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1497
+msgid "Half Size"
+msgstr "Usayizi oyingxenye"
+
+#: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1498
+#: modules/gui/macosx/MainMenu.m:1537
+msgid "Normal Size"
+msgstr "Usayizi ojwayelekile"
+
+#: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1499
+msgid "Double Size"
+msgstr "Usayizi ophinda phindiwe"
+
+#: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1500
+msgid "Fit to Screen"
+msgstr "Linganisa esikrinini"
+
+#: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1503
+#: modules/gui/macosx/MainMenu.m:1509
++=======
+ #: modules/gui/macosx/MainMenu.m:391 modules/gui/macosx/MainMenu.m:1492
+ msgid "Half Size"
+ msgstr "Usayizi oyingxenye"
+
+ #: modules/gui/macosx/MainMenu.m:392 modules/gui/macosx/MainMenu.m:1493
+ #: modules/gui/macosx/MainMenu.m:1532
+ msgid "Normal Size"
+ msgstr "Usayizi ojwayelekile"
+
+ #: modules/gui/macosx/MainMenu.m:393 modules/gui/macosx/MainMenu.m:1494
+ msgid "Double Size"
+ msgstr "Usayizi ophinda phindiwe"
+
+ #: modules/gui/macosx/MainMenu.m:394 modules/gui/macosx/MainMenu.m:1495
+ msgid "Fit to Screen"
+ msgstr "Linganisa esikrinini"
+
+ #: modules/gui/macosx/MainMenu.m:396 modules/gui/macosx/MainMenu.m:1498
+ #: modules/gui/macosx/MainMenu.m:1504
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Float on Top"
msgstr "Ntanta phezulu"
#: modules/gui/macosx/MainMenu.m:404 modules/gui/macosx/MainMenu.m:405
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:394
++=======
+ #: modules/gui/macosx/simple_prefs.m:393
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Fullscreen Video Device"
msgstr "Isisetshenziswa sevidiyo egcwala isikrini"
@@@ -17321,7 -17321,7 +17779,11 @@@
msgid "Post processing"
msgstr "Ukuthunyelwa kuyacubungula"
++<<<<<<< HEAD
+#: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1522
++=======
+ #: modules/gui/macosx/MainMenu.m:414 modules/gui/macosx/MainMenu.m:1517
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Add Subtitle File..."
msgstr "Ifayela lezihlokwana"
@@@ -17562,7 -17562,7 +18024,11 @@@ msgid "Play another media synchronously
msgstr "Dlala enye imidiya ngokuvumelanisa"
#: modules/gui/macosx/open.m:143 modules/gui/macosx/open.m:365
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:379 modules/gui/macosx/wizard.m:343
++=======
+ #: modules/gui/macosx/simple_prefs.m:378 modules/gui/macosx/wizard.m:343
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/macosx/wizard.m:411 modules/gui/qt4/ui/sprefs_interface.h:530
msgid "Choose..."
msgstr "Khetha..."
@@@ -17749,7 -17749,7 +18215,11 @@@ msgstr "i-FPS
msgid "Subtitle encoding"
msgstr "Ukufaka ikhodi ezihlokwaneni"
++<<<<<<< HEAD
+#: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:381
++=======
+ #: modules/gui/macosx/open.m:376 modules/gui/macosx/simple_prefs.m:380
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:296
msgid "Font size"
msgstr "Usayizi wefonti"
@@@ -17981,12 -17981,12 +18451,20 @@@ msgstr "Kuvele iphutha ngenkathi kugcin
msgid "VLC was unable to save the meta data."
msgstr "I-VLC ayikwazanga ukugciana imethadatha."
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:417
++=======
+ #: modules/gui/macosx/prefs.m:206 modules/gui/macosx/simple_prefs.m:416
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:52
msgid "Preferences"
msgstr "Izintandokazi"
++<<<<<<< HEAD
+#: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:415
++=======
+ #: modules/gui/macosx/prefs.m:209 modules/gui/macosx/simple_prefs.m:414
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Reset All"
msgstr "Setha kabusha konke"
@@@ -18170,133 -18170,128 +18648,241 @@@ msgstr "
msgid "Lua HTTP"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:374
+#, fuzzy
+msgid "Control iTunes during playback"
+msgstr "Misa kancane okudlalayo"
+
+#: modules/gui/macosx/simple_prefs.m:377
+msgid "Default Encoding"
+msgstr "Umbhalo wekhodi wakhona"
+
+#: modules/gui/macosx/simple_prefs.m:378
+msgid "Display Settings"
+msgstr "Izilungiselelo zokubonisa"
+
+#: modules/gui/macosx/simple_prefs.m:380
++=======
+ #: modules/gui/macosx/simple_prefs.m:376
+ msgid "Default Encoding"
+ msgstr "Umbhalo wekhodi wakhona"
+
+ #: modules/gui/macosx/simple_prefs.m:377
+ msgid "Display Settings"
+ msgstr "Izilungiselelo zokubonisa"
+
+ #: modules/gui/macosx/simple_prefs.m:379
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:297
msgid "Font color"
msgstr "Umbala wefonti"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:382 modules/text_renderer/freetype.c:155
++=======
+ #: modules/gui/macosx/simple_prefs.m:381 modules/text_renderer/freetype.c:154
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/quartztext.c:92 modules/text_renderer/win32text.c:59
#: modules/video_filter/marq.c:167 modules/video_filter/rss.c:206
#: modules/gui/qt4/ui/sprefs_subtitles.h:295
msgid "Font"
msgstr "Ifonti"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:383
++=======
+ #: modules/gui/macosx/simple_prefs.m:382
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Subtitle languages"
msgstr "Amalimi ayizihlokwana"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:384
++=======
+ #: modules/gui/macosx/simple_prefs.m:383
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:292
#, fuzzy
msgid "Preferred subtitle language"
msgstr "Ulimi olunconyiwe lwesihlokwana"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:386
+msgid "Enable OSD"
+msgstr "Vumela i-OSD"
+
+#: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/win32text.c:66
++=======
+ #: modules/gui/macosx/simple_prefs.m:385
+ msgid "Enable OSD"
+ msgstr "Vumela i-OSD"
+
+ #: modules/gui/macosx/simple_prefs.m:386 modules/text_renderer/win32text.c:66
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/video_filter/marq.c:118 modules/video_filter/rss.c:146
msgid "Opacity"
msgstr "i-Opacity"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:179
+msgid "Force bold"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++=======
+ #: modules/gui/macosx/simple_prefs.m:387 modules/text_renderer/freetype.c:178
+ msgid "Force bold"
+ msgstr ""
+
+ #: modules/gui/macosx/simple_prefs.m:388 modules/text_renderer/freetype.c:184
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:299
#, fuzzy
msgid "Outline color"
msgstr "Faka imibala"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:390 modules/text_renderer/freetype.c:186
++=======
+ #: modules/gui/macosx/simple_prefs.m:389 modules/text_renderer/freetype.c:185
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_subtitles.h:298
msgid "Outline thickness"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:393
+msgid "Black screens in Fullscreen mode"
+msgstr "Izikrini ezimnyama esimeni sesikrini esigcwele"
+
+#: modules/gui/macosx/simple_prefs.m:395 modules/stream_out/display.c:53
++=======
+ #: modules/gui/macosx/simple_prefs.m:392
+ msgid "Black screens in Fullscreen mode"
+ msgstr "Izikrini ezimnyama esimeni sesikrini esigcwele"
+
+ #: modules/gui/macosx/simple_prefs.m:394 modules/stream_out/display.c:53
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/ui/sprefs_video.h:341
msgid "Display"
msgstr "Ukuboniswa"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:400
+msgid "Output module"
+msgstr "Imojula yokuphuma"
+
+#: modules/gui/macosx/simple_prefs.m:402 modules/gui/qt4/ui/sprefs_video.h:357
+msgid "Video snapshots"
+msgstr "Ukuthwetshulwa kwezithombe zevidiyo"
+
+#: modules/gui/macosx/simple_prefs.m:404 modules/meta_engine/folder.c:63
+msgid "Folder"
+msgstr "Ifolda"
+
+#: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:362
+msgid "Format"
+msgstr "Isakhiwo"
+
+#: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:360
+msgid "Prefix"
+msgstr "Isiqalo"
+
+#: modules/gui/macosx/simple_prefs.m:407 modules/gui/qt4/ui/sprefs_video.h:363
+msgid "Sequential numbering"
+msgstr "Ukufaka izinombolo ngokulandelana"
+
+#: modules/gui/macosx/simple_prefs.m:589
+msgid "Last check on: %@"
+msgstr "Kugcinwe ukuhlolwa ngo: @"
+
+#: modules/gui/macosx/simple_prefs.m:591
+msgid "No check was performed yet."
+msgstr "Akukho ukuhlolwa okwenziwe okwanaje."
+
+#: modules/gui/macosx/simple_prefs.m:710
++=======
+ #: modules/gui/macosx/simple_prefs.m:399
+ msgid "Output module"
+ msgstr "Imojula yokuphuma"
+
+ #: modules/gui/macosx/simple_prefs.m:401 modules/gui/qt4/ui/sprefs_video.h:357
+ msgid "Video snapshots"
+ msgstr "Ukuthwetshulwa kwezithombe zevidiyo"
+
+ #: modules/gui/macosx/simple_prefs.m:403 modules/meta_engine/folder.c:63
+ msgid "Folder"
+ msgstr "Ifolda"
+
+ #: modules/gui/macosx/simple_prefs.m:404 modules/gui/qt4/ui/sprefs_video.h:362
+ msgid "Format"
+ msgstr "Isakhiwo"
+
+ #: modules/gui/macosx/simple_prefs.m:405 modules/gui/qt4/ui/sprefs_video.h:360
+ msgid "Prefix"
+ msgstr "Isiqalo"
+
+ #: modules/gui/macosx/simple_prefs.m:406 modules/gui/qt4/ui/sprefs_video.h:363
+ msgid "Sequential numbering"
+ msgstr "Ukufaka izinombolo ngokulandelana"
+
+ #: modules/gui/macosx/simple_prefs.m:588
+ msgid "Last check on: %@"
+ msgstr "Kugcinwe ukuhlolwa ngo: @"
+
+ #: modules/gui/macosx/simple_prefs.m:590
+ msgid "No check was performed yet."
+ msgstr "Akukho ukuhlolwa okwenziwe okwanaje."
+
+ #: modules/gui/macosx/simple_prefs.m:708
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:669
msgid "Lowest latency"
msgstr "Okusalele okuphansi kakhulu"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:670
msgid "Low latency"
msgstr "Okusalele okuphansi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:672
msgid "High latency"
msgstr "Okusalele okuphezulu"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:711
++=======
+ #: modules/gui/macosx/simple_prefs.m:709
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/components/simple_preferences.cpp:673
msgid "Higher latency"
msgstr "Okusalele okuphezulu kakhulu"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:842
++=======
+ #: modules/gui/macosx/simple_prefs.m:840
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/preferences.cpp:326
msgid "Reset Preferences"
msgstr "Setha kabusha izintandokazi"
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:845
++=======
+ #: modules/gui/macosx/simple_prefs.m:843
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This will reset VLC media player's preferences.\n"
"\n"
@@@ -18309,21 -18304,21 +18895,38 @@@
"Are you sure you want to continue?"
msgstr ""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1212
+msgid "Choose the folder to save your video snapshots to."
+msgstr "Khetha ifolda lapho uzogcine khona izithombe ezithwetshuliwe zevidiyo."
+
+#: modules/gui/macosx/simple_prefs.m:1214
+#: modules/gui/macosx/simple_prefs.m:1305
+msgid "Choose"
+msgstr "Khetha"
+
+#: modules/gui/macosx/simple_prefs.m:1303
++=======
+ #: modules/gui/macosx/simple_prefs.m:1209
+ msgid "Choose the folder to save your video snapshots to."
+ msgstr "Khetha ifolda lapho uzogcine khona izithombe ezithwetshuliwe zevidiyo."
+
+ #: modules/gui/macosx/simple_prefs.m:1211
+ #: modules/gui/macosx/simple_prefs.m:1302
+ msgid "Choose"
+ msgstr "Khetha"
+
+ #: modules/gui/macosx/simple_prefs.m:1300
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Choose the directory or filename where the records will be stored."
msgstr "Umkhombandlela lapho kuzogcinwa khona amafayela kufanele ukhethwe."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1422
++=======
+ #: modules/gui/macosx/simple_prefs.m:1419
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Press new keys for\n"
"\"%@\""
@@@ -18331,17 -18326,17 +18934,30 @@@ msgstr "
"Chofoza amakhiye amasha ukuze\n"
"\"%@\""
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1499
+msgid "Invalid combination"
+msgstr "Ukuhlanganiswa okungavumelekile"
+
+#: modules/gui/macosx/simple_prefs.m:1500
++=======
+ #: modules/gui/macosx/simple_prefs.m:1496
+ msgid "Invalid combination"
+ msgstr "Ukuhlanganiswa okungavumelekile"
+
+ #: modules/gui/macosx/simple_prefs.m:1497
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
msgstr ""
"Ngokuzisola, lawa makhiye awakwazi ukunikelwa njezinqamulelo zama-hotkey."
++<<<<<<< HEAD
+#: modules/gui/macosx/simple_prefs.m:1510
+#: modules/gui/macosx/simple_prefs.m:1514
++=======
+ #: modules/gui/macosx/simple_prefs.m:1507
+ #: modules/gui/macosx/simple_prefs.m:1511
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "This combination is already taken by \"%@\"."
msgstr "Lokuhlangana sekuvele kuthathwe ngu-\"%@\"."
@@@ -20374,21 -20369,21 +20990,37 @@@ msgstr "Susa ubuniningwane obukhethiwe
msgid "Create a new profile"
msgstr "Dala ubuniningwane obusha"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:424
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:432
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/gui/qt4/dialogs/bookmarks.cpp:47
msgid "Create"
msgstr "Dala"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:602
+msgid "This muxer is not provided directly by VLC: It could be missing."
+msgstr ""
+
+#: modules/gui/qt4/components/sout/profile_selector.cpp:746
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:610
+ msgid "This muxer is not provided directly by VLC: It could be missing."
+ msgstr ""
+
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:754
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid " Profile Name Missing"
msgstr "Igama lephrofayili"
++<<<<<<< HEAD
+#: modules/gui/qt4/components/sout/profile_selector.cpp:747
++=======
+ #: modules/gui/qt4/components/sout/profile_selector.cpp:755
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid "You must set a name for the profile."
msgstr "Kufanele usethe igama lobuniningwane."
@@@ -23897,47 -23892,47 +24529,83 @@@ msgstr "Uchungechunge lokusakaza okuphu
msgid "Overlays/Subtitles"
msgstr "Nqwabelanisa izihlokwana kuvidiyo"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:156
+msgid "Monospace Font"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:158
+msgid "Font family for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:159
+msgid "Font file for the font you want to use"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:61
++=======
+ #: modules/text_renderer/freetype.c:155
+ msgid "Monospace Font"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:157
+ msgid "Font family for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:158
+ msgid "Font file for the font you want to use"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:160 modules/text_renderer/win32text.c:61
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Font size in pixels"
msgstr "Usayizi wefonti, ngama-pixels"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:162 modules/text_renderer/win32text.c:62
++=======
+ #: modules/text_renderer/freetype.c:161 modules/text_renderer/win32text.c:62
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This is the default size of the fonts that will be rendered on the video. If "
"set to something different than 0 this option will override the relative "
"font size."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:166
++=======
+ #: modules/text_renderer/freetype.c:165
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Text opacity"
msgstr "i-Opacity"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:167 modules/text_renderer/win32text.c:67
++=======
+ #: modules/text_renderer/freetype.c:166 modules/text_renderer/win32text.c:67
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"The opacity (inverse of transparency) of the text that will be rendered on "
"the video. 0 = transparent, 255 = totally opaque. "
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:98
++=======
+ #: modules/text_renderer/freetype.c:169 modules/text_renderer/quartztext.c:98
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:70
msgid "Text default color"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:171 modules/text_renderer/quartztext.c:99
++=======
+ #: modules/text_renderer/freetype.c:170 modules/text_renderer/quartztext.c:99
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:71
msgid ""
"The color of the text that will be rendered on the video. This must be an "
@@@ -23946,98 -23941,98 +24614,178 @@@
"(red + green), #FFFFFF = white"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:94
++=======
+ #: modules/text_renderer/freetype.c:174 modules/text_renderer/quartztext.c:94
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:75
msgid "Relative font size"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:176 modules/text_renderer/quartztext.c:95
++=======
+ #: modules/text_renderer/freetype.c:175 modules/text_renderer/quartztext.c:95
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:76
msgid ""
"This is the relative default size of the fonts that will be rendered on the "
"video. If absolute font size is set, relative size will be overridden."
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:181
++=======
+ #: modules/text_renderer/freetype.c:180
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background opacity"
msgstr "Ukubheka ngobukhulu bokulinganiselwa ividiyo"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:182
++=======
+ #: modules/text_renderer/freetype.c:181
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Background color"
msgstr "Inqubomgomo ye-caching yangokwakhona"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:184
++=======
+ #: modules/text_renderer/freetype.c:183
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Outline opacity"
msgstr "i-Opacity"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:188
+msgid "Shadow opacity"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:189
++=======
+ #: modules/text_renderer/freetype.c:187
+ msgid "Shadow opacity"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:188
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#, fuzzy
msgid "Shadow color"
msgstr "Umbala wefonti"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:190
+msgid "Shadow angle"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:191
+msgid "Shadow distance"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:189
+ msgid "Shadow angle"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:190
+ msgid "Shadow distance"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
#, fuzzy
msgid "Smaller"
msgstr "Ivolumu encane"
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Small"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Large"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:196 modules/text_renderer/quartztext.c:121
++=======
+ #: modules/text_renderer/freetype.c:195 modules/text_renderer/quartztext.c:121
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
#: modules/text_renderer/win32text.c:82
msgid "Larger"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:197
+msgid "Use YUVP renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:198
++=======
+ #: modules/text_renderer/freetype.c:196
+ msgid "Use YUVP renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:197
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"This renders the font using \"paletized YUV\". This option is only needed if "
"you want to encode into DVB subtitles"
msgstr ""
++<<<<<<< HEAD
+#: modules/text_renderer/freetype.c:215
+msgid "Thin"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:215
+msgid "Thick"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:219 modules/text_renderer/win32text.c:94
+msgid "Text renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:220
+msgid "Freetype2 font renderer"
+msgstr ""
+
+#: modules/text_renderer/freetype.c:500
++=======
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thin"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:214
+ msgid "Thick"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:218 modules/text_renderer/win32text.c:94
+ msgid "Text renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:219
+ msgid "Freetype2 font renderer"
+ msgstr ""
+
+ #: modules/text_renderer/freetype.c:499
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
msgid ""
"Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."
diff --combined share/lua/playlist/dailymotion.lua
index 847ca31,e8a8b75..b41ab16
--- a/share/lua/playlist/dailymotion.lua
+++ b/share/lua/playlist/dailymotion.lua
@@@ -35,7 -35,8 +35,12 @@@ en
-- Probe function.
function probe()
return vlc.access == "http"
++<<<<<<< HEAD
+ and string.match( vlc.path, "www.dailymotion.com/video" )
++=======
+ and string.match( vlc.path, "dailymotion." )
+ and string.match( vlc.peek( 2048 ), "<!DOCTYPE.*video_type" )
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
end
function find( haystack, needle )
@@@ -52,7 -53,7 +57,11 @@@ function parse(
if not line then
break
end
++<<<<<<< HEAD
+ if string.match( line, "sequence=")
++=======
+ if string.match( line, "\"sequence\"")
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
then
line = vlc.strings.decode_uri(line):gsub("\\/", "/")
@@@ -66,10 -67,9 +75,16 @@@
description = string.gsub( description, "+", " " )
end
++<<<<<<< HEAD
+ for _,param in ipairs({ "hd1080URL", "hd720URL", "hqURL", "sdURL", "video_url" }) do
+ path = string.match( line, "\""..param.."\":\"([^\"]*)\"" )
+ if path then
+ path = vlc.strings.decode_uri(path)
++=======
+ for _,param in ipairs({ "hd1080URL", "hd720URL", "hqURL", "sdURL" }) do
+ path = string.match( line, "\""..param.."\":\"([^\"]*)\"" )
+ if path then
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if prefres < 0 then
break
end
diff --combined share/lua/playlist/vimeo.lua
index 9bd41b7,3134c19..018646f
--- a/share/lua/playlist/vimeo.lua
+++ b/share/lua/playlist/vimeo.lua
@@@ -1,11 -1,10 +1,18 @@@
--[[
$Id$
++<<<<<<< HEAD
+ Copyright © 2009-2013 the VideoLAN team
+
+ Authors: Konstantin Pavlov (thresh at videolan.org)
+ François Revol (revol at free.fr)
+ Pierre Ynard
++=======
+ Copyright © 2009 the VideoLAN team
+
+ Authors: Konstantin Pavlov (thresh at videolan.org)
+ François Revol (revol at free.fr)
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@@ -35,58 -34,92 +42,146 @@@ en
-- Probe function.
function probe()
++<<<<<<< HEAD
+ return ( vlc.access == "http" or vlc.access == "https" )
+ and ( string.match( vlc.path, "vimeo%.com/%d+$" )
+ or string.match( vlc.path, "player%.vimeo%.com" ) )
++=======
+ return vlc.access == "http"
+ and string.match( vlc.path, "vimeo.com/%d+$" )
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
-- do not match other addresses,
-- else we'll also try to decode the actual video url
end
-- Parse function.
function parse()
++<<<<<<< HEAD
+ if not string.match( vlc.path, "player%.vimeo%.com" ) then -- Web page URL
+ while true do
+ local line = vlc.readline()
+ if not line then break end
+ path = string.match( line, "data%-config%-url=\"(.-)\"" )
+ if path then
+ path = vlc.strings.resolve_xml_special_chars( path )
+ return { { path = path } }
+ end
+ end
+
+ vlc.msg.err( "Couldn't extract vimeo video URL, please check for updates to this script" )
+ return { }
+
+ else -- API URL
+
+ local prefres = get_prefres()
+ local line = vlc.readline() -- data is on one line only
+
+ for stream in string.gmatch( line, "{([^}]*\"profile\":[^}]*)}" ) do
+ local url = string.match( stream, "\"url\":\"(.-)\"" )
+ if url then
+ path = url
+ if prefres < 0 then
+ break
+ end
+ local height = string.match( stream, "\"height\":(%d+)[,}]" )
+ if not height or tonumber(height) <= prefres then
+ break
+ end
+ end
+ end
+
+ if not path then
+ vlc.msg.err( "Couldn't extract vimeo video URL, please check for updates to this script" )
+ return { }
+ end
+
+ local name = string.match( line, "\"title\":\"(.-)\"" )
+ local artist = string.match( line, "\"owner\":{[^}]-\"name\":\"(.-)\"" )
+ local arturl = string.match( line, "\"thumbs\":{\"[^\"]+\":\"(.-)\"" )
+ local duration = string.match( line, "\"duration\":(%d+)[,}]" )
+
+ return { { path = path; name = name; artist = artist; arturl = arturl; duration = duration } }
+ end
++=======
+ agent = vlc.var.inherit(nil,"http-user-agent")
+
+ if string.match( string.lower(agent), ".*vlc.*" ) then
+ vlc.msg.dbg("Wrong agent, adapting...")
+ return { { path = vlc.access .. "://" .. vlc.path; options = {":http-user-agent=Mozilla/5.0" } } }
+ end
+
+ _,_,id = string.find( vlc.path, "vimeo.com/([0-9]*)")
+ prefres = get_prefres()
+ ishd = false
+ quality = "sd"
+ codec = nil
+ line2 = ""
+ while true do
+ line = vlc.readline()
+ if not line then break end
+ if string.match( line, "{config:.*") then
+ line2 = line;
+ while not string.match( line2, "}};") do
+ line2 = vlc.readline()
+ if not line2 then break end
+ line = line .. line2;
+ end
+ end
+ -- Try to find the video's title
+ if string.match( line, "<meta property=\"og:title\"" ) then
+ _,_,name = string.find (line, "content=\"(.*)\">" )
+ end
+ if string.match( line, "{config:.*\"title\":\"" ) then
+ _,_,name = string.find (line, "\"title\":\"([^\"]*)\"," )
+ end
+ -- Try to find image for thumbnail
+ if string.match( line, "<meta property=\"og:image\"" ) then
+ _,_,arturl = string.find (line, "content=\"(.*)\">" )
+ end
+ if string.match( line, "<meta itemprop=\"thumbnailUrl\"" ) then
+ _,_,arturl = string.find (line, "content=\"(.*)\">" )
+ end
+ -- Try to find duration
+ if string.match( line, "{config:.*\"duration\":" ) then
+ _,_,duration = string.find (line, "\"duration\":([0-9]*)," )
+ end
+ -- Try to find request signature (needed to construct video url)
+ if string.match( line, "{config:.*\"signature\":" ) then
+ _,_,rsig = string.find (line, "\"signature\":\"([0-9a-f]*)\"," )
+ end
+ -- Try to find request signature time (needed to construct video url)
+ if string.match( line, "{config:.*\"timestamp\":" ) then
+ _,_,tstamp = string.find (line, "\"timestamp\":([0-9]*)," )
+ end
+ -- Try to find the available codecs
+ if string.match( line, "{config:.*,\"files\":{\"vp6\":" ) then
+ codec = "vp6"
+ end
+ if string.match( line, "{config:.*,\"files\":{\"vp8\":" ) then
+ codec = "vp8"
+ end
+ if string.match( line, "{config:.*,\"files\":{\"h264\":" ) then
+ codec = "h264"
+ end
+ -- Try to find whether video is HD actually
+ if string.match( line, "{config:.*,\"hd\":1" ) then
+ ishd = true
+ end
+ if string.match( line, "{config:.*\"height\":" ) then
+ _,_,height = string.find (line, "\"height\":([0-9]*)," )
+ end
+ if not line2 then break end
+ end
+
+ if not codec then
+ vlc.msg.err("unable to find codec info")
+ return {}
+ end
+
+ if ishd and ( not height or prefres < 0 or prefres >= tonumber(height) ) then
+ quality = "hd"
+ end
+ path = "http://player.vimeo.com/play_redirect?quality="..quality.."&codecs="..codec.."&clip_id="..id.."&time="..tstamp.."&sig="..rsig.."&type=html5_desktop_local"
+ return { { path = path; name = name; arturl = arturl; duration = duration } }
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
end
diff --combined share/lua/playlist/youtube.lua
index 9cadd1f,30da2f8..5cec7e9
--- a/share/lua/playlist/youtube.lua
+++ b/share/lua/playlist/youtube.lua
@@@ -269,7 -269,6 +269,10 @@@ function parse(
local js_url = string.match( line, "\"js\": \"(.-)\"" )
if js_url then
js_url = string.gsub( js_url, "\\/", "/" )
++<<<<<<< HEAD
+ js_url = string.gsub( js_url, "^//", vlc.access.."://" )
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
end
if not fmt then
diff --combined src/input/decoder.c
index 2353a99,a79d56a..0ad5b5b
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@@ -2,7 -2,7 +2,11 @@@
* decoder.c: Functions for the management of decoders
*****************************************************************************
* Copyright (C) 1999-2004 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: f459c4981b1758ccd9202bcd631ceb72d3ee177e $
++=======
+ * $Id: c86e06f1c11bf6eb3575cc9e039abce86bf6d07e $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Christophe Massiot <massiot at via.ecp.fr>
* Gildas Bazin <gbazin at videolan.org>
@@@ -2357,7 -2357,6 +2361,10 @@@ static picture_t *vout_new_buffer( deco
unsigned dpb_size;
switch( p_dec->fmt_in.i_codec )
{
++<<<<<<< HEAD
+ case VLC_CODEC_HEVC:
++=======
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
case VLC_CODEC_H264:
case VLC_CODEC_DIRAC: /* FIXME valid ? */
dpb_size = 18;
diff --combined src/input/es_out.c
index 8d6744a,d949e52..693ccb0
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@@ -2,7 -2,7 +2,11 @@@
* es_out.c: Es Out handler for input.
*****************************************************************************
* Copyright (C) 2003-2004 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: ba8f129cb9aae471e74605774b4ffbf3c9126957 $
++=======
+ * $Id: c75c6db0f5e61cd2875c0aa19c28c70d19dea720 $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Laurent Aimar <fenrir at via.ecp.fr>
* Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
@@@ -1369,7 -1369,7 +1373,11 @@@ static void EsOutMeta( es_out_t *p_out
{
input_item_SetArtURL( p_item, psz_arturl );
++<<<<<<< HEAD
+ if( !strncmp( psz_arturl, "attachment://", 13 ) )
++=======
+ if( !strncmp( psz_arturl, "attachment://", strlen("attachment") ) )
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
{
/* Don't look for art cover if sout
* XXX It can change when sout has meta data support */
diff --combined src/input/input.c
index 1ed5b9f,39bc821..d7cd519
--- a/src/input/input.c
+++ b/src/input/input.c
@@@ -2,7 -2,7 +2,11 @@@
* input.c: input thread
*****************************************************************************
* Copyright (C) 1998-2007 VLC authors and VideoLAN
++<<<<<<< HEAD
+ * $Id: 67ba782bdff3ae10ac29e01ae54ce1ea99964b80 $
++=======
+ * $Id: 1ab327fbc302824f03f1ea54898b78ecfd049a6b $
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
*
* Authors: Christophe Massiot <massiot at via.ecp.fr>
* Laurent Aimar <fenrir at via.ecp.fr>
@@@ -110,9 -110,8 +114,14 @@@ enum
SUB_FORCED = 0x01,
SUB_CANFAIL = 0x02,
};
++<<<<<<< HEAD
+
+static void input_SubtitleAdd( input_thread_t *, const char *, unsigned );
+static void input_SubtitleFileAdd( input_thread_t *, char *, unsigned );
++=======
+ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, unsigned i_flags );
+
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
static void input_ChangeState( input_thread_t *p_input, int i_state ); /* TODO fix name */
#undef input_Create
@@@ -1000,7 -999,7 +1009,11 @@@ static void LoadSubtitles( input_thread
if( psz_subtitle != NULL )
{
msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );
++<<<<<<< HEAD
+ input_SubtitleFileAdd( p_input, psz_subtitle, i_flags );
++=======
+ SubtitleAdd( p_input, psz_subtitle, i_flags );
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
i_flags = SUB_NOFLAG;
}
@@@ -1016,7 -1015,7 +1029,11 @@@
if( !psz_subtitle || strcmp( psz_subtitle, ppsz_subs[i] ) )
{
i_flags |= SUB_CANFAIL;
++<<<<<<< HEAD
+ input_SubtitleFileAdd( p_input, ppsz_subs[i], i_flags );
++=======
+ SubtitleAdd( p_input, ppsz_subs[i], i_flags );
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
i_flags = SUB_NOFLAG;
}
@@@ -1054,7 -1053,7 +1071,11 @@@
{
var_SetString( p_input, "sub-description", a->psz_description ? a->psz_description : "");
++<<<<<<< HEAD
+ input_SubtitleAdd( p_input, psz_mrl, i_flags );
++=======
+ SubtitleAdd( p_input, psz_mrl, i_flags );
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
i_flags = SUB_NOFLAG;
free( psz_mrl );
@@@ -1988,7 -1987,7 +2009,11 @@@ static bool Control( input_thread_t *p_
case INPUT_CONTROL_ADD_SUBTITLE:
if( val.psz_string )
++<<<<<<< HEAD
+ input_SubtitleFileAdd( p_input, val.psz_string, true );
++=======
+ SubtitleAdd( p_input, val.psz_string, true );
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
break;
case INPUT_CONTROL_ADD_SLAVE:
@@@ -3119,56 -3118,19 +3144,72 @@@ static void MRLSections( const char *p
/*****************************************************************************
* input_AddSubtitles: add a subtitle file and enable it
*****************************************************************************/
++<<<<<<< HEAD
+static void input_SubtitleAdd( input_thread_t *p_input,
+ const char *url, unsigned i_flags )
+{
+ input_source_t *sub = InputSourceNew( p_input );
+ if( sub == NULL )
+ return;
+
+ vlc_value_t count;
+
+ var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL );
+
+ if( InputSourceInit( p_input, sub, url, "subtitle",
+ (i_flags & SUB_CANFAIL) ) )
+ {
+ free( sub );
+ return;
+ }
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
+
+ if( !(i_flags & SUB_FORCED) )
+ return;
+
+ /* Select the ES */
+ vlc_value_t list;
+
+ if( var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
+ return;
+ if( count.i_int == 0 )
+ count.i_int++;
+ /* if it was first one, there is disable too */
+
+ if( count.i_int < list.p_list->i_count )
+ {
+ const int i_id = list.p_list->p_values[count.i_int].i_int;
+
+ es_out_Control( p_input->p->p_es_out_display, ES_OUT_SET_ES_DEFAULT_BY_ID, i_id );
+ es_out_Control( p_input->p->p_es_out_display, ES_OUT_SET_ES_BY_ID, i_id );
+ }
+ var_FreeList( &list, NULL );
+}
+
+static void input_SubtitleFileAdd( input_thread_t *p_input, char *psz_subtitle,
+ unsigned i_flags )
+{
+ /* if we are provided a subtitle.sub file,
+ * see if we don't have a subtitle.idx and use it instead */
+ char *psz_path = strdup( psz_subtitle );
+ if( likely(psz_path != NULL) )
+ {
+ char *psz_extension = strrchr( psz_path, '.');
++=======
+ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, unsigned i_flags )
+ {
+ input_source_t *sub;
+ vlc_value_t count;
+ vlc_value_t list;
+ char *psz_path, *psz_extension;
+
+ /* if we are provided a subtitle.sub file,
+ * see if we don't have a subtitle.idx and use it instead */
+ psz_path = strdup( psz_subtitle );
+ if( psz_path )
+ {
+ psz_extension = strrchr( psz_path, '.');
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
if( psz_extension && strcmp( psz_extension, ".sub" ) == 0 )
{
struct stat st;
@@@ -3179,18 -3141,43 +3220,55 @@@
{
msg_Dbg( p_input, "using %s as subtitle file instead of %s",
psz_path, psz_subtitle );
++<<<<<<< HEAD
+ strcpy( psz_subtitle, psz_path ); /* <- FIXME! constify */
++=======
+ strcpy( psz_subtitle, psz_path );
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
}
free( psz_path );
}
char *url = vlc_path2uri( psz_subtitle, NULL );
++<<<<<<< HEAD
+ if( url == NULL )
+ return;
+
+ input_SubtitleAdd( p_input, url, i_flags );
+ free( url );
++=======
+
+ var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL );
+
+ sub = InputSourceNew( p_input );
+ if( !sub || !url
+ || InputSourceInit( p_input, sub, url, "subtitle", (i_flags & SUB_CANFAIL) ) )
+ {
+ free( sub );
+ free( url );
+ return;
+ }
+ free( url );
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
+
+ /* Select the ES */
+ if( (i_flags & SUB_FORCED) && !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
+ {
+ if( count.i_int == 0 )
+ count.i_int++;
+ /* if it was first one, there is disable too */
+
+ if( count.i_int < list.p_list->i_count )
+ {
+ const int i_id = list.p_list->p_values[count.i_int].i_int;
+
+ es_out_Control( p_input->p->p_es_out_display, ES_OUT_SET_ES_DEFAULT_BY_ID, i_id );
+ es_out_Control( p_input->p->p_es_out_display, ES_OUT_SET_ES_BY_ID, i_id );
+ }
+ var_FreeList( &list, NULL );
+ }
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
}
/*****************************************************************************
diff --combined src/revision.c
index 3b3791f,a7e51b0..a9e9fbb
--- a/src/revision.c
+++ b/src/revision.c
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+const char psz_vlc_changeset[] = "2.1.2-0-ga4c4876";
++=======
+ const char psz_vlc_changeset[] = "2.1.0-207-g89c9520";
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
diff --combined src/revision.txt
index c7c39f3,0ed4dfd..b01c735
--- a/src/revision.txt
+++ b/src/revision.txt
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+2.1.2-0-ga4c4876
++=======
+ 2.1.0-207-g89c9520
++>>>>>>> 3cef1bf178786927315f5033587b0926821b4b1b
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list