New Upstream Snapshot - soundkonverter
Ready changes
Summary
Merged new upstream version: 3.0.1+git20200726.1.aceda48 (was: 3.0.1).
Resulting package
Built on 2022-10-15T03:08 (took 11m32s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots soundkonverter-dbgsymapt install -t fresh-snapshots soundkonverter
Lintian Result
- soundkonverter-dbgsym_3.0.1+git20200726.1.aceda48-1~jan+nus1_amd64.deb
- soundkonverter_3.0.1+git20200726.1.aceda48-1~jan+nus1.dsc
- soundkonverter_3.0.1+git20200726.1.aceda48-1~jan+nus1_amd64.buildinfo
- soundkonverter_3.0.1+git20200726.1.aceda48-1~jan+nus1_amd64.changes
- soundkonverter_3.0.1+git20200726.1.aceda48-1~jan+nus1_amd64.deb
Diff
diff --git a/debian/changelog b/debian/changelog
index 400196a..2654681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+soundkonverter (3.0.1+git20200726.1.aceda48-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ * Drop patch
+ upstream_FindTaglib.cmake-Update-local-copy-with-ECM-5.72.0-v.patch, present
+ upstream.
+ * Drop patch upstream_Install-appdata-in-usr-share-metainfo.patch, present
+ upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sat, 15 Oct 2022 03:00:07 -0000
+
soundkonverter (3.0.1-3) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/series b/debian/patches/series
index 53e3a05..6692dea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-upstream_FindTaglib.cmake-Update-local-copy-with-ECM-5.72.0-v.patch
-upstream_Install-appdata-in-usr-share-metainfo.patch
soversion.diff
diff --git a/debian/patches/soversion.diff b/debian/patches/soversion.diff
index d291541..1e48653 100644
--- a/debian/patches/soversion.diff
+++ b/debian/patches/soversion.diff
@@ -6,9 +6,11 @@ Description: Set 0 as SOVERSION
Last-Update: 2017-12-27
Forwarded: not-needed
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -68,6 +68,7 @@ set(soundkonvertercore_SRCS
+Index: soundkonverter.git/src/CMakeLists.txt
+===================================================================
+--- soundkonverter.git.orig/src/CMakeLists.txt
++++ soundkonverter.git/src/CMakeLists.txt
+@@ -66,6 +66,7 @@ set(soundkonvertercore_SRCS
)
add_library(soundkonvertercore SHARED ${soundkonvertercore_SRCS})
diff --git a/debian/patches/upstream_FindTaglib.cmake-Update-local-copy-with-ECM-5.72.0-v.patch b/debian/patches/upstream_FindTaglib.cmake-Update-local-copy-with-ECM-5.72.0-v.patch
deleted file mode 100644
index 64c7e09..0000000
--- a/debian/patches/upstream_FindTaglib.cmake-Update-local-copy-with-ECM-5.72.0-v.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-From 3760bccb3aa1e15bd5ec67bc977717c55a95bc6e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 19 Jul 2020 12:06:28 +0200
-Subject: [PATCH] FindTaglib.cmake: Update local copy with ECM 5.72.0 version
- and adapt cmake
-
-ECM 5.72.0 ships an incompatible FindTaglib.cmake module.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/CMakeLists.txt | 6 +-
- src/cmake/modules/FindTaglib.cmake | 209 +++++++++++------------------
- 2 files changed, 85 insertions(+), 130 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 521d0da..c9d9bee 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -40,7 +40,7 @@ find_package(Phonon4Qt5 REQUIRED)
- find_package(Cdparanoia REQUIRED)
-
- set(TAGLIB_MIN_VERSION "1.10")
--find_package(Taglib REQUIRED)
-+find_package(Taglib ${TAGLIB_MIN_VERSION} REQUIRED)
-
-
- # plugins
-@@ -48,7 +48,7 @@ add_subdirectory(plugins)
-
-
- # include directories
--include_directories(${TAGLIB_INCLUDES} ${CDPARANOIA_INCLUDE_DIR})
-+include_directories(${CDPARANOIA_INCLUDE_DIR})
-
-
- # translation
-@@ -120,7 +120,7 @@ set(soundkonverter_SRCS
- )
-
- add_executable(soundkonverter ${soundkonverter_SRCS})
--target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 ${TAGLIB_LIBRARIES} ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore)
-+target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 Taglib::Taglib ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore)
-
- install(TARGETS soundkonverter DESTINATION ${BIN_INSTALL_DIR})
-
-diff --git a/src/cmake/modules/FindTaglib.cmake b/src/cmake/modules/FindTaglib.cmake
-index 5a985f9..40c5ca2 100644
---- a/src/cmake/modules/FindTaglib.cmake
-+++ b/src/cmake/modules/FindTaglib.cmake
-@@ -1,135 +1,90 @@
--# - Try to find the Taglib library
--# Once done this will define
-+#.rst:
-+# FindTaglib
-+# ----------
- #
--# TAGLIB_FOUND - system has the taglib library
--# TAGLIB_CFLAGS - the taglib cflags
--# TAGLIB_LIBRARIES - The libraries needed to use taglib
--
--# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-+# Try to find the Taglib library.
- #
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
--
--if(NOT TAGLIB_MIN_VERSION)
-- set(TAGLIB_MIN_VERSION "1.6")
--endif(NOT TAGLIB_MIN_VERSION)
--
--if(NOT WIN32)
-- find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
-- ${BIN_INSTALL_DIR}
-- )
--endif(NOT WIN32)
--
--#reset vars
--set(TAGLIB_LIBRARIES)
--set(TAGLIB_CFLAGS)
--
--# if taglib-config has been found
--if(TAGLIBCONFIG_EXECUTABLE)
--
-- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
--
-- if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
-- message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
-- set(TAGLIB_FOUND FALSE)
-- else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
--
-- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
--
-- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS)
-+# This will define the following variables:
-+#
-+# ``Taglib_FOUND``
-+# True if the system has the taglib library of at least the minimum
-+# version specified by the version parameter to find_package()
-+# ``Taglib_INCLUDE_DIRS``
-+# The taglib include dirs for use with target_include_directories
-+# ``Taglib_LIBRARIES``
-+# The taglib libraries for use with target_link_libraries()
-+# ``Taglib_VERSION``
-+# The version of taglib that was found
-+#
-+# If ``Taglib_FOUND is TRUE, it will also define the following imported
-+# target:
-+#
-+# ``Taglib::Taglib``
-+# The Taglib library
-+#
-+# Since 5.72.0
-+#
-+# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org>
-+# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
-+# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
-+# SPDX-License-Identifier: BSD-3-Clause
-
-- if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
-- set(TAGLIB_FOUND TRUE)
-- endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
-- string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
-- endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
-- mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
-+find_package(PkgConfig QUIET)
-
--else(TAGLIBCONFIG_EXECUTABLE)
-+pkg_search_module(PC_TAGLIB QUIET taglib)
-
-- find_path(TAGLIB_INCLUDES
-- NAMES
-- tag.h
-+find_path(Taglib_INCLUDE_DIRS
-+ NAMES tag.h
- PATH_SUFFIXES taglib
-- PATHS
-- ${KDE4_INCLUDE_DIR}
-- ${INCLUDE_INSTALL_DIR}
-- )
--
-- IF(NOT WIN32)
-- # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX
--
-- FIND_LIBRARY(TAGLIB_LIBRARIES tag PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
--
-- ELSE(NOT WIN32)
--
-- # 1. get all possible libnames
-- SET(args PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
-- SET(newargs "")
-- SET(libnames_release "")
-- SET(libnames_debug "")
--
-- LIST(LENGTH args listCount)
--
-- # just one name
-- LIST(APPEND libnames_release "tag")
-- LIST(APPEND libnames_debug "tagd")
--
-- SET(newargs ${args})
--
-- # search the release lib
-- FIND_LIBRARY(TAGLIB_LIBRARIES_RELEASE
-- NAMES ${libnames_release}
-- ${newargs}
-- )
--
-- # search the debug lib
-- FIND_LIBRARY(TAGLIB_LIBRARIES_DEBUG
-- NAMES ${libnames_debug}
-- ${newargs}
-- )
--
-- IF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
--
-- # both libs found
-- SET(TAGLIB_LIBRARIES optimized ${TAGLIB_LIBRARIES_RELEASE}
-- debug ${TAGLIB_LIBRARIES_DEBUG})
--
-- ELSE(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
--
-- IF(TAGLIB_LIBRARIES_RELEASE)
--
-- # only release found
-- SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_RELEASE})
--
-- ELSE(TAGLIB_LIBRARIES_RELEASE)
--
-- # only debug (or nothing) found
-- SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_DEBUG})
--
-- ENDIF(TAGLIB_LIBRARIES_RELEASE)
--
-- ENDIF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
--
-- MARK_AS_ADVANCED(TAGLIB_LIBRARIES_RELEASE)
-- MARK_AS_ADVANCED(TAGLIB_LIBRARIES_DEBUG)
--
-- ENDIF(NOT WIN32)
--
-- INCLUDE(FindPackageMessage)
-- INCLUDE(FindPackageHandleStandardArgs)
-- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES)
--
--endif(TAGLIBCONFIG_EXECUTABLE)
--
-+ HINTS ${PC_TAGLIB_INCLUDEDIR}
-+)
-+
-+find_library(Taglib_LIBRARIES
-+ NAMES tag
-+ HINTS ${PC_TAGLIB_LIBDIR}
-+)
-+
-+set(Taglib_VERSION ${PC_TAGLIB_VERSION})
-+
-+if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION)
-+ if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h")
-+ file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H)
-+
-+ string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H})
-+ string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H})
-+ string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H})
-+
-+ string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}")
-+ string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}")
-+ string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}")
-+
-+ set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}")
-+ endif()
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Taglib
-+ FOUND_VAR
-+ Taglib_FOUND
-+ REQUIRED_VARS
-+ Taglib_LIBRARIES
-+ Taglib_INCLUDE_DIRS
-+ VERSION_VAR
-+ Taglib_VERSION
-+)
-+
-+if (Taglib_FOUND AND NOT TARGET Taglib::Taglib)
-+ add_library(Taglib::Taglib UNKNOWN IMPORTED)
-+ set_target_properties(Taglib::Taglib PROPERTIES
-+ IMPORTED_LOCATION "${Taglib_LIBRARIES}"
-+ INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}"
-+ )
-+endif()
-
--if(TAGLIB_FOUND)
-- if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
-- message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}")
-- endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
--else(TAGLIB_FOUND)
-- if(Taglib_FIND_REQUIRED)
-- message(FATAL_ERROR "Could not find Taglib")
-- endif(Taglib_FIND_REQUIRED)
--endif(TAGLIB_FOUND)
-+mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS)
-
-+include(FeatureSummary)
-+set_package_properties(Taglib PROPERTIES
-+ URL "https://taglib.org/"
-+ DESCRIPTION "A library for reading and editing the meta-data of audio formats"
-+)
---
-2.28.0
-
diff --git a/debian/patches/upstream_Install-appdata-in-usr-share-metainfo.patch b/debian/patches/upstream_Install-appdata-in-usr-share-metainfo.patch
deleted file mode 100644
index 7c9e404..0000000
--- a/debian/patches/upstream_Install-appdata-in-usr-share-metainfo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8589c87095466f0785902dea6367192bcd813eb3 Mon Sep 17 00:00:00 2001
-From: eclipseo <30413512+eclipseo@users.noreply.github.com>
-Date: Fri, 7 Sep 2018 18:15:43 +0200
-Subject: [PATCH] Install appdata in /usr/share/metainfo
-
-appdata file should now be installed in /usr/share/metainfo. /usr/share/appdata is deprecated.
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a0e36de..521d0da 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -135,7 +135,7 @@ install(FILES soundkonverter_replaygainplugin.desktop DESTINATION ${SERVICETYPES
- install(FILES soundkonverter_ripperplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
- install(FILES soundkonverter-rip-audiocd.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions)
-
--install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
-+install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/metainfo)
-
- add_subdirectory(icons)
- add_subdirectory(images)
---
-2.33.0
-
diff --git a/src/CHANGELOG b/src/CHANGELOG
index 2bfd65b..f9f8783 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,8 @@
+unreleased:
+-Fix: Add directories to the Replay Gain tool
+-Fix: Install appdata in /usr/share/metainfo
+-Fix: Find taglib with ECM 5.72.0 (thanks to Andreas Sturmlechner <asturm@gentoo.org>)
+
3.0.1:
-Fix: Destination mode "Source directory" creates filenames consisting only of the file extension
-Fix: All files "Failed" to convert when dragging a folder (Invalid URL)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a0e36de..bdebbbf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,9 +19,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
# kde libs
find_package(ECM REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
-
-add_definitions(-DSOUNDKONVERTER_KF5_BUILD)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
include(KDEInstallDirs)
include(KDECompilerSettings)
@@ -30,7 +28,7 @@ include(CMakePackageConfigHelpers)
include(ECMInstallIcons)
include(FeatureSummary)
-find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets)
+find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml)
find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support)
find_package(KF5Cddb)
find_package(Phonon4Qt5 REQUIRED)
@@ -40,7 +38,7 @@ find_package(Phonon4Qt5 REQUIRED)
find_package(Cdparanoia REQUIRED)
set(TAGLIB_MIN_VERSION "1.10")
-find_package(Taglib REQUIRED)
+find_package(Taglib ${TAGLIB_MIN_VERSION} REQUIRED)
# plugins
@@ -48,7 +46,7 @@ add_subdirectory(plugins)
# include directories
-include_directories(${TAGLIB_INCLUDES} ${CDPARANOIA_INCLUDE_DIR})
+include_directories(${CDPARANOIA_INCLUDE_DIR})
# translation
@@ -120,7 +118,7 @@ set(soundkonverter_SRCS
)
add_executable(soundkonverter ${soundkonverter_SRCS})
-target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 ${TAGLIB_LIBRARIES} ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore)
+target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 Taglib::Taglib ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore)
install(TARGETS soundkonverter DESTINATION ${BIN_INSTALL_DIR})
@@ -135,7 +133,7 @@ install(FILES soundkonverter_replaygainplugin.desktop DESTINATION ${SERVICETYPES
install(FILES soundkonverter_ripperplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
install(FILES soundkonverter-rip-audiocd.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions)
-install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
+install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/metainfo)
add_subdirectory(icons)
add_subdirectory(images)
diff --git a/src/cmake/modules/FindTaglib-Extras.cmake b/src/cmake/modules/FindTaglib-Extras.cmake
deleted file mode 100644
index b96f705..0000000
--- a/src/cmake/modules/FindTaglib-Extras.cmake
+++ /dev/null
@@ -1,135 +0,0 @@
-# - Try to find the Taglib-Extras library
-# Once done this will define
-#
-# TAGLIB-EXTRAS_FOUND - system has the taglib library
-# TAGLIB-EXTRAS_CFLAGS - the taglib cflags
-# TAGLIB-EXTRAS_LIBRARIES - The libraries needed to use taglib
-
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if(NOT TAGLIB-EXTRAS_MIN_VERSION)
- set(TAGLIB-EXTRAS_MIN_VERSION "1.0")
-endif(NOT TAGLIB-EXTRAS_MIN_VERSION)
-
-if(NOT WIN32)
- find_program(TAGLIB-EXTRASCONFIG_EXECUTABLE NAMES taglib-extras-config PATHS
- ${BIN_INSTALL_DIR}
- )
-endif(NOT WIN32)
-
-#reset vars
-set(TAGLIB-EXTRAS_LIBRARIES)
-set(TAGLIB-EXTRAS_CFLAGS)
-
-# if taglib-extras-config has been found
-if(TAGLIB-EXTRASCONFIG_EXECUTABLE)
-
- exec_program(${TAGLIB-EXTRASCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB-EXTRAS_VERSION)
-
- if(TAGLIB-EXTRAS_VERSION STRLESS "${TAGLIB-EXTRAS_MIN_VERSION}")
- message(STATUS "TagLib-Extras version too old: version searched :${TAGLIB-EXTRAS_MIN_VERSION}, found ${TAGLIB-EXTRAS_VERSION}")
- set(TAGLIB-EXTRAS_FOUND FALSE)
- else(TAGLIB-EXTRAS_VERSION STRLESS "${TAGLIB-EXTRAS_MIN_VERSION}")
-
- exec_program(${TAGLIB-EXTRASCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB-EXTRAS_LIBRARIES)
-
- exec_program(${TAGLIB-EXTRASCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB-EXTRAS_CFLAGS)
-
- if(TAGLIB-EXTRAS_LIBRARIES AND TAGLIB-EXTRAS_CFLAGS)
- set(TAGLIB-EXTRAS_FOUND TRUE)
- endif(TAGLIB-EXTRAS_LIBRARIES AND TAGLIB-EXTRAS_CFLAGS)
- string(REGEX REPLACE " *-I" ";" TAGLIB-EXTRAS_INCLUDES "${TAGLIB-EXTRAS_CFLAGS}")
- endif(TAGLIB-EXTRAS_VERSION STRLESS "${TAGLIB-EXTRAS_MIN_VERSION}")
- mark_as_advanced(TAGLIB-EXTRAS_CFLAGS TAGLIB-EXTRAS_LIBRARIES TAGLIB-EXTRAS_INCLUDES)
-
-else(TAGLIB-EXTRASCONFIG_EXECUTABLE)
-
- find_path(TAGLIB-EXTRAS_INCLUDES
- NAMES
- tfile_helper.h
- PATH_SUFFIXES taglib-extras
- PATHS
- ${KDE4_INCLUDE_DIR}
- ${INCLUDE_INSTALL_DIR}
- )
-
- IF(NOT WIN32)
- # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX
-
- FIND_LIBRARY(TAGLIB-EXTRAS_LIBRARIES tag-extras PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
-
- ELSE(NOT WIN32)
-
- # 1. get all possible libnames
- SET(args PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
- SET(newargs "")
- SET(libnames_release "")
- SET(libnames_debug "")
-
- LIST(LENGTH args listCount)
-
- # just one name
- LIST(APPEND libnames_release "tag-extras")
- LIST(APPEND libnames_debug "tag-extrasd")
-
- SET(newargs ${args})
-
- # search the release lib
- FIND_LIBRARY(TAGLIB-EXTRAS_LIBRARIES_RELEASE
- NAMES ${libnames_release}
- ${newargs}
- )
-
- # search the debug lib
- FIND_LIBRARY(TAGLIB-EXTRAS_LIBRARIES_DEBUG
- NAMES ${libnames_debug}
- ${newargs}
- )
-
- IF(TAGLIB-EXTRAS_LIBRARIES_RELEASE AND TAGLIB-EXTRAS_LIBRARIES_DEBUG)
-
- # both libs found
- SET(TAGLIB-EXTRAS_LIBRARIES optimized ${TAGLIB-EXTRAS_LIBRARIES_RELEASE}
- debug ${TAGLIB-EXTRAS_LIBRARIES_DEBUG})
-
- ELSE(TAGLIB-EXTRAS_LIBRARIES_RELEASE AND TAGLIB-EXTRAS_LIBRARIES_DEBUG)
-
- IF(TAGLIB-EXTRAS_LIBRARIES_RELEASE)
-
- # only release found
- SET(TAGLIB-EXTRAS_LIBRARIES ${TAGLIB-EXTRAS_LIBRARIES_RELEASE})
-
- ELSE(TAGLIB-EXTRAS_LIBRARIES_RELEASE)
-
- # only debug (or nothing) found
- SET(TAGLIB-EXTRAS_LIBRARIES ${TAGLIB-EXTRAS_LIBRARIES_DEBUG})
-
- ENDIF(TAGLIB-EXTRAS_LIBRARIES_RELEASE)
-
- ENDIF(TAGLIB-EXTRAS_LIBRARIES_RELEASE AND TAGLIB-EXTRAS_LIBRARIES_DEBUG)
-
- MARK_AS_ADVANCED(TAGLIB-EXTRAS_LIBRARIES_RELEASE)
- MARK_AS_ADVANCED(TAGLIB-EXTRAS_LIBRARIES_DEBUG)
-
- ENDIF(NOT WIN32)
-
- INCLUDE(FindPackageMessage)
- INCLUDE(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Taglib-Extras DEFAULT_MSG TAGLIB-EXTRAS_INCLUDES TAGLIB-EXTRAS_LIBRARIES)
-
-endif(TAGLIB-EXTRASCONFIG_EXECUTABLE)
-
-
-if(TAGLIB-EXTRAS_FOUND)
- if(NOT Taglib-Extras_FIND_QUIETLY AND TAGLIB-EXTRASCONFIG_EXECUTABLE)
- message(STATUS "Taglib-Extras found: ${TAGLIB-EXTRAS_LIBRARIES}")
- endif(NOT Taglib-Extras_FIND_QUIETLY AND TAGLIB-EXTRASCONFIG_EXECUTABLE)
-else(TAGLIB-EXTRAS_FOUND)
- if(Taglib-Extras_FIND_REQUIRED)
- message(FATAL_ERROR "Could not find Taglib-Extras")
- endif(Taglib-Extras_FIND_REQUIRED)
-endif(TAGLIB-EXTRAS_FOUND)
-
diff --git a/src/cmake/modules/FindTaglib.cmake b/src/cmake/modules/FindTaglib.cmake
index 5a985f9..40c5ca2 100644
--- a/src/cmake/modules/FindTaglib.cmake
+++ b/src/cmake/modules/FindTaglib.cmake
@@ -1,135 +1,90 @@
-# - Try to find the Taglib library
-# Once done this will define
+#.rst:
+# FindTaglib
+# ----------
#
-# TAGLIB_FOUND - system has the taglib library
-# TAGLIB_CFLAGS - the taglib cflags
-# TAGLIB_LIBRARIES - The libraries needed to use taglib
-
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+# Try to find the Taglib library.
#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if(NOT TAGLIB_MIN_VERSION)
- set(TAGLIB_MIN_VERSION "1.6")
-endif(NOT TAGLIB_MIN_VERSION)
-
-if(NOT WIN32)
- find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
- ${BIN_INSTALL_DIR}
- )
-endif(NOT WIN32)
-
-#reset vars
-set(TAGLIB_LIBRARIES)
-set(TAGLIB_CFLAGS)
-
-# if taglib-config has been found
-if(TAGLIBCONFIG_EXECUTABLE)
-
- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
-
- if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
- message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
- set(TAGLIB_FOUND FALSE)
- else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
-
- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
-
- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS)
+# This will define the following variables:
+#
+# ``Taglib_FOUND``
+# True if the system has the taglib library of at least the minimum
+# version specified by the version parameter to find_package()
+# ``Taglib_INCLUDE_DIRS``
+# The taglib include dirs for use with target_include_directories
+# ``Taglib_LIBRARIES``
+# The taglib libraries for use with target_link_libraries()
+# ``Taglib_VERSION``
+# The version of taglib that was found
+#
+# If ``Taglib_FOUND is TRUE, it will also define the following imported
+# target:
+#
+# ``Taglib::Taglib``
+# The Taglib library
+#
+# Since 5.72.0
+#
+# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org>
+# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
+# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
+# SPDX-License-Identifier: BSD-3-Clause
- if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
- set(TAGLIB_FOUND TRUE)
- endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
- string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
- endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
- mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+find_package(PkgConfig QUIET)
-else(TAGLIBCONFIG_EXECUTABLE)
+pkg_search_module(PC_TAGLIB QUIET taglib)
- find_path(TAGLIB_INCLUDES
- NAMES
- tag.h
+find_path(Taglib_INCLUDE_DIRS
+ NAMES tag.h
PATH_SUFFIXES taglib
- PATHS
- ${KDE4_INCLUDE_DIR}
- ${INCLUDE_INSTALL_DIR}
- )
-
- IF(NOT WIN32)
- # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX
-
- FIND_LIBRARY(TAGLIB_LIBRARIES tag PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
-
- ELSE(NOT WIN32)
-
- # 1. get all possible libnames
- SET(args PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
- SET(newargs "")
- SET(libnames_release "")
- SET(libnames_debug "")
-
- LIST(LENGTH args listCount)
-
- # just one name
- LIST(APPEND libnames_release "tag")
- LIST(APPEND libnames_debug "tagd")
-
- SET(newargs ${args})
-
- # search the release lib
- FIND_LIBRARY(TAGLIB_LIBRARIES_RELEASE
- NAMES ${libnames_release}
- ${newargs}
- )
-
- # search the debug lib
- FIND_LIBRARY(TAGLIB_LIBRARIES_DEBUG
- NAMES ${libnames_debug}
- ${newargs}
- )
-
- IF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
-
- # both libs found
- SET(TAGLIB_LIBRARIES optimized ${TAGLIB_LIBRARIES_RELEASE}
- debug ${TAGLIB_LIBRARIES_DEBUG})
-
- ELSE(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
-
- IF(TAGLIB_LIBRARIES_RELEASE)
-
- # only release found
- SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_RELEASE})
-
- ELSE(TAGLIB_LIBRARIES_RELEASE)
-
- # only debug (or nothing) found
- SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_DEBUG})
-
- ENDIF(TAGLIB_LIBRARIES_RELEASE)
-
- ENDIF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
-
- MARK_AS_ADVANCED(TAGLIB_LIBRARIES_RELEASE)
- MARK_AS_ADVANCED(TAGLIB_LIBRARIES_DEBUG)
-
- ENDIF(NOT WIN32)
-
- INCLUDE(FindPackageMessage)
- INCLUDE(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES)
-
-endif(TAGLIBCONFIG_EXECUTABLE)
-
+ HINTS ${PC_TAGLIB_INCLUDEDIR}
+)
+
+find_library(Taglib_LIBRARIES
+ NAMES tag
+ HINTS ${PC_TAGLIB_LIBDIR}
+)
+
+set(Taglib_VERSION ${PC_TAGLIB_VERSION})
+
+if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION)
+ if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h")
+ file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H)
+
+ string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H})
+ string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H})
+ string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H})
+
+ string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}")
+ string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}")
+ string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}")
+
+ set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}")
+ endif()
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Taglib
+ FOUND_VAR
+ Taglib_FOUND
+ REQUIRED_VARS
+ Taglib_LIBRARIES
+ Taglib_INCLUDE_DIRS
+ VERSION_VAR
+ Taglib_VERSION
+)
+
+if (Taglib_FOUND AND NOT TARGET Taglib::Taglib)
+ add_library(Taglib::Taglib UNKNOWN IMPORTED)
+ set_target_properties(Taglib::Taglib PROPERTIES
+ IMPORTED_LOCATION "${Taglib_LIBRARIES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}"
+ )
+endif()
-if(TAGLIB_FOUND)
- if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
- message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}")
- endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
-else(TAGLIB_FOUND)
- if(Taglib_FIND_REQUIRED)
- message(FATAL_ERROR "Could not find Taglib")
- endif(Taglib_FIND_REQUIRED)
-endif(TAGLIB_FOUND)
+mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS)
+include(FeatureSummary)
+set_package_properties(Taglib PROPERTIES
+ URL "https://taglib.org/"
+ DESCRIPTION "A library for reading and editing the meta-data of audio formats"
+)
diff --git a/src/config.cpp b/src/config.cpp
index 93bb671..4cdaf56 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -328,7 +328,7 @@ void Config::load()
if( QFile::exists(src) && !QFile::exists(dest) )
{
QFile::copy(src, dest);
- logger->log( 1000, i18n("Importing old profiles from: %1").arg(src) );
+ logger->log( 1000, i18n("Importing old profiles from: %1",src) );
}
}
diff --git a/src/configdialog/configgeneralpage.cpp b/src/configdialog/configgeneralpage.cpp
index 682fda5..3481dbf 100644
--- a/src/configdialog/configgeneralpage.cpp
+++ b/src/configdialog/configgeneralpage.cpp
@@ -134,7 +134,7 @@ ConfigGeneralPage::ConfigGeneralPage( Config *_config, QWidget *parent )
QLabel *lNumFiles = new QLabel( i18n("Number of files to convert at once:"), this );
numFilesBox->addWidget( lNumFiles );
iNumFiles = new KIntSpinBox( this );
- iNumFiles->setToolTip( i18n("You shouldn't set this number higher than the amount of installed processor cores.\nThere have been %1 processor cores detected.").arg(processorsCount) );
+ iNumFiles->setToolTip( i18n("You shouldn't set this number higher than the amount of installed processor cores.\nThere have been %1 processor cores detected.", processorsCount) );
iNumFiles->setRange( 1, 100 );
iNumFiles->setValue( config->data.general.numFiles );
numFilesBox->addWidget( iNumFiles );
@@ -193,7 +193,7 @@ ConfigGeneralPage::ConfigGeneralPage( Config *_config, QWidget *parent )
QLabel *lNumReplayGainFiles = new QLabel( i18n("Number of items to process at once:"), this );
numReplayGainFilesBox->addWidget( lNumReplayGainFiles );
iNumReplayGainFiles = new KIntSpinBox( this );
- iNumReplayGainFiles->setToolTip( i18n("You shouldn't set this number higher than the amount of installed processor cores.\nThere have been %1 processor cores detected.").arg(processorsCount) );
+ iNumReplayGainFiles->setToolTip( i18n("You shouldn't set this number higher than the amount of installed processor cores.\nThere have been %1 processor cores detected.", processorsCount) );
iNumReplayGainFiles->setRange( 1, 100 );
iNumReplayGainFiles->setValue( config->data.general.numReplayGainFiles );
numReplayGainFilesBox->addWidget( iNumReplayGainFiles );
diff --git a/src/filelist.cpp b/src/filelist.cpp
index e588c3c..32c650c 100644
--- a/src/filelist.cpp
+++ b/src/filelist.cpp
@@ -295,7 +295,7 @@ int FileList::listDir( const QString& directory, const QStringList& filter, bool
if( filter.contains(codecName) )
{
QList<QUrl> urls;
- urls.append("file://" + directory + "/" + fileName);
+ urls.append(QUrl::fromLocalFile(directory + '/' + fileName));
addFiles( urls, 0, "", codecName, conversionOptionsId );
}
@@ -649,7 +649,7 @@ void FileList::updateItem( FileListItem *item )
}
else // shouldn't be possible
{
- item->setText( Column_Input, i18n("CD track %1").arg(item->track) );
+ item->setText( Column_Input, i18n("CD track %1",item->track) );
}
}
else
diff --git a/src/main.cpp b/src/main.cpp
index 62a2715..5cbd0bd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -9,7 +9,7 @@
#include <K4AboutData>
#include <KCmdLineArgs>
#include <KLocale>
-
+#include <KLocalizedString>
static const char description[] =
I18N_NOOP("soundKonverter is a frontend to various audio converters, Replay Gain tools and CD rippers.\n\nPlease file bug reports at https://github.com/dfaust/soundkonverter/issues");
@@ -18,6 +18,8 @@ static const char version[] = SOUNDKONVERTER_VERSION_STRING;
int main(int argc, char **argv)
{
+ KLocalizedString::setApplicationDomain("soundkonverter");
+
K4AboutData about("soundkonverter", 0, ki18n("soundKonverter"), version, ki18n(description), K4AboutData::License_GPL, ki18n("(C) 2005-2017 Daniel Faust"), KLocalizedString(), 0, "hessijames@gmail.com");
about.addAuthor( ki18n("Daniel Faust"), KLocalizedString(), "hessijames@gmail.com" );
about.addCredit( ki18n("David Vignoni"), ki18n("Nuvola icon theme"), 0, "http://www.icon-king.com" );
diff --git a/src/opener/cdopener.cpp b/src/opener/cdopener.cpp
index 6773ea2..638325d 100644
--- a/src/opener/cdopener.cpp
+++ b/src/opener/cdopener.cpp
@@ -553,7 +553,7 @@ QMap<QString,QString> CDOpener::cdDevices()
cdDrive = cdda_identify( device.toAscii(), CDDA_MESSAGE_PRINTIT, 0 );
if( cdDrive && cdda_open(cdDrive) == 0 )
{
- const QString desc = i18n("%1 (%2): Audio CD with %3 tracks").arg(name).arg(device).arg(cdda_audio_tracks(cdDrive));
+ const QString desc = i18n("%1 (%2): Audio CD with %3 tracks",name,device,cdda_audio_tracks(cdDrive));
devices.insert( device, desc );
}
}
diff --git a/src/optionsdetailed.cpp b/src/optionsdetailed.cpp
index bbefd90..0f3d1b6 100644
--- a/src/optionsdetailed.cpp
+++ b/src/optionsdetailed.cpp
@@ -278,7 +278,7 @@ void OptionsDetailed::encoderChanged( const QString& encoder )
if( !plugin )
{
// TODO leads to crashes
-// KMessageBox::error( this, i18n("Sorry, this shouldn't happen.\n\nPlease report this bug and attach the following error message:\n\nOptionsDetailed::encoderChanged; PluginLoader::codecPluginByName returned 0 for encoder: '%1'").arg(encoder), i18n("Internal error") );
+// KMessageBox::error( this, i18n("Sorry, this shouldn't happen.\n\nPlease report this bug and attach the following error message:\n\nOptionsDetailed::encoderChanged; PluginLoader::codecPluginByName returned 0 for encoder: '%1'",encoder), i18n("Internal error") );
return;
}
if( wPlugin )
@@ -319,7 +319,7 @@ void OptionsDetailed::somethingChanged()
{
const QString dataRateString = Global::prettyNumber(dataRate,"B");
lEstimSize->setText( QString(QChar(8776))+" "+dataRateString+" / min." );
- lEstimSize->setToolTip( i18n("Using the current conversion options will create files with approximately %1 per minute.").arg(dataRateString) );
+ lEstimSize->setToolTip( i18n("Using the current conversion options will create files with approximately %1 per minute.",dataRateString) );
}
else
{
diff --git a/src/optionseditor.cpp b/src/optionseditor.cpp
index 675cf8a..57e17db 100644
--- a/src/optionseditor.cpp
+++ b/src/optionseditor.cpp
@@ -468,7 +468,7 @@ void OptionsEditor::itemsSelected( QList<FileListItem*> items )
}
else // selectedItems.count() > 1
{
- setWindowTitle(i18n("%1 Files").arg(selectedItems.count()));
+ setWindowTitle(i18n("%1 Files",selectedItems.count()));
FileListItem *firstItem = selectedItems.first();
const int conversionOptionsId = firstItem->conversionOptionsId;
diff --git a/src/optionssimple.cpp b/src/optionssimple.cpp
index d3cc5f2..100bcef 100644
--- a/src/optionssimple.cpp
+++ b/src/optionssimple.cpp
@@ -231,7 +231,7 @@ void OptionsSimple::profileRemove()
{
const QString profileName = cProfile->currentText();
- const int ret = KMessageBox::questionYesNo( this, i18n("Do you really want to remove the profile: %1").arg(profileName), i18n("Remove profile?") );
+ const int ret = KMessageBox::questionYesNo( this, i18n("Do you really want to remove the profile: %1",profileName), i18n("Remove profile?") );
if( ret == KMessageBox::Yes )
{
QDomDocument list("soundkonverter_profilelist");
@@ -389,7 +389,7 @@ void OptionsSimple::currentDataRateChanged( int dataRate )
{
const QString dataRateString = Global::prettyNumber(dataRate,"B");
lEstimSize->setText( QString(QChar(8776))+" "+dataRateString+" / min." );
- lEstimSize->setToolTip( i18n("Using the current conversion options will create files with approximately %1 per minute.").arg(dataRateString) );
+ lEstimSize->setToolTip( i18n("Using the current conversion options will create files with approximately %1 per minute.",dataRateString) );
}
else
{
diff --git a/src/plugins/soundkonverter_codec_aften/CMakeLists.txt b/src/plugins/soundkonverter_codec_aften/CMakeLists.txt
index 2e2ce99..61b0ef2 100644
--- a/src/plugins/soundkonverter_codec_aften/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_aften/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_aften)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_aften_SRCS
soundkonverter_codec_aften.cpp
aftencodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_faac/CMakeLists.txt b/src/plugins/soundkonverter_codec_faac/CMakeLists.txt
index a628294..7245caa 100644
--- a/src/plugins/soundkonverter_codec_faac/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_faac/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_faac)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_faac_SRCS
soundkonverter_codec_faac.cpp
faaccodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_ffmpeg/CMakeLists.txt b/src/plugins/soundkonverter_codec_ffmpeg/CMakeLists.txt
index bbd18bc..954e0c3 100644
--- a/src/plugins/soundkonverter_codec_ffmpeg/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_ffmpeg/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_ffmpeg)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_ffmpeg_SRCS
soundkonverter_codec_ffmpeg.cpp
ffmpegcodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_ffmpeg/soundkonverter_codec_ffmpeg.cpp b/src/plugins/soundkonverter_codec_ffmpeg/soundkonverter_codec_ffmpeg.cpp
index 1859ffb..bca7493 100644
--- a/src/plugins/soundkonverter_codec_ffmpeg/soundkonverter_codec_ffmpeg.cpp
+++ b/src/plugins/soundkonverter_codec_ffmpeg/soundkonverter_codec_ffmpeg.cpp
@@ -273,7 +273,7 @@ void soundkonverter_codec_ffmpeg::showConfigDialog( ActionType action, const QSt
if( !configDialog.data() )
{
configDialog = new KDialog( parent );
- configDialog.data()->setCaption( i18n("Configure %1").arg(global_plugin_name) );
+ configDialog.data()->setCaption( i18n("Configure %1",*global_plugin_name) );
configDialog.data()->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Default );
QWidget *configDialogWidget = new QWidget( configDialog.data() );
diff --git a/src/plugins/soundkonverter_codec_flac/CMakeLists.txt b/src/plugins/soundkonverter_codec_flac/CMakeLists.txt
index e84dc5b..97bde6d 100644
--- a/src/plugins/soundkonverter_codec_flac/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_flac/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_flac)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_flac_SRCS
soundkonverter_codec_flac.cpp
flaccodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_flake/CMakeLists.txt b/src/plugins/soundkonverter_codec_flake/CMakeLists.txt
index 4aff83d..8a6ec6b 100644
--- a/src/plugins/soundkonverter_codec_flake/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_flake/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_flake)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_flake_SRCS
soundkonverter_codec_flake.cpp
flakecodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_fluidsynth/CMakeLists.txt b/src/plugins/soundkonverter_codec_fluidsynth/CMakeLists.txt
index ac99c00..99bbcf5 100644
--- a/src/plugins/soundkonverter_codec_fluidsynth/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_fluidsynth/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_fluidsynth)
-find_package(KF5 REQUIRED COMPONENTS KIO WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_fluidsynth_SRCS
soundkonverter_codec_fluidsynth.cpp
fluidsynthcodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_fluidsynth/soundkonverter_codec_fluidsynth.cpp b/src/plugins/soundkonverter_codec_fluidsynth/soundkonverter_codec_fluidsynth.cpp
index 2baf94f..7e7d3a0 100644
--- a/src/plugins/soundkonverter_codec_fluidsynth/soundkonverter_codec_fluidsynth.cpp
+++ b/src/plugins/soundkonverter_codec_fluidsynth/soundkonverter_codec_fluidsynth.cpp
@@ -82,7 +82,7 @@ void soundkonverter_codec_fluidsynth::showConfigDialog( ActionType action, const
const int fontHeight = QFontMetrics(QApplication::font()).boundingRect("M").size().height();
configDialog = new KDialog( parent );
- configDialog.data()->setCaption( i18n("Configure %1").arg(global_plugin_name) );
+ configDialog.data()->setCaption( i18n("Configure %1",*global_plugin_name) );
configDialog.data()->setButtons( KDialog::Ok | KDialog::Cancel );
QWidget *configDialogWidget = new QWidget( configDialog.data() );
diff --git a/src/plugins/soundkonverter_codec_lame/CMakeLists.txt b/src/plugins/soundkonverter_codec_lame/CMakeLists.txt
index e3c21b7..d3d7e28 100644
--- a/src/plugins/soundkonverter_codec_lame/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_lame/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_lame)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_lame_SRCS
soundkonverter_codec_lame.cpp
lameconversionoptions.cpp
diff --git a/src/plugins/soundkonverter_codec_lame/soundkonverter_codec_lame.cpp b/src/plugins/soundkonverter_codec_lame/soundkonverter_codec_lame.cpp
index b443030..f89a17d 100644
--- a/src/plugins/soundkonverter_codec_lame/soundkonverter_codec_lame.cpp
+++ b/src/plugins/soundkonverter_codec_lame/soundkonverter_codec_lame.cpp
@@ -110,7 +110,7 @@ void soundkonverter_codec_lame::showConfigDialog( ActionType action, const QStri
if( !configDialog.data() )
{
configDialog = new KDialog( parent );
- configDialog.data()->setCaption( i18n("Configure %1").arg(global_plugin_name) );
+ configDialog.data()->setCaption( i18n("Configure %1",*global_plugin_name) );
configDialog.data()->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Default );
QWidget *configDialogWidget = new QWidget( configDialog.data() );
@@ -165,7 +165,7 @@ bool soundkonverter_codec_lame::hasInfo()
void soundkonverter_codec_lame::showInfo( QWidget *parent )
{
KDialog *dialog = new KDialog( parent );
- dialog->setCaption( i18n("About %1").arg(global_plugin_name) );
+ dialog->setCaption( i18n("About %1",*global_plugin_name) );
dialog->setButtons( KDialog::Ok );
QLabel *widget = new QLabel( dialog );
diff --git a/src/plugins/soundkonverter_codec_libav/CMakeLists.txt b/src/plugins/soundkonverter_codec_libav/CMakeLists.txt
index 65d793f..a9ccfec 100644
--- a/src/plugins/soundkonverter_codec_libav/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_libav/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_libav)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_libav_SRCS
soundkonverter_codec_libav.cpp
libavcodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_libav/soundkonverter_codec_libav.cpp b/src/plugins/soundkonverter_codec_libav/soundkonverter_codec_libav.cpp
index 46ad3fd..67a5ed9 100644
--- a/src/plugins/soundkonverter_codec_libav/soundkonverter_codec_libav.cpp
+++ b/src/plugins/soundkonverter_codec_libav/soundkonverter_codec_libav.cpp
@@ -365,7 +365,7 @@ void soundkonverter_codec_libav::showConfigDialog( ActionType action, const QStr
if( !configDialog.data() )
{
configDialog = new KDialog( parent );
- configDialog.data()->setCaption( i18n("Configure %1").arg(global_plugin_name) );
+ configDialog.data()->setCaption( i18n("Configure %1",*global_plugin_name) );
configDialog.data()->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Default );
QWidget *configDialogWidget = new QWidget( configDialog.data() );
diff --git a/src/plugins/soundkonverter_codec_mac/CMakeLists.txt b/src/plugins/soundkonverter_codec_mac/CMakeLists.txt
index 9c5f2d8..755b1e6 100644
--- a/src/plugins/soundkonverter_codec_mac/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_mac/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_mac)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_mac_SRCS
soundkonverter_codec_mac.cpp
maccodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_mplayer/CMakeLists.txt b/src/plugins/soundkonverter_codec_mplayer/CMakeLists.txt
index 3dfbe42..144ebc4 100644
--- a/src/plugins/soundkonverter_codec_mplayer/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_mplayer/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_mplayer)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_mplayer_SRCS
soundkonverter_codec_mplayer.cpp
)
diff --git a/src/plugins/soundkonverter_codec_musepack/CMakeLists.txt b/src/plugins/soundkonverter_codec_musepack/CMakeLists.txt
index 4f4f189..1a64bb7 100644
--- a/src/plugins/soundkonverter_codec_musepack/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_musepack/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_musepack)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_musepack_SRCS
soundkonverter_codec_musepack.cpp
musepackcodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_neroaac/CMakeLists.txt b/src/plugins/soundkonverter_codec_neroaac/CMakeLists.txt
index edaccbb..73e0296 100644
--- a/src/plugins/soundkonverter_codec_neroaac/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_neroaac/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_neroaac)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_neroaac_SRCS
soundkonverter_codec_neroaac.cpp
neroaaccodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_opustools/CMakeLists.txt b/src/plugins/soundkonverter_codec_opustools/CMakeLists.txt
index 6965b3b..64aea17 100644
--- a/src/plugins/soundkonverter_codec_opustools/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_opustools/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_opustools)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_opustools_SRCS
soundkonverter_codec_opustools.cpp
opustoolscodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_opustools/soundkonverter_codec_opustools.cpp b/src/plugins/soundkonverter_codec_opustools/soundkonverter_codec_opustools.cpp
index 6834edd..f519045 100644
--- a/src/plugins/soundkonverter_codec_opustools/soundkonverter_codec_opustools.cpp
+++ b/src/plugins/soundkonverter_codec_opustools/soundkonverter_codec_opustools.cpp
@@ -80,7 +80,7 @@ void soundkonverter_codec_opustools::showConfigDialog( ActionType action, const
if( !configDialog.data() )
{
configDialog = new KDialog( parent );
- configDialog.data()->setCaption( i18n("Configure %1").arg(global_plugin_name) );
+ configDialog.data()->setCaption( i18n("Configure %1",*global_plugin_name) );
configDialog.data()->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Default );
QWidget *configDialogWidget = new QWidget( configDialog.data() );
diff --git a/src/plugins/soundkonverter_codec_shorten/CMakeLists.txt b/src/plugins/soundkonverter_codec_shorten/CMakeLists.txt
index 74363c7..39c8740 100644
--- a/src/plugins/soundkonverter_codec_shorten/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_shorten/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_shorten)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_shorten_SRCS
soundkonverter_codec_shorten.cpp
shortencodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_speex/CMakeLists.txt b/src/plugins/soundkonverter_codec_speex/CMakeLists.txt
index 4af89c9..f53e447 100644
--- a/src/plugins/soundkonverter_codec_speex/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_speex/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_speex)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_speex_SRCS
soundkonverter_codec_speex.cpp
speexcodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_timidity/CMakeLists.txt b/src/plugins/soundkonverter_codec_timidity/CMakeLists.txt
index 28d26e6..bf153f4 100644
--- a/src/plugins/soundkonverter_codec_timidity/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_timidity/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_timidity)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_timidity_SRCS
soundkonverter_codec_timidity.cpp
timiditycodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_ttaenc/CMakeLists.txt b/src/plugins/soundkonverter_codec_ttaenc/CMakeLists.txt
index 1cb8a46..9fa1f6e 100644
--- a/src/plugins/soundkonverter_codec_ttaenc/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_ttaenc/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_ttaenc)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_ttaenc_SRCS
soundkonverter_codec_ttaenc.cpp
ttaenccodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_twolame/CMakeLists.txt b/src/plugins/soundkonverter_codec_twolame/CMakeLists.txt
index 4a6e972..929b1f6 100644
--- a/src/plugins/soundkonverter_codec_twolame/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_twolame/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_twolame)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_twolame_SRCS
soundkonverter_codec_twolame.cpp
twolamecodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_twolame/soundkonverter_codec_twolame.cpp b/src/plugins/soundkonverter_codec_twolame/soundkonverter_codec_twolame.cpp
index 56bf1ce..83418e9 100644
--- a/src/plugins/soundkonverter_codec_twolame/soundkonverter_codec_twolame.cpp
+++ b/src/plugins/soundkonverter_codec_twolame/soundkonverter_codec_twolame.cpp
@@ -66,7 +66,7 @@ void soundkonverter_codec_twolame::showConfigDialog( ActionType action, const QS
Q_UNUSED(parent)
// KDialog *dialog = new KDialog( parent );
-// dialog->setCaption( i18n("Configure %1").arg(global_plugin_name) );
+// dialog->setCaption( i18n("Configure %1",*global_plugin_name) );
// dialog->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Apply );
// QWidget *widget = new QWidget( dialog );
@@ -89,7 +89,7 @@ bool soundkonverter_codec_twolame::hasInfo()
void soundkonverter_codec_twolame::showInfo( QWidget *parent )
{
KDialog *dialog = new KDialog( parent );
- dialog->setCaption( i18n("About %1").arg(global_plugin_name) );
+ dialog->setCaption( i18n("About %1",*global_plugin_name) );
dialog->setButtons( KDialog::Ok );
QLabel *widget = new QLabel( dialog );
diff --git a/src/plugins/soundkonverter_codec_vorbistools/CMakeLists.txt b/src/plugins/soundkonverter_codec_vorbistools/CMakeLists.txt
index 71d0868..42a2830 100644
--- a/src/plugins/soundkonverter_codec_vorbistools/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_vorbistools/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_vorbistools)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_vorbistools_SRCS
soundkonverter_codec_vorbistools.cpp
vorbistoolscodecwidget.cpp
diff --git a/src/plugins/soundkonverter_codec_wavpack/CMakeLists.txt b/src/plugins/soundkonverter_codec_wavpack/CMakeLists.txt
index d9758c8..f2fc7ae 100644
--- a/src/plugins/soundkonverter_codec_wavpack/CMakeLists.txt
+++ b/src/plugins/soundkonverter_codec_wavpack/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_codec_wavpack)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_codec_wavpack_SRCS
soundkonverter_codec_wavpack.cpp
wavpackcodecwidget.cpp
diff --git a/src/plugins/soundkonverter_filter_normalize/CMakeLists.txt b/src/plugins/soundkonverter_filter_normalize/CMakeLists.txt
index 7244d80..a8ade01 100644
--- a/src/plugins/soundkonverter_filter_normalize/CMakeLists.txt
+++ b/src/plugins/soundkonverter_filter_normalize/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_filter_normalize)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_filter_normalize_SRCS
soundkonverter_filter_normalize.cpp
normalizefilteroptions.cpp
diff --git a/src/plugins/soundkonverter_filter_sox/CMakeLists.txt b/src/plugins/soundkonverter_filter_sox/CMakeLists.txt
index 5846951..00b7cb2 100644
--- a/src/plugins/soundkonverter_filter_sox/CMakeLists.txt
+++ b/src/plugins/soundkonverter_filter_sox/CMakeLists.txt
@@ -1,8 +1,5 @@
project(soundkonverter_filter_sox)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-find_package(Qt5 REQUIRED COMPONENTS Xml)
-
set(soundkonverter_filter_sox_SRCS
soundkonverter_filter_sox.cpp
soxfilteroptions.cpp
diff --git a/src/plugins/soundkonverter_filter_sox/soundkonverter_filter_sox.cpp b/src/plugins/soundkonverter_filter_sox/soundkonverter_filter_sox.cpp
index d0b87ef..07670b6 100644
--- a/src/plugins/soundkonverter_filter_sox/soundkonverter_filter_sox.cpp
+++ b/src/plugins/soundkonverter_filter_sox/soundkonverter_filter_sox.cpp
@@ -239,7 +239,7 @@ void soundkonverter_filter_sox::showConfigDialog( ActionType action, const QStri
if( !configDialog.data() )
{
configDialog = new KDialog( parent );
- configDialog.data()->setCaption( i18n("Configure %1").arg(global_plugin_name) );
+ configDialog.data()->setCaption( i18n("Configure %1",*global_plugin_name) );
configDialog.data()->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Default );
QWidget *configDialogWidget = new QWidget( configDialog.data() );
diff --git a/src/plugins/soundkonverter_replaygain_aacgain/CMakeLists.txt b/src/plugins/soundkonverter_replaygain_aacgain/CMakeLists.txt
index 4893b2a..cac7c4c 100644
--- a/src/plugins/soundkonverter_replaygain_aacgain/CMakeLists.txt
+++ b/src/plugins/soundkonverter_replaygain_aacgain/CMakeLists.txt
@@ -1,7 +1,5 @@
project(soundkonverter_replaygain_aacgain)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-
set(soundkonverter_replaygain_aacgain_SRCS
soundkonverter_replaygain_aacgain.cpp
)
diff --git a/src/plugins/soundkonverter_replaygain_aacgain/soundkonverter_replaygain_aacgain.cpp b/src/plugins/soundkonverter_replaygain_aacgain/soundkonverter_replaygain_aacgain.cpp
index 61711b9..0d26c5d 100644
--- a/src/plugins/soundkonverter_replaygain_aacgain/soundkonverter_replaygain_aacgain.cpp
+++ b/src/plugins/soundkonverter_replaygain_aacgain/soundkonverter_replaygain_aacgain.cpp
@@ -86,7 +86,7 @@ void soundkonverter_replaygain_aacgain::showConfigDialog( ActionType action, con
if( !configDialog.data() )
{
configDialog = new KDialog( parent );
- configDialog.data()->setCaption( i18n("Configure %1").arg(global_plugin_name) );
+ configDialog.data()->setCaption( i18n("Configure %1",*global_plugin_name) );
configDialog.data()->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Default );
QWidget *configDialogWidget = new QWidget( configDialog.data() );
diff --git a/src/plugins/soundkonverter_replaygain_metaflac/CMakeLists.txt b/src/plugins/soundkonverter_replaygain_metaflac/CMakeLists.txt
index 54fa136..9f3accb 100644
--- a/src/plugins/soundkonverter_replaygain_metaflac/CMakeLists.txt
+++ b/src/plugins/soundkonverter_replaygain_metaflac/CMakeLists.txt
@@ -1,7 +1,5 @@
project(soundkonverter_replaygain_metaflac)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-
set(soundkonverter_replaygain_metaflac_SRCS
soundkonverter_replaygain_metaflac.cpp
)
diff --git a/src/plugins/soundkonverter_replaygain_mp3gain/CMakeLists.txt b/src/plugins/soundkonverter_replaygain_mp3gain/CMakeLists.txt
index b706d88..65fda3e 100644
--- a/src/plugins/soundkonverter_replaygain_mp3gain/CMakeLists.txt
+++ b/src/plugins/soundkonverter_replaygain_mp3gain/CMakeLists.txt
@@ -1,7 +1,5 @@
project(soundkonverter_replaygain_mp3gain)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-
set(soundkonverter_replaygain_mp3gain_SRCS
soundkonverter_replaygain_mp3gain.cpp
)
diff --git a/src/plugins/soundkonverter_replaygain_mp3gain/soundkonverter_replaygain_mp3gain.cpp b/src/plugins/soundkonverter_replaygain_mp3gain/soundkonverter_replaygain_mp3gain.cpp
index 0588ccb..7039cd3 100644
--- a/src/plugins/soundkonverter_replaygain_mp3gain/soundkonverter_replaygain_mp3gain.cpp
+++ b/src/plugins/soundkonverter_replaygain_mp3gain/soundkonverter_replaygain_mp3gain.cpp
@@ -79,7 +79,7 @@ void soundkonverter_replaygain_mp3gain::showConfigDialog( ActionType action, con
if( !configDialog.data() )
{
configDialog = new KDialog( parent );
- configDialog.data()->setCaption( i18n("Configure %1").arg(global_plugin_name) );
+ configDialog.data()->setCaption( i18n("Configure %1",*global_plugin_name) );
configDialog.data()->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Default );
QWidget *configDialogWidget = new QWidget( configDialog.data() );
diff --git a/src/plugins/soundkonverter_replaygain_musepack/CMakeLists.txt b/src/plugins/soundkonverter_replaygain_musepack/CMakeLists.txt
index 8f74959..a0be491 100644
--- a/src/plugins/soundkonverter_replaygain_musepack/CMakeLists.txt
+++ b/src/plugins/soundkonverter_replaygain_musepack/CMakeLists.txt
@@ -1,7 +1,5 @@
project(soundkonverter_replaygain_musepackgain)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-
set(soundkonverter_replaygain_musepackgain_SRCS
soundkonverter_replaygain_musepackgain.cpp
)
diff --git a/src/plugins/soundkonverter_replaygain_vorbisgain/CMakeLists.txt b/src/plugins/soundkonverter_replaygain_vorbisgain/CMakeLists.txt
index 1520c80..45b28c2 100644
--- a/src/plugins/soundkonverter_replaygain_vorbisgain/CMakeLists.txt
+++ b/src/plugins/soundkonverter_replaygain_vorbisgain/CMakeLists.txt
@@ -1,7 +1,5 @@
project(soundkonverter_replaygain_vorbisgain)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-
set(soundkonverter_replaygain_vorbisgain_SRCS
soundkonverter_replaygain_vorbisgain.cpp
)
diff --git a/src/plugins/soundkonverter_replaygain_wvgain/CMakeLists.txt b/src/plugins/soundkonverter_replaygain_wvgain/CMakeLists.txt
index 0029db4..45e0490 100644
--- a/src/plugins/soundkonverter_replaygain_wvgain/CMakeLists.txt
+++ b/src/plugins/soundkonverter_replaygain_wvgain/CMakeLists.txt
@@ -1,7 +1,5 @@
project(soundkonverter_replaygain_wvgain)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-
set(soundkonverter_replaygain_wvgain_SRCS
soundkonverter_replaygain_wvgain.cpp
)
diff --git a/src/plugins/soundkonverter_ripper_cdparanoia/CMakeLists.txt b/src/plugins/soundkonverter_ripper_cdparanoia/CMakeLists.txt
index efce774..8a94910 100644
--- a/src/plugins/soundkonverter_ripper_cdparanoia/CMakeLists.txt
+++ b/src/plugins/soundkonverter_ripper_cdparanoia/CMakeLists.txt
@@ -1,7 +1,5 @@
project(soundkonverter_ripper_cdparanoia)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-
set(soundkonverter_ripper_cdparanoia_SRCS
soundkonverter_ripper_cdparanoia.cpp
)
diff --git a/src/plugins/soundkonverter_ripper_cdparanoia/soundkonverter_ripper_cdparanoia.cpp b/src/plugins/soundkonverter_ripper_cdparanoia/soundkonverter_ripper_cdparanoia.cpp
index 762fb44..cec5484 100644
--- a/src/plugins/soundkonverter_ripper_cdparanoia/soundkonverter_ripper_cdparanoia.cpp
+++ b/src/plugins/soundkonverter_ripper_cdparanoia/soundkonverter_ripper_cdparanoia.cpp
@@ -79,7 +79,7 @@ void soundkonverter_ripper_cdparanoia::showConfigDialog( ActionType action, cons
if( !configDialog.data() )
{
configDialog = new KDialog( parent );
- configDialog.data()->setCaption( i18n("Configure %1").arg(global_plugin_name) );
+ configDialog.data()->setCaption( i18n("Configure %1",*global_plugin_name) );
configDialog.data()->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Default );
QWidget *configDialogWidget = new QWidget( configDialog.data() );
diff --git a/src/plugins/soundkonverter_ripper_icedax/CMakeLists.txt b/src/plugins/soundkonverter_ripper_icedax/CMakeLists.txt
index 3dbeb82..d30952c 100644
--- a/src/plugins/soundkonverter_ripper_icedax/CMakeLists.txt
+++ b/src/plugins/soundkonverter_ripper_icedax/CMakeLists.txt
@@ -1,7 +1,5 @@
project(soundkonverter_ripper_icedax)
-find_package(KF5 REQUIRED COMPONENTS WidgetsAddons)
-
set(soundkonverter_ripper_icedax_SRCS
soundkonverter_ripper_icedax.cpp
)
diff --git a/src/po/es.po b/src/po/es.po
index d62346e..f0d0c62 100644
--- a/src/po/es.po
+++ b/src/po/es.po
@@ -22,19 +22,19 @@ msgstr ""
#: aboutplugins.cpp:20
msgid "About plugins"
-msgstr "Sobre los plugins"
+msgstr "Acerca de los enchufes"
#: aboutplugins.cpp:34
msgid "Installed plugins:"
-msgstr "Plugins instalados:"
+msgstr "Enchufes instalados:"
#: aboutplugins.cpp:131
msgid "About plugin %1:"
-msgstr "Sobre el plugin %1:"
+msgstr "Acerca de enchufes %1:"
#: aboutplugins.cpp:133
msgid "Plugin type: %1"
-msgstr "Tipo de plugin: %1"
+msgstr "Tipo de enchufes: %1"
#: aboutplugins.cpp:139
msgid "Backend binaries:"
@@ -50,7 +50,7 @@ msgstr "%1 (no encontrado)"
#: aboutplugins.cpp:167 aboutplugins.cpp:202 aboutplugins.cpp:233
msgid "Supported codecs:"
-msgstr "Codecs soportados:"
+msgstr "códecs soportados:"
#: aboutplugins.cpp:172 aboutplugins.cpp:180 aboutplugins.cpp:207
#: aboutplugins.cpp:215 aboutplugins.cpp:230
@@ -73,37 +73,35 @@ msgstr "Configurar %1 ..."
#: codecoptimizations.cpp:17 codecproblems.cpp:14
msgid "Solutions for backend problems"
-msgstr "Soluciones para problemas de binarios externos"
+msgstr "Soluciones para los problemas de binario"
#: codecoptimizations.cpp:27
msgid ""
"You have installed or removed backends and your soundKonverter settings can "
"be optimized."
msgstr ""
-"Ha instalado o eliminado binarios externos y sus configuraciones de "
-"soundKonverter pueden ser optimizadas."
+"Ha instalado o eliminado binarios y sus configuraciones de soundKonverter pueden "
+"ser optimizadas."
#: codecoptimizations.cpp:51
msgid "For encoding %1 files the backend '%2' can be replaced with '%3'."
-msgstr ""
-"Para codificar archivos %1, el binario '%2' puede ser reemplazado con .'%3'"
+msgstr "Para codificar archivos %1, el binario '%2' puede ser reemplazado con '%3'."
#: codecoptimizations.cpp:55
msgid "For ripping audio CDs the backend '%1' can be replaced with '%2'."
-msgstr ""
+msgstr "Para extraer CD de audio, el binario '%1' puede ser reemplazado por '%2'."
#: codecoptimizations.cpp:59
msgid "For decoding %1 files the backend '%2' can be replaced with '%3'."
-msgstr ""
-"Para decodificar archivos %1, el binario '%2' puede ser reemplazado por '%3'."
+msgstr "Para decodificar archivos %1 el binario '%2' puede ser reemplazado por '%3'."
#: codecoptimizations.cpp:63
msgid ""
"For applying Replay Gain to %1 files the backend '%2' can be replaced with "
"'%3'."
msgstr ""
-"Para aplicar Replay Gain en los archiivos %1, el binario '%2' puede ser "
-"reemplazado por '%3'."
+"Para aplicar Replay Gain en los archivos %1 el binario '%2' puede ser reemplazado con "
+"'%3'."
#: codecoptimizations.cpp:66
msgid "Ignore"
@@ -119,33 +117,33 @@ msgid ""
"If you are missing some file formats you might need to install an additional "
"plugin via the package manager of your distribution."
msgstr ""
-"soundKonverter no pudo encontrar los paquetes que faltan.⏎ Si le falta algún "
-"formato archivo, deberá instalar un plugin adicional con el administrador de "
-"paquetes de su distribución."
+"soundKonverter no pudo encontrar los paquetes que faltan.\n"
+"Si le falta algún archivo de formatos, deberá instalar un enchufe adicional "
+"con el administrador de paquetes de su distribución."
#: codecproblems.cpp:32
msgid ""
"Some of the installed plugins aren't working.\n"
"Possible solutions are listed below."
msgstr ""
-"Algún de los plugins instalados no está funcionando.⏎ Las posibles "
-"soluciones se listan debajo."
+"Algúnos de los enchufes instalados no están funcionando.\n"
+"Las posibles soluciones se listan abajo."
#: codecproblems.cpp:37
msgid ""
"Some files can't be decoded.\n"
"Possible solutions are listed below."
msgstr ""
-"Algunos archivos no se pueden codificar.⏎ Las posibles soluciones se listan "
-"debajo."
+"Algunos archivos no pueden ser decodificados.\n"
+"Las posibles soluciones se listan abajo."
#: codecproblems.cpp:41
msgid ""
"Replay Gain isn't supported for some files.\n"
"Possible solutions are listed below."
msgstr ""
-"Replay Gain no está soportado por algunos archivos.⏎ Las posibles soluciones "
-"se listan debajo."
+"Replay Gain no está soportado por algunos archivos.\n"
+"Las posibles soluciones se listan abajo."
#: codecproblems.cpp:47
msgid ""
@@ -153,17 +151,17 @@ msgid ""
"Please have a look at your distributions package manager in order to get a "
"cd ripper plugin for soundKonverter."
msgstr ""
-"La extracción de CDs no está soportada por ninguno de los plugins instalados."
-"⏎ Consulte en el administrador de paquetes de su distribución para poder "
-"extraer CDs con soundKonverter."
+"La extracción de CDs no está soportada por ninguno de los enchufes instalados.\n"
+"Consulte en el administrador de paquetes de su distribución para poder "
+"extraer CDs con enchufes de soundKonverter."
#: codecproblems.cpp:51
msgid ""
"Ripping audio CDs is currently not supported because of missing backends.\n"
"Possible solutions are listed below."
msgstr ""
-"La extracción de CDs no está soportada porque faltan los binarios para ello."
-"⏎ Las posibles soluciones se listan debajo."
+"La extracción de CDs no está soportada porque faltan los binarios.\n"
+"Las posibles soluciones se listan abajo."
#: codecproblems.cpp:67 codecproblems.cpp:71
msgid "Possible solutions for %1"
@@ -235,7 +233,7 @@ msgstr "cubierta"
#: config.cpp:234 config.cpp:260 config.cpp:262 convert.cpp:172 convert.cpp:244
#: convert.cpp:411
msgid "Try internal"
-msgstr "Interna"
+msgstr "Probar interno"
#: config.cpp:386 config.cpp:402 configdialog/configgeneralpage.cpp:72
#: configdialog/configgeneralpage.cpp:270 optionsdetailed.cpp:469
@@ -433,7 +431,7 @@ msgstr "Híbrido"
#: plugins/soundkonverter_codec_vorbistools/vorbistoolscodecwidget.cpp:170
#: plugins/soundkonverter_filter_sox/soxcodecwidget.cpp:455
msgid "User defined"
-msgstr "Definido por el usuario"
+msgstr "Definido por usuario"
#: config.cpp:579
msgid "Convert with soundKonverter"
@@ -463,10 +461,14 @@ msgid ""
"Comments will be written to the selected field, when reading tags the "
"selected field will be preferred."
msgstr ""
+"Algunas aplicaciones usan el campo DESCRIPCIÓN aunque el campo COMENTARIO es "
+"el correcto.\n"
+"Comments will be written to the selected field, when reading tags the "
+"selected field will be preferred."
#: configdialog/configadvancedpage.cpp:79
msgid "Preferred total tracks number tag field for ogg vorbis and flac files:"
-msgstr ""
+msgstr "Número preferido de pistas totales y campo de etiquetas para ogg vorbis y archivos flac:"
#: configdialog/configadvancedpage.cpp:80
#: configdialog/configadvancedpage.cpp:83
@@ -476,10 +478,14 @@ msgid ""
"When using the field TRACKNUMBER, the track number and the total tracks "
"number will be written to the same field separated by a slash ('/')."
msgstr ""
+"El número total de pistas se escribirán en el campo seleccionado al leer las etiquetas"
+"el campo seleccionado será preferido.\n"
+"Cuando se utiliza el campo NÚMERO DE PISTA, el número de pista y el total de pistas"
+"el número se escribirá en el mismo campo separado por una diagonal ('/')."
#: configdialog/configadvancedpage.cpp:98
msgid "Preferred total discs number tag field for ogg vorbis and flac files:"
-msgstr ""
+msgstr "Campo de etiqueta del número total de discos preferidos para ogg vorbis y archivos flac:"
#: configdialog/configadvancedpage.cpp:99
#: configdialog/configadvancedpage.cpp:102
@@ -489,6 +495,10 @@ msgid ""
"When using the field DISCNUMBER, the disc number and the total discs number "
"will be written to the same field separated by a slash ('/')."
msgstr ""
+"El número total de discos se escribirán en el campo seleccionado al leer las etiquetas "
+"el campo seleccionado será preferido.\n"
+"Cuando se usa el campo NÚMERO DE DISCO, el número de disco y el número total de discos "
+"se escribirán en el mismo campo separado por una diagonal ('/')."
#: configdialog/configadvancedpage.cpp:117
msgid "Always use FAT compatible output file names"
@@ -500,13 +510,13 @@ msgid ""
"If the output directory is on a FAT file system FAT compatible file names "
"will automatically be used independently from this option."
msgstr ""
-"Reemplazar algunos caracteres especiales como '?' por '_'.⏎ Si el directorio "
-"de salida está en un sistema de archivo FAT, se usarán nombres de archivos "
-"compatibles con FAT automáticamente independientemente de esta opción."
+"Reemplazar algunos caracteres especiales como '?' por '_'.\n"
+"Si el directorio de salida está en un sistema de archivo FAT, compatible a nombres de archivos "
+"podria se usado automáticamente independientemente de esta opción."
#: configdialog/configadvancedpage.cpp:128
msgid "Eject CD after ripping has been completed"
-msgstr ""
+msgstr "Expulsar CD después de terminar la extracción"
#: configdialog/configadvancedpage.cpp:135
msgid "Debug"
@@ -523,9 +533,10 @@ msgid ""
"the log viewer.\n"
"Log files will be written to %1"
msgstr ""
-"Escribir registros al disco rígido mientras se convierte.⏎ Ésto puede ser "
-"útil si ocurre una falla y no puede acceder al registro usando un visor de "
-"registro.⏎ Los registros se escribirán en %1"
+"Escribir registros al disco rígido mientras se convierte.\n"
+"Ésto puede ser útil si ocurre una falla y no puede acceder al archivo de registro usando "
+"el visor de registros.\n"
+"Archivos de registro se escribirán en %1"
#: configdialog/configadvancedpage.cpp:152
msgid "Experimental"
@@ -533,9 +544,7 @@ msgstr "Experimental"
#: configdialog/configadvancedpage.cpp:161
msgid "Store temporary files in memory unless the estimated size is more than:"
-msgstr ""
-"Guardar archivos temporarios en memoria a menos que el tamaño estimado sea "
-"más que:"
+msgstr "Guardar archivos temporarios en memoria a menos que el tamaño estimado sea más que:"
#: configdialog/configadvancedpage.cpp:162
#: configdialog/configadvancedpage.cpp:166
@@ -543,8 +552,8 @@ msgid ""
"Don't store files that are expected to be bigger than this value in memory "
"to avoid swapping"
msgstr ""
-"No almacenar los archivos que sean mayores que este valor en memoria para "
-"evitar swapping."
+"No almacenar los archivos que sean mayores que este valor en memoria "
+"para evitar intercambios"
#: configdialog/configadvancedpage.cpp:167
msgctxt "mega in bytes"
@@ -565,9 +574,9 @@ msgid ""
"performance.\n"
"But some backends cause errors in this mode so be cautious."
msgstr ""
-"Las tuberías son necesarias cuando se usan archivos temporales, mejorando el "
-"rendimiento.⏎ Pero algunos binarios causan errores cuando se usa este modo, "
-"por lo tanto debe ser cuidadoso."
+"Las tuberías son innecesarias cuando se usan archivos temporales, mejorando el "
+"rendimiento.\n"
+"Pero algunos binarios causan errores cuando se usa este modo por lo tanto ser cuidadoso."
#: configdialog/configbackendspage.cpp:136
#: configdialog/configbackendspage.cpp:197
@@ -606,7 +615,7 @@ msgstr "Extractor de CD"
#: configdialog/configbackendspage.cpp:241
msgid "Use plugin:"
-msgstr "Usar plugin:"
+msgstr "Usar enchufe:"
#: configdialog/configbackendspage.cpp:265
msgid "Filters"
@@ -614,7 +623,7 @@ msgstr "Filtros"
#: configdialog/configbackendspage.cpp:281
msgid "Enable plugins:"
-msgstr "Habilitar plugins:"
+msgstr "Habilitar enchufes:"
#: configdialog/configbackendspage.cpp:320
msgid "Priorities"
@@ -622,7 +631,7 @@ msgstr "Prioridades"
#: configdialog/configbackendspage.cpp:332
msgid "Configure plugin priorities for format:"
-msgstr "Configurar prioridades de plugin para el formato:"
+msgstr "Configurar prioridades de enchufe para el formato:"
#: configdialog/configbackendspage.cpp:359
msgid "Show possible optimizations"
@@ -634,7 +643,7 @@ msgid ""
"Do you want to save them?"
msgstr ""
"Ha modificado las configuraciones actuales.\n"
-"¿Desea guardarlas?"
+"Desea guardarlas?"
#: configdialog/configbackendspage.cpp:399
msgid "Settings changed"
@@ -647,10 +656,14 @@ msgid ""
"\n"
"Do you want to continue?"
msgstr ""
+"Esto elegirá los mejores binarios para todos los formatos y guardará las nuevas"
+"preferencias inmediatamente.\n"
+"\n"
+"Quieres continuar?"
#: configdialog/configbackendspage.cpp:607
msgid "All backend settings seem to be optimal, there is nothing to do."
-msgstr "Todos los binarios parecen estar bien, no hay nada que hacer."
+msgstr "Todos los ajustes de los binarios parecen estar bien, no hay nada que hacer."
#: configdialog/configcoverartpage.cpp:24
msgid "Saving covers to output directory"
@@ -666,7 +679,7 @@ msgstr "Siempre"
#: configdialog/configcoverartpage.cpp:40
msgid "Only if embedding the covers into the output files is not possible"
-msgstr "Sólo embeber las cubiertas si no es posible"
+msgstr "Solo si no es posible embeber las cubiertas en los archivos de salida"
#: configdialog/configcoverartpage.cpp:42
msgid "Never"
@@ -675,8 +688,7 @@ msgstr "Nunca"
#: configdialog/configcoverartpage.cpp:62
msgid "File name for the cover (when saving to output directory)"
msgstr ""
-"Nombre de archivo para la cubierta (cuando se guarda en el directorio de "
-"salida)"
+"Nombre de archivo para la cubierta (cuando se guarda en el directorio de salida)"
#: configdialog/configcoverartpage.cpp:64
msgid "The embedded cover description"
@@ -700,13 +712,17 @@ msgid ""
"%d - Cover description\n"
"%r - Cover role"
msgstr ""
-"Las siguientes líneas son comodines para ser reemplazados por la información "
-"en los metadatos:⏎ ⏎ %a - Artista ⏎ %b - Álbum %d - Descripción de "
-"cubierta ⏎ %r - Tipo de cubierta"
+"Las siguientes cadenas son comodines que ser reemplazados\n"
+"por la información en los metadatos:\n"
+"\n"
+"%a - Artista\n"
+"%b - Álbum\n"
+"%d - Descripción de cubierta\n"
+"%r - Papel de portada"
#: configdialog/configdialog.cpp:29
msgid "Settings"
-msgstr "Configuraciones"
+msgstr "Ajustes"
#: configdialog/configdialog.cpp:42
msgid "General"
@@ -776,8 +792,9 @@ msgid ""
"cores.\n"
"There have been %1 processor cores detected."
msgstr ""
-"Este número no debería ser mayor que la cantidad de núcleos de procesador "
-"disponibles.⏎ Se detectaron %1 núcleos de procesador."
+"Este número no debería ser mayor a la cantidad de núcleos del "
+"procesador.\n"
+"Se detectaron %1 núcleos de procesador."
#: configdialog/configgeneralpage.cpp:150
msgid "Apply album gain to converted files"
@@ -788,18 +805,20 @@ msgid ""
"Keep songs of the same album waiting in file list in order to apply album "
"gain to all files."
msgstr ""
-"Mantener las canciones del mismo álbum esperando en la lista de archivos "
-"para poder aplicarle ganancia de álbum a todas ellas."
+"Mantener las canciones del mismo álbum esperando en la lista de archivos para poder aplicar al álbum "
+"de ganancia a todos los archivos."
#: configdialog/configgeneralpage.cpp:161
msgid "Copy files instead of converting to the same file format"
-msgstr ""
+msgstr "Copiar archivos en lugar de convertirlos al mismo formato de archivo"
#: configdialog/configgeneralpage.cpp:162
msgid ""
"If the input and the output file format are the same, copy the files instead "
"of re-encoding them."
msgstr ""
+"Si la entrada y el formato del archivo de salida son iguales, copiar los archivos en lugar "
+"de volver a codificarlos."
#: configdialog/configgeneralpage.cpp:169
#: replaygainscanner/replaygainscanner.cpp:34
@@ -809,7 +828,7 @@ msgstr "Herramienta Replay Gain"
#: configdialog/configgeneralpage.cpp:178
msgid "Group files in the Replay Gain tool by:"
-msgstr "Agrupar archivos en la herramienta Replay Gain por:"
+msgstr "Grupo de archivos en la herramienta Replay Gain por:"
#: configdialog/configgeneralpage.cpp:181
msgctxt "Group files in the Replay Gain tool by"
@@ -828,7 +847,7 @@ msgstr "Sólo directorios"
#: configdialog/configgeneralpage.cpp:193
msgid "Number of items to process at once:"
-msgstr "Número de ítems a procesar a la vez:"
+msgstr "Número de elementos a procesar a la vez:"
#: convert.cpp:68 convert.cpp:1450
msgid "Getting file"
@@ -840,11 +859,11 @@ msgstr "Copiando \"%1\" a \"%2\""
#: convert.cpp:103 convert.cpp:1138
msgid "File is encrypted, conversion not possible"
-msgstr ""
+msgstr "El archivo está encriptado, la conversión no es posible"
#: convert.cpp:121
msgid "Cannot create output directory \"%1\""
-msgstr ""
+msgstr "No se puede crear el directorio de salida \"% 1 \""
#: convert.cpp:144 convert.cpp:478 convert.cpp:495
#: replaygainscanner/replaygainprocessor.cpp:64
@@ -862,20 +881,20 @@ msgid ""
"Conversion failed. At least one of the used backends needs to be configured "
"properly."
msgstr ""
-"Falló la conversión. Al menos uno de los binarios utilizados debe "
-"configurarse apropiadamente."
+"Falló la conversión. Al menos uno de los binarios utilizados debe configurarse "
+"apropiadamente."
#: convert.cpp:202 convert.cpp:441 convert.cpp:558
msgid ""
"Conversion failed. The preferred plugin lacks support for a necessary "
"feature."
msgstr ""
-"Falló conversión. El plugin preferido carece de soporte para la "
-"característica necesitada."
+"Falló la conversión. El enchufe preferido carece de soporte para la característica "
+"necesitada."
#: convert.cpp:208 convert.cpp:447 convert.cpp:564
msgid "Conversion failed. Unknown Error."
-msgstr "Falló conversión. Error desconocido."
+msgstr "Falló la conversión. Error desconocido."
#: convert.cpp:369 convert.cpp:1462 filelist.cpp:577
msgid "Ripping"
@@ -903,7 +922,7 @@ msgstr "Aplicando Replay Gain"
#: convert.cpp:531 replaygainscanner/replaygainprocessor.cpp:89
msgid "Waiting for running Vorbis Gain process to finish"
-msgstr ""
+msgstr "Esperando correr el proceso Vorbis Gain para terminar"
#: convert.cpp:580
msgid "Writing tags"
@@ -937,16 +956,16 @@ msgstr "Falló la conversión. Código de salida: %1"
#: convert.cpp:1107
msgctxt "identificator for the logger"
msgid "CD track %1: %2 - %3"
-msgstr "Pista %1: %2 - %3"
+msgstr "Pista de CD %1: %2 - %3"
#: convert.cpp:1111
msgctxt "identificator for the logger"
msgid "CD track %1"
-msgstr "Pista %1"
+msgstr "Pista de CD %1"
#: convert.cpp:1118
msgid "Adding new item to conversion list: '%1'"
-msgstr "Agregando nuevo ítem a la lista de conversión: '%1'"
+msgstr "Agregando nuevo elemento a la lista de conversión: '%1'"
#: convert.cpp:1127 replaygainscanner/replaygainprocessor.cpp:281
msgid "Got log ID: %1"
@@ -969,8 +988,8 @@ msgid ""
"An error occurred, the output file size is less than one percent of the "
"input file size"
msgstr ""
-"Ocurrió un error, el tamaño del archivo de salida es menor que el uno por "
-"ciento del archivo de entrada"
+"Ocurrió un error, el tamaño del archivo de salida es menor que el uno por ciento "
+"del archivo de entrada"
#: convert.cpp:1238
msgid "Conversion failed, trying again. Exit code: -2 (%1)"
@@ -988,7 +1007,7 @@ msgstr "Salida normal"
#: convert.cpp:1256 replaygainscanner/replaygainprocessor.cpp:326
msgctxt "Conversion exit status"
msgid "Succeeded but problems occurred"
-msgstr ""
+msgstr "Tuve éxito pero ocurrieron problemas"
#: convert.cpp:1259 replaygainscanner/replaygainprocessor.cpp:329
msgctxt "Conversion exit status"
@@ -998,7 +1017,7 @@ msgstr "Abortado por usuario"
#: convert.cpp:1262 replaygainscanner/replaygainprocessor.cpp:332
msgctxt "Conversion exit status"
msgid "Backend needs configuration"
-msgstr "Ejecutable necesita configuración"
+msgstr "Binario necesita configuración"
#: convert.cpp:1265
msgctxt "Conversion exit status"
@@ -1008,7 +1027,7 @@ msgstr "No hay suficiente espacio en el dispositivo de salida"
#: convert.cpp:1268
msgctxt "Conversion exit status"
msgid "Cannot write to output directory, please check permissions"
-msgstr ""
+msgstr "No se puede escribir en el directorio de salida, compruebe los permisos"
#: convert.cpp:1271
msgctxt "Conversion exit status"
@@ -1018,7 +1037,7 @@ msgstr "El archivo ya existe"
#: convert.cpp:1274
msgctxt "Conversion exit status"
msgid "File is encrypted"
-msgstr ""
+msgstr "El archivo está encriptado"
#: convert.cpp:1277 replaygainscanner/replaygainprocessor.cpp:338
msgctxt "Conversion exit status"
@@ -1043,7 +1062,7 @@ msgstr "Tamaño del archivo de salida"
#: convert.cpp:1328
msgid "File size ratio"
-msgstr "Razón de tamaño de archivo"
+msgstr "proporción de tamaño de archivo"
#: convert.cpp:1435
msgctxt "The conversion progress can't be determined"
@@ -1070,6 +1089,11 @@ msgid ""
"<br><br><a href=\"http://en.wikipedia.org/wiki/WAV\">http://en.wikipedia.org/"
"wiki/WAV</a>"
msgstr ""
+"(Wave) es un formato de audio muy simple que no comprime la transmisión de audio "
+"es sin pérdida pero el tamaño del archivo es muy grande y no admite avanzadas "
+"características como etiquetas.<br>Es compatible con cualquier programa o dispositivo."
+"<br><br><a href=\"http://en.wikipedia.org/wiki/WAV\">http://en.wikipedia.org/"
+"wiki/WAV</a>"
#: core/backendplugin.cpp:47
msgid ""
diff --git a/src/po/et.po b/src/po/et.po
index 5ef847c..1e03483 100644
--- a/src/po/et.po
+++ b/src/po/et.po
@@ -1,26 +1,22 @@
-# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Daniel Faust <hessijames@gmail.com>, 2012
-# Mihkel Tõnnov <mihhkel@gmail.com>, 2011-2013
-# Mihkel Tõnnov <mihhkel@gmail.com>, 2011
+# Mihkel Tõnnov <mihhkel@gmail.com>, 2008-2009, 2011-2014, 2020.
msgid ""
msgstr ""
"Project-Id-Version: soundkonverter\n"
-"Report-Msgid-Bugs-To: https://bugs.launchpad.net/ubuntu/%2Bsource/"
-"soundkonverter/\n"
+"Report-Msgid-Bugs-To: https://bugs.launchpad.net/ubuntu/%2Bsource/soundkonverter/\n"
"POT-Creation-Date: 2016-05-21 10:30+0200\n"
-"PO-Revision-Date: 2016-05-03 15:47+0000\n"
-"Last-Translator: Daniel Faust <hessijames@gmail.com>\n"
-"Language-Team: Estonian (http://www.transifex.com/hessijames/soundkonverter/"
-"language/et/)\n"
+"PO-Revision-Date: 2020-04-07 13:51+0200\n"
+"Last-Translator: Mihkel Tõnnov <mihhkel@gmail.com>\n"
+"Language-Team: Estonian <>\n"
"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 19.12.3\n"
#: aboutplugins.cpp:20
msgid "About plugins"
@@ -71,7 +67,7 @@ msgstr "Dekodeerimine: %1"
#: configdialog/configbackendspage.cpp:309
#: configdialog/configbackendspage.cpp:388 optionsdetailed.cpp:304
msgid "Configure %1 ..."
-msgstr "%1 seadistamine..."
+msgstr "%1i seadistamine..."
#: codecoptimizations.cpp:17 codecproblems.cpp:14
msgid "Solutions for backend problems"
@@ -623,7 +619,7 @@ msgstr "Kasutatav plugin:"
#: configdialog/configbackendspage.cpp:265
msgid "Filters"
-msgstr "Fintrid"
+msgstr "Filtrid"
#: configdialog/configbackendspage.cpp:281
msgid "Enable plugins:"
@@ -814,12 +810,14 @@ msgstr ""
#: configdialog/configgeneralpage.cpp:161
msgid "Copy files instead of converting to the same file format"
msgstr ""
+"Samasse vormingusse teisendamise asemel failid kopeeritakse"
#: configdialog/configgeneralpage.cpp:162
msgid ""
"If the input and the output file format are the same, copy the files instead "
"of re-encoding them."
msgstr ""
+"Kui sisend- ja väljundvorming on sama, siis failide uuesti kodeerimise asemel need lihtsalt kopeeritakse."
#: configdialog/configgeneralpage.cpp:169
#: replaygainscanner/replaygainscanner.cpp:34
@@ -861,10 +859,12 @@ msgstr "Kopeerimine: \"%1\" -> \"%2\""
#: convert.cpp:103 convert.cpp:1138
msgid "File is encrypted, conversion not possible"
msgstr ""
+"Fail on krüptitud, teisendamine pole võimalik"
#: convert.cpp:121
msgid "Cannot create output directory \"%1\""
msgstr ""
+"Väljundkataloogi \"%1\" loomine pole võimalik"
#: convert.cpp:144 convert.cpp:478 convert.cpp:495
#: replaygainscanner/replaygainprocessor.cpp:64
@@ -924,6 +924,7 @@ msgstr "Helitugevuse paranduse rakendamine"
#: convert.cpp:531 replaygainscanner/replaygainprocessor.cpp:89
msgid "Waiting for running Vorbis Gain process to finish"
msgstr ""
+"Vorbis Gaini protsessi lõpetamise järel ootamine"
#: convert.cpp:580
msgid "Writing tags"
@@ -1028,6 +1029,7 @@ msgstr "Väljundseadmel pole piisavalt ruumi"
msgctxt "Conversion exit status"
msgid "Cannot write to output directory, please check permissions"
msgstr ""
+"Väljundkataloogi kirjutamine pole võimalik - vaata, et õigused oleks paigas"
#: convert.cpp:1271
msgctxt "Conversion exit status"
@@ -1038,6 +1040,7 @@ msgstr "Fail on juba olemas"
msgctxt "Conversion exit status"
msgid "File is encrypted"
msgstr ""
+"Fail on krüptitud"
#: convert.cpp:1277 replaygainscanner/replaygainprocessor.cpp:338
msgctxt "Conversion exit status"
@@ -1453,6 +1456,7 @@ msgstr "Jäetakse vahele"
#: filelist.cpp:552
msgid "Will be copied"
msgstr ""
+"Kopeeritakse"
#: filelist.cpp:556 soundkonverter.cpp:111 soundkonverter.cpp:115
msgid "Waiting"
@@ -1462,21 +1466,25 @@ msgstr "Ootel"
msgctxt "Short conversion status"
msgid "Stopped"
msgstr ""
+"Peatatud"
#: filelist.cpp:601
msgctxt "Short conversion status"
msgid "Backend not configured"
msgstr ""
+"Taustprogramm seadistamata"
#: filelist.cpp:606
msgctxt "Short conversion status"
msgid "Disc full"
msgstr ""
+"Ketas täis"
#: filelist.cpp:611
msgctxt "Short conversion status"
msgid "Can't write output"
msgstr ""
+"Väljundfaili pole võimalik kirjutada"
#: filelist.cpp:614 filelist.cpp:631 filelist.cpp:643
msgid ""
@@ -1489,16 +1497,19 @@ msgstr ""
#: filelist.cpp:623
msgid "Skipped"
msgstr ""
+"Jäeti vahele"
#: filelist.cpp:628
msgctxt "Short conversion status"
msgid "File is encrypted"
msgstr ""
+"Fail on krüptitud"
#: filelist.cpp:640
msgctxt "Short conversion status"
msgid "Failed"
msgstr ""
+"Ebaõnnestus"
#: filelist.cpp:666
msgid "CD track %1"
@@ -1594,9 +1605,11 @@ msgid ""
"soundKonverter is a frontend to various audio converters, Replay Gain tools "
"and CD rippers.\n"
"\n"
-"Please file bug reports at https://github.com/dfaust/soundkonverter/"
-"issues"
+"Please file bug reports at https://github.com/dfaust/soundkonverter/issues"
msgstr ""
+"soundKonverter on mitmete audioteisendajate, helitugevuse parandustööriistade ja CD-rippijate kasutajaliides\n"
+"\n"
+"Palun esita veateated aadressil https://github.com/dfaust/soundkonverter/issues"
#: main.cpp:22
msgid "soundKonverter"
@@ -1605,6 +1618,7 @@ msgstr "soundKonverter"
#: main.cpp:22
msgid "(C) 2005-2016 Daniel Faust"
msgstr ""
+"(C) 2005-2016 Daniel Faust"
#: main.cpp:23
msgid "Daniel Faust"
@@ -1696,6 +1710,7 @@ msgstr ""
#: main.cpp:41
msgid "Load the file list at <path> after starting soundKonverter"
msgstr ""
+"soundKonverteri käivitamise järel laaditakse <asukohast> faililoend"
#: main.cpp:42
msgid "Audio file(s) to append to the file list"
@@ -2461,8 +2476,7 @@ msgid "Unknown Title"
msgstr "Pealkiri teadmata"
#: outputdirectory.cpp:354
-msgctxt ""
-"will be appended to the filename if a file with the same name already exists"
+msgctxt "will be appended to the filename if a file with the same name already exists"
msgid "new"
msgstr "uus"
@@ -2589,6 +2603,7 @@ msgstr ""
#: plugins/soundkonverter_codec_faac/soundkonverter_codec_faac.cpp:87
msgid "Compile faac with MP4 support."
msgstr ""
+"Kompileeri faac MP4 toega."
#: plugins/soundkonverter_codec_ffmpeg/ffmpegcodecwidget.cpp:30
#: plugins/soundkonverter_codec_libav/libavcodecwidget.cpp:30
@@ -3110,11 +3125,13 @@ msgstr "Sildivorming:"
#: plugins/soundkonverter_replaygain_mp3gain/soundkonverter_replaygain_mp3gain.cpp:98
msgid "Adjust gain:"
msgstr ""
+"Kohandatud parandus:"
#: plugins/soundkonverter_replaygain_aacgain/soundkonverter_replaygain_aacgain.cpp:110
#: plugins/soundkonverter_replaygain_mp3gain/soundkonverter_replaygain_mp3gain.cpp:103
msgid "Lower or raise the suggested gain"
msgstr ""
+"Pakutava helitugevuse paranduse suurendamine või vähendamine"
#: plugins/soundkonverter_replaygain_aacgain/soundkonverter_replaygain_aacgain.cpp:115
#: plugins/soundkonverter_replaygain_mp3gain/soundkonverter_replaygain_mp3gain.cpp:108
@@ -3152,6 +3169,7 @@ msgstr "Sunnitakse lugemiskiirust:"
msgctxt "Byte-Order"
msgid "Endianness:"
msgstr ""
+"Baidijärjestus:"
#: plugins/soundkonverter_ripper_cdparanoia/soundkonverter_ripper_cdparanoia.cpp:109
msgid "Maximum read retries:"
@@ -3450,3 +3468,305 @@ msgstr "Helifailide teisendaja, CD-rippija ja helitugevuse parandustööriist"
#: rc.cpp:4
msgid "Rip Audio CD with soundKonverter"
msgstr "Ripi audio-CD soundKonverteriga"
+
+#~ msgid "Running user script"
+#~ msgstr "Kasutajaskripti käivitamine"
+
+#~ msgid "Stopped"
+#~ msgstr "Peatatud"
+
+#~ msgid "Backend not configured"
+#~ msgstr "Taustprogramm seadistamata"
+
+#~ msgid "Disc full"
+#~ msgstr "Ketas täis"
+
+#~ msgid "Failed"
+#~ msgstr "Ebaõnnestus"
+
+#~ msgid ""
+#~ "soundKonverter is a frontend to various audio converters, Replay Gain "
+#~ "tools and CD rippers.\n"
+#~ "\n"
+#~ "Please file bug reports at https://bugs.launchpad.net/soundkonverter\n"
+#~ "or simply send me a mail to hessijames@gmail.com"
+#~ msgstr ""
+#~ "soundKonverter on mitmete audioteisendajate, helitugevuse "
+#~ "parandustööriistade ja CD-rippijate kasutajaliides.\n"
+#~ "\n"
+#~ "Palun esita veateated aadressil https://bugs.launchpad.net/ubuntu/+source/"
+#~ "soundkonverter\n"
+#~ "või lihtsalt saada e-kiri: hessijames@gmail.com"
+
+#~ msgid "(C) 2005-2012 Daniel Faust"
+#~ msgstr "(C) 2005-2012 Daniel Faust"
+
+#~ msgid "Endianness:"
+#~ msgstr "Otsalisus:"
+
+#~ msgid "Tools"
+#~ msgstr "Tööriistad"
+
+#~ msgid "Various Artists"
+#~ msgstr "Mitu esitajat"
+
+#~ msgid "Various Composer"
+#~ msgstr "Mitu heliloojat"
+
+#~ msgid "Unknown"
+#~ msgstr "Teadmata"
+
+#~ msgid "DVD Recorder"
+#~ msgstr "DVD-kirjuti"
+
+#~ msgid "CD Recorder"
+#~ msgstr "CD-kirjuti"
+
+#~ msgid "DVD Player"
+#~ msgstr "DVD-lugeja"
+
+#~ msgid "CD Player"
+#~ msgstr "CD-lugeja"
+
+#~ msgid "Quality level from -50 to 50."
+#~ msgstr "Kvaliteedi tase vahemikus -50 kuni 50."
+
+#~ msgid "Quality level from 9 to 0 where 0 is the highest quality."
+#~ msgstr ""
+#~ "Kvaliteeditase vahemikus 9 kuni 0, kusjuures 0 on kõrgeim kvaliteet."
+
+#~ msgid ""
+#~ "Reading/writing covers is not supported for ogg/METADATA_BLOCK_PICTURE, "
+#~ "flac and asf/wma files. TagLib 1.7 is needed for that."
+#~ msgstr ""
+#~ "Kaanepiltide lugemist-kirjutamist ei toetata FLAC- ja ASF/WMA-failide "
+#~ "ning ogg/METADATA_BLOCK_PICTURE puhul. Selleks on vaja TagLib'i versiooni "
+#~ "1.7."
+
+#~ msgid ""
+#~ "Conversion failed. The preferred plugin lacks support for a ecessary "
+#~ "feature."
+#~ msgstr ""
+#~ "Teisendamine ebaõnnestus. Eelistatud plugin ei toeta vajalikku "
+#~ "funktsiooni."
+
+#~ msgid "Status update delay"
+#~ msgstr "Oleku uuendamise viivitus"
+
+#~ msgid "Update the progress bar in this interval (time in milliseconds)"
+#~ msgstr "Määrab edenemise uuendamise intervalli (millisekundites)."
+
+#~ msgid "Remove partially converted files if a conversion fails"
+#~ msgstr "Teisenduse nurjumisel eemaldatakse poolelijäänud failid"
+
+#~ msgid ""
+#~ "Disable this for debugging or if you are sure the files get converted "
+#~ "correctly."
+#~ msgstr ""
+#~ "See tasub välja lülitada vigade otsimisel või kui oled kindel, et failid "
+#~ "teisendatakse korrektselt."
+
+#~ msgid "Backend"
+#~ msgstr "Taustprogramm"
+
+#~ msgid "%1 settings"
+#~ msgstr "Vormingu \"%1\" seaded"
+
+#~ msgid "File name for the cover"
+#~ msgstr "Kaanepildi failinimi"
+
+#~ msgid "Create actions menus for the file manager"
+#~ msgstr "Failihalduri toimingumenüüsse kirjete loomine"
+
+#~ msgid ""
+#~ "These service menus won't get removed if you uninstall soundKonverter.\n"
+#~ "But you can remove them by disabling this option."
+#~ msgstr ""
+#~ "soundKonverteri eemaldamisel jäävad teenusmenüü kirjeid alles.\n"
+#~ "Selle valiku keelamisel nad kustutatakse."
+
+#~ msgid "Moving file to destination"
+#~ msgstr "Faili liigutamine sihtkohta"
+
+#~ msgid "Wave won't compress the audio stream."
+#~ msgstr "Wave helivoogu kokku ei paki."
+
+#~ msgid ""
+#~ "Advanced Audio Coding is a lossy and popular audio format. It is widely "
+#~ "used by Apple Inc."
+#~ msgstr ""
+#~ "Advanced Audio Coding on populaarne kadudega helivorming. Kasutatakse "
+#~ "laialt Apple'i toodetes."
+
+#~ msgid ""
+#~ "m4a files are encoded with the aac codec. It is widely used by Apple Inc."
+#~ msgstr ""
+#~ "m4a-failid kodeeritakse AAC-koodekiga. Kasutatakse laialt Apple'i "
+#~ "toodetes."
+
+#~ msgid ""
+#~ "Ogg Vorbis is a free and lossy high quality audio codec.\n"
+#~ "For more information see: http://www.xiph.org/vorbis/"
+#~ msgstr ""
+#~ "Ogg Vorbis on vaba ja kõrgekvaliteetne kadudega helikoodek.\n"
+#~ "Lisainfo: http://www.xiph.org/vorbis/"
+
+#~ msgid ""
+#~ "MP3 is the most popular lossy audio codec. It's supported by all audio "
+#~ "players."
+#~ msgstr ""
+#~ "MP3 on populaarseim kadudega helikoodek. Seda toetavad kõik audiomängijad."
+
+#~ msgid ""
+#~ "Flac is the free lossless audio codec.\n"
+#~ "As it's name says, it compresses without any loss of quality."
+#~ msgstr ""
+#~ "FLAC (\"Free Lossless Audio Codec\") on vaba kadudeta helikoodek.\n"
+#~ "Nagu nimi ütleb, pakib see heli ilma kvaliteedikadudeta."
+
+#~ msgid "Windows Media Audio is a proprietary audio codec from Microsoft."
+#~ msgstr "Windows Media Audio on Microsofti omanduslik helikoodek."
+
+#~ msgid "Dolby Digital-Audio"
+#~ msgstr "Dolby Digital heli"
+
+#~ msgid ""
+#~ "Apple Lossless Audio Codec is a lossless audio format from Apple Inc.."
+#~ msgstr "Apple Lossless Audio Codec on Apple'i kadudeta helivorming."
+
+#~ msgid "MPEG-1 Audio Layer II is an old lossy audio format."
+#~ msgstr "MPEG-1 Audio Layer II on vana kadudega helivorming."
+
+#~ msgid "MPEG-4 Audio Lossless Coding"
+#~ msgstr "MPEG-4 Audio Lossless Coding (kaduteta helivorming)"
+
+#~ msgid ""
+#~ "Adaptive Multi-Rate Narrow-Band is based on 3gp and mainly used for "
+#~ "speech compression in mobile communication."
+#~ msgstr ""
+#~ "Adaptive Multi-Rate Narrow-Band põhineb 3GP-l ja seda kasutatakse "
+#~ "peamiselt kõne pakkimisel mobiilsides."
+
+#~ msgid ""
+#~ "Adaptive Multi-Rate Wide-Band is an advanced version of amr nb which uses "
+#~ "a higher data rate resulting in a higher quality."
+#~ msgstr ""
+#~ "Adaptive Multi-Rate Wide-Band on AMR NB täiuslikum versioon, mis kasutab "
+#~ "suuremat andmekiirust ja seega pakub kõrgemat kvaliteeti."
+
+#~ msgid ""
+#~ "Monkey’s Audio is a fast and efficient but proprietary lossless audio "
+#~ "format."
+#~ msgstr ""
+#~ "Monkey’s Audio on kiire ja tõhus, kuid omanduslik kaduteta helivorming."
+
+#~ msgid ""
+#~ "Speex is a free and lossy audio codec designed for low quality speech "
+#~ "encoding.\n"
+#~ "For more information see: http://www.speex.org"
+#~ msgstr ""
+#~ "Speex on vaba kadudega helikoodek, mis loodi kõne madalakvaliteediliseks "
+#~ "kodeerimiseks.\n"
+#~ "Lisainfo: http://www.speex.org"
+
+#~ msgid "MPEG-1 Audio Layer I very old and lossy file format."
+#~ msgstr "MPEG-1 Audio Layer I on väga vana kadudega helivorming."
+
+#~ msgid ""
+#~ "Shorten is a free and lossless audio codec.\n"
+#~ "For more information see: http://etree.org/shnutils/shorten/"
+#~ msgstr ""
+#~ "Shorten on vaba kadudeta helikoodek.\n"
+#~ "Lisainfo: http://etree.org/shnutils/shorten/"
+
+#~ msgid "True Audio is a free lossless audio format."
+#~ msgstr "True Audio on vaba kadudeta helivorming."
+
+#~ msgid ""
+#~ "WavPack is a free and lossless audio codec.\n"
+#~ "For more information see: http://www.wavpack.com"
+#~ msgstr ""
+#~ "WavPack on vaba kadudeta helikoodek.\n"
+#~ "Lisainfo: http://www.wavpack.com"
+
+#~ msgid "Real Media Audio is a proprietary and lossy codec."
+#~ msgstr "Real Media Audio on omanduslik kadudega koodek."
+
+#~ msgid "3GP is a audio/video container format for mobile devices."
+#~ msgstr "3GP on audio/video-konteinervorming mobiilseadmete jaoks."
+
+#~ msgid "Real Media is a proprietary and lossy codec."
+#~ msgstr "Real Media on omanduslik kadudega koodek."
+
+#~ msgid ""
+#~ "midi is a very old sound file format, that doesn't encode audio waves but "
+#~ "stores instrument timings."
+#~ msgstr ""
+#~ "MIDI on väga vana helifailivorming, milles kodeeritud helilainete asemel "
+#~ "on kirjas instrumentide ajastused."
+
+#~ msgid ""
+#~ "Amiga-SoundTracker-Audio is a very old sound file format, that doesn't "
+#~ "encode audio waves but stores instrument timings."
+#~ msgstr ""
+#~ "Amiga-SoundTracker-Audio on väga vana failivorming, milles kodeeritud "
+#~ "helilainete asemel on kirjas instrumentide ajastused."
+
+#~ msgid "Filename"
+#~ msgstr "Failinimi"
+
+#~ msgid "Output format"
+#~ msgstr "Väljundvorming"
+
+#~ msgid "Choose your prefered output options and click on \"Apply\"!"
+#~ msgstr "Vali soovitud väljundseaded ja klõpsa \"Rakenda\"."
+
+#~ msgid "More"
+#~ msgstr "Rohkem"
+
+#~ msgid ""
+#~ "This produces sound files of a medium quality.\n"
+#~ "If your disc space is limited, you can use this to save your music."
+#~ msgstr ""
+#~ "Seda profiili kasutades luuakse keskpärase helikvaliteediga failid.\n"
+#~ "Kui kettaruum on piiratud, võib muusika salvestamiseks just seda kasutada."
+
+#~ msgid ""
+#~ "This produces sound files of a very high quality.\n"
+#~ "You should only use this, if you are a quality freak and have enough disc "
+#~ "space available."
+#~ msgstr ""
+#~ "Seda profiili kasutades luuakse ülikõrge helikvaliteediga failid.\n"
+#~ "Seda peaks kasutama ainult juhul, kui oled tõeline kvaliteedifriik ja "
+#~ "kettal on palju vaba ruumi."
+
+#~ msgid ""
+#~ "This produces files, that have exact the same quality as the input "
+#~ "files.\n"
+#~ "This files are very big and definitely only for quality freaks."
+#~ msgstr ""
+#~ "Seda profiili kasutades luuakse failid, mille helikvaliteet on "
+#~ "sisendfailiga identne.\n"
+#~ "Saadavad failid on väga suured ja mõeldud kahtlemata ainult "
+#~ "kvaliteedifriikidele."
+
+#~ msgid ""
+#~ "This produces two files. One lossy compressed playable file and one "
+#~ "correction file.\n"
+#~ "Both files together result in a file that is equivalent to the input file."
+#~ msgstr ""
+#~ "Seda profiili kasutades luuakse kaks faili: üks kadudega pakitud, "
+#~ "esitamiseks mõeldud fail, ning üks korrektsioonifail.\n"
+#~ "Need kaks koos annavad sisendfailiga võrdse helikvaliteedi."
+
+#~ msgid "Resample"
+#~ msgstr "Ümberdiskreetimine"
+
+#~ msgid "Joint"
+#~ msgstr "Liitstereo"
+
+#~ msgid "Dual"
+#~ msgstr "Kaks kanalit"
+
+#~ msgid "The following files could not be added:"
+#~ msgstr "Järgmisi faile polnud võimalik lisada:"
diff --git a/src/replaygainscanner/replaygainfilelist.cpp b/src/replaygainscanner/replaygainfilelist.cpp
index edd64d0..3df5d58 100644
--- a/src/replaygainscanner/replaygainfilelist.cpp
+++ b/src/replaygainscanner/replaygainfilelist.cpp
@@ -355,7 +355,7 @@ int ReplayGainFileList::listDir( const QString& directory, const QStringList& fi
if( filter.contains(codecName) )
{
QList<QUrl> urls;
- urls.append(directory + "/" + fileName);
+ urls.append("file://" + directory + "/" + fileName);
addFiles( urls, codecName );
}
diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp
index 43e7fb9..f2d2ff7 100644
--- a/src/soundkonverter.cpp
+++ b/src/soundkonverter.cpp
@@ -40,9 +40,9 @@ soundKonverter::soundKonverter()
const int fontHeight = QFontMetrics(QApplication::font()).boundingRect("M").size().height();
logger = new Logger( this );
- logger->log( 1000, i18n("This is soundKonverter %1").arg(SOUNDKONVERTER_VERSION_STRING) );
+ logger->log( 1000, i18n("This is soundKonverter %1",*SOUNDKONVERTER_VERSION_STRING) );
- logger->log( 1000, "\n" + i18n("Compiled with TagLib %1.%2.%3").arg(TAGLIB_MAJOR_VERSION).arg(TAGLIB_MINOR_VERSION).arg(TAGLIB_PATCH_VERSION) );
+ logger->log( 1000, "\n" + i18n("Compiled with TagLib %1.%2.%3",TAGLIB_MAJOR_VERSION,TAGLIB_MINOR_VERSION,TAGLIB_PATCH_VERSION) );
config = new Config( logger, this );
config->load();
@@ -258,12 +258,12 @@ void soundKonverter::startupChecks()
if( QFile::exists(QDir::homePath()+"/.kde4/share/kde4/services/ServiceMenus/convert_with_soundkonverter.desktop") )
{
QFile::remove(QDir::homePath()+"/.kde4/share/kde4/services/ServiceMenus/convert_with_soundkonverter.desktop");
- logger->log( 1000, i18n("Removing old file: %1").arg(QDir::homePath()+"/.kde4/share/kde4/services/ServiceMenus/convert_with_soundkonverter.desktop") );
+ logger->log( 1000, i18n("Removing old file: %1",QDir::homePath()+"/.kde4/share/kde4/services/ServiceMenus/convert_with_soundkonverter.desktop") );
}
if( QFile::exists(QDir::homePath()+"/.kde4/share/kde4/services/ServiceMenus/add_replaygain_with_soundkonverter.desktop") )
{
QFile::remove(QDir::homePath()+"/.kde4/share/kde4/services/ServiceMenus/add_replaygain_with_soundkonverter.desktop");
- logger->log( 1000, i18n("Removing old file: %1").arg(QDir::homePath()+"/.kde4/share/kde4/services/ServiceMenus/add_replaygain_with_soundkonverter.desktop") );
+ logger->log( 1000, i18n("Removing old file: %1",QDir::homePath()+"/.kde4/share/kde4/services/ServiceMenus/add_replaygain_with_soundkonverter.desktop") );
}
}
@@ -278,7 +278,7 @@ void soundKonverter::startupChecks()
if( *it != "1000.log" && (*it).endsWith(".log") )
{
QFile::remove( dir.absolutePath() + "/" + (*it) );
- logger->log( 1000, i18n("Removing old file: %1").arg(dir.absolutePath()+"/"+(*it)) );
+ logger->log( 1000, i18n("Removing old file: %1",dir.absolutePath()+"/"+(*it)) );
}
}
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/00/db6ac3068b4469174b7dee7656e2f427943faa.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/04/d336126be0ac462022416d05aec57c78a2a53e.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/08/5a31349b0c16453568a74ec1d6cba53ababc9a.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/09/354ba466d00f2e7b4061df221148aad6022c27.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/1f/ae74fbbc05b99adaa21a4fbee67765e5b98c65.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/23/91a80279674421c89e31bdb866235739b08a0f.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/23/e686eb199a39e251e5213aca827cc60a24d8ba.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/41/87da30c2d6f573c474d69d9df9ce310daee5d8.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/4f/8b1fa6ffbdf6e8e7b00ce60b9279a1e937ee4a.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/59/01120341b8db7131cfe7b65be7697655004e77.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/68/36ffed3449ffa6a7034337895a8e6c52ff32fc.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/70/5656078b650ac504f607f178b10a73b0ff926d.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/77/0de24d149d346aecad6c887131f95419a6ef31.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/7f/272a5d4fe7c85348b3f7be0eedd4763ae97bd3.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/85/ca85a15e0dc839341e1acdfa1c10f5b609e89a.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/86/3ab1507e6d07390912b7b338448508b7746a29.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/8e/dc9cece4a12d6fe26172b580389af3b739f8c8.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/96/9beac80fc27c18f4ac4795f11ca589f3394395.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/9a/8f2a9073f3166250fa8e1cf238e544ed2cddb6.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/a3/0b065889971dc9693737174ab348b260262eb6.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/a5/902d15da3d3e418d279597f9e5f1bbdb65a9b3.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/ae/8500288077454d9d825653c1626d87173fb888.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/b2/5edc5a2f2f9e2e27773bd418ea7c00f2d73d68.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/ba/3c82e2c6098c45195c2210f833717314237c24.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/bf/1963905ebb5b0baed0312f7a4f9237a71a009d.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/c2/2c18f16e0d128a9bdb2b00af4ae0b9e9b6c5dc.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/c2/d1f8681877bfee5de0cd4bfc543cd69b031d05.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/ca/059ef086872273a0b511102baff875f6ed6f9b.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/da/a8b46f1ef0284f012e07e2d14b9231b2f28a7d.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/dc/545a8058b86f92de55828affd093e432e27377.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/e4/da9fbebf0ddb456793b66915a60c02a34ba7a2.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/f9/12ffd62b6f7a6c90b820ec53b42731dd61a16c.debug
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/01/72a82f7d374ce33792bbb04bfee283de48463f.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/0d/12077462d079b70064e79fa8639e43b2a99538.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/24/58e60d23aece25d71a668ec31ff7a0e0266b14.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/2f/7ea15e731043339dd6232dcd28a3e6e2084e8f.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/36/c8e656a87c28e024bcad760c75b22f2d61d923.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/37/61f3004bd978654e8bab5115654ea45f69da89.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/42/18e98da31cde80f6f7270a5bcb6d9ebe445e4f.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/46/b3d60a64a4f761d1b6906bb72e31cc5cab7562.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/4b/7fa57cc496eafc1e8bb82a3e5f7ac5f2398004.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/4c/05c0937bdff995c3a25a8a8fbd399c6358b24d.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/59/f677628fc1a4a45aa5f58703d1179e6ba682f3.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/5e/be081b6fb29ff2517bb43268260bde113ccdf4.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/62/e27685d73999e7c06539e091096b1e5c74be78.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/7e/36c4622b00021e29064b1485eda7e167be5e04.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/7f/7643717216cdac77de5b7a1db39fa019005ea6.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/8f/c3f25f426b226928e44bd65157f8ec7f62ffe0.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/97/8aa56ca5fa892ce5302f31acee26e38a9ebbcb.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/b8/f877f89cef0f4208361c637b1ff01d7a922173.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/b9/6a1d4a6da3ae8832c0aec11f2d1c67ff46b445.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/c3/da2995df332603845b1d631ef3404de62736f0.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/c3/dd484ce469c989c6fd8468880e84ddf64996ea.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/c4/2a6985da75ba144e50e06f34be3b0e642deab5.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/c4/f5457b8aa2f8110af93e2608bc537e00af4a70.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/c5/5770894b9a2453ff0f71f387b6c42271224e20.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/cf/2fd50cf8e88e7ce32d2ce4f53aa270d2441a75.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/da/1c0396488339b6c8fa56ecc66c825625b34f4f.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/da/9d5996d9704f298568042d1fed995e3dcfd44e.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/db/9ddb5c73b42ed808db840a053b1482d0f4729b.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/e3/c2dd6eba4762cb92dcd509fb09068387c544eb.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/e7/4721f3b113f571b1afa5c137c5156e22ccae75.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/fa/fe7a62efa4f5ede55098ee0146d2e5ca3d1b02.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/ff/52c9fcc662450e8d65747c2f1911f32a3c69c5.debug
No differences were encountered between the control files of package soundkonverter
Control files of package soundkonverter-dbgsym: lines which differ (wdiff format)
Build-Ids: 0172a82f7d374ce33792bbb04bfee283de48463f 0d12077462d079b70064e79fa8639e43b2a99538 2458e60d23aece25d71a668ec31ff7a0e0266b14 2f7ea15e731043339dd6232dcd28a3e6e2084e8f 36c8e656a87c28e024bcad760c75b22f2d61d923 3761f3004bd978654e8bab5115654ea45f69da89 4218e98da31cde80f6f7270a5bcb6d9ebe445e4f 46b3d60a64a4f761d1b6906bb72e31cc5cab7562 4b7fa57cc496eafc1e8bb82a3e5f7ac5f2398004 4c05c0937bdff995c3a25a8a8fbd399c6358b24d 59f677628fc1a4a45aa5f58703d1179e6ba682f3 5ebe081b6fb29ff2517bb43268260bde113ccdf4 62e27685d73999e7c06539e091096b1e5c74be78 7e36c4622b00021e29064b1485eda7e167be5e04 7f7643717216cdac77de5b7a1db39fa019005ea6 8fc3f25f426b226928e44bd65157f8ec7f62ffe0 978aa56ca5fa892ce5302f31acee26e38a9ebbcb b8f877f89cef0f4208361c637b1ff01d7a922173 b96a1d4a6da3ae8832c0aec11f2d1c67ff46b445 c3da2995df332603845b1d631ef3404de62736f0 c3dd484ce469c989c6fd8468880e84ddf64996ea c42a6985da75ba144e50e06f34be3b0e642deab5 c4f5457b8aa2f8110af93e2608bc537e00af4a70 c55770894b9a2453ff0f71f387b6c42271224e20 cf2fd50cf8e88e7ce32d2ce4f53aa270d2441a75 da1c0396488339b6c8fa56ecc66c825625b34f4f da9d5996d9704f298568042d1fed995e3dcfd44e db9ddb5c73b42ed808db840a053b1482d0f4729b e3c2dd6eba4762cb92dcd509fb09068387c544eb e74721f3b113f571b1afa5c137c5156e22ccae75 fafe7a62efa4f5ede55098ee0146d2e5ca3d1b02 ff52c9fcc662450e8d65747c2f1911f32a3c69c5 00db6ac3068b4469174b7dee7656e2f427943faa 04d336126be0ac462022416d05aec57c78a2a53e 085a31349b0c16453568a74ec1d6cba53ababc9a 09354ba466d00f2e7b4061df221148aad6022c27 1fae74fbbc05b99adaa21a4fbee67765e5b98c65 2391a80279674421c89e31bdb866235739b08a0f 23e686eb199a39e251e5213aca827cc60a24d8ba 4187da30c2d6f573c474d69d9df9ce310daee5d8 4f8b1fa6ffbdf6e8e7b00ce60b9279a1e937ee4a 5901120341b8db7131cfe7b65be7697655004e77 6836ffed3449ffa6a7034337895a8e6c52ff32fc 705656078b650ac504f607f178b10a73b0ff926d 770de24d149d346aecad6c887131f95419a6ef31 7f272a5d4fe7c85348b3f7be0eedd4763ae97bd3 85ca85a15e0dc839341e1acdfa1c10f5b609e89a 863ab1507e6d07390912b7b338448508b7746a29 8edc9cece4a12d6fe26172b580389af3b739f8c8 969beac80fc27c18f4ac4795f11ca589f3394395 9a8f2a9073f3166250fa8e1cf238e544ed2cddb6 a30b065889971dc9693737174ab348b260262eb6 a5902d15da3d3e418d279597f9e5f1bbdb65a9b3 ae8500288077454d9d825653c1626d87173fb888 b25edc5a2f2f9e2e27773bd418ea7c00f2d73d68 ba3c82e2c6098c45195c2210f833717314237c24 bf1963905ebb5b0baed0312f7a4f9237a71a009d c22c18f16e0d128a9bdb2b00af4ae0b9e9b6c5dc c2d1f8681877bfee5de0cd4bfc543cd69b031d05 ca059ef086872273a0b511102baff875f6ed6f9b daa8b46f1ef0284f012e07e2d14b9231b2f28a7d dc545a8058b86f92de55828affd093e432e27377 e4da9fbebf0ddb456793b66915a60c02a34ba7a2 f912ffd62b6f7a6c90b820ec53b42731dd61a16c