summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
-rw-r--r--AUTHORS0
-rw-r--r--CMakeLists.txt77
-rw-r--r--ChangeLog0
-rw-r--r--INSTALL17
-rw-r--r--Makefile.am5
-rw-r--r--Makefile.am.in4
-rw-r--r--NEWS0
-rw-r--r--README1
-rw-r--r--README.md50
-rw-r--r--acinclude.m411945
-rw-r--r--aclocal.m4881
m---------admin0
-rw-r--r--af/Makefile.am1
-rw-r--r--af/messages/Makefile.am3
-rw-r--r--af/messages/k3b.po51
-rw-r--r--ar/Makefile.am1
-rw-r--r--ar/messages/Makefile.am3
-rw-r--r--ar/messages/k3b.po50
-rw-r--r--bg/Makefile.am1
-rw-r--r--bg/messages/Makefile.am3
-rw-r--r--bg/messages/k3b.po51
-rw-r--r--br/Makefile.am1
-rw-r--r--br/messages/Makefile.am3
-rw-r--r--br/messages/k3b.po58
-rw-r--r--bs/Makefile.am1
-rw-r--r--bs/messages/Makefile.am3
-rw-r--r--bs/messages/k3b.po46
-rw-r--r--ca/Makefile.am1
-rw-r--r--ca/messages/Makefile.am3
-rw-r--r--ca/messages/k3b.po51
m---------cmake0
-rw-r--r--config.h.in237
-rw-r--r--configure.files3
-rw-r--r--configure.in293
-rw-r--r--configure.in.bot4
-rw-r--r--configure.in.in1
-rw-r--r--cs/Makefile.am1
-rw-r--r--cs/messages/Makefile.am3
-rw-r--r--cs/messages/k3b.po51
-rw-r--r--cy/Makefile.am1
-rw-r--r--cy/messages/Makefile.am3
-rw-r--r--cy/messages/k3b.po93
-rw-r--r--da/CMakeLists.txt1
-rw-r--r--da/Makefile.am1
-rw-r--r--da/doc/CMakeLists.txt6
-rw-r--r--da/doc/Makefile.am2
-rw-r--r--da/doc/index.docbook12
-rw-r--r--da/messages/Makefile.am3
-rw-r--r--da/messages/k3b.po87
-rw-r--r--de/CMakeLists.txt1
-rw-r--r--de/Makefile.am1
-rw-r--r--de/doc/CMakeLists.txt6
-rw-r--r--de/doc/Makefile.am2
-rw-r--r--de/doc/index.docbook12
-rw-r--r--de/messages/Makefile.am3
-rw-r--r--de/messages/k3b.po51
-rw-r--r--el/Makefile.am1
-rw-r--r--el/messages/Makefile.am3
-rw-r--r--el/messages/k3b.po98
-rw-r--r--en_GB/Makefile.am1
-rw-r--r--en_GB/messages/Makefile.am3
-rw-r--r--en_GB/messages/k3b.po51
-rw-r--r--es/CMakeLists.txt1
-rw-r--r--es/Makefile.am1
-rw-r--r--es/doc/CMakeLists.txt6
-rw-r--r--es/doc/Makefile.am2
-rw-r--r--es/doc/index.docbook12
-rw-r--r--es/messages/Makefile.am3
-rw-r--r--es/messages/k3b.po51
-rw-r--r--et/CMakeLists.txt1
-rw-r--r--et/Makefile.am1
-rw-r--r--et/doc/CMakeLists.txt6
-rw-r--r--et/doc/Makefile.am2
-rw-r--r--et/doc/index.docbook12
-rw-r--r--et/messages/Makefile.am3
-rw-r--r--et/messages/k3b.po51
-rw-r--r--eu/Makefile.am1
-rw-r--r--eu/messages/Makefile.am3
-rw-r--r--eu/messages/k3b.po46
-rw-r--r--fa/Makefile.am1
-rw-r--r--fa/messages/Makefile.am3
-rw-r--r--fa/messages/k3b.po51
-rw-r--r--fi/Makefile.am1
-rw-r--r--fi/messages/Makefile.am3
-rw-r--r--fi/messages/k3b.po51
-rw-r--r--fr/CMakeLists.txt1
-rw-r--r--fr/Makefile.am1
-rw-r--r--fr/doc/CMakeLists.txt6
-rw-r--r--fr/doc/Makefile.am2
-rw-r--r--fr/doc/index.docbook12
-rw-r--r--fr/messages/Makefile.am3
-rw-r--r--fr/messages/k3b.po51
-rw-r--r--ga/Makefile.am1
-rw-r--r--ga/messages/Makefile.am3
-rw-r--r--ga/messages/k3b.po90
-rw-r--r--gl/Makefile.am1
-rw-r--r--gl/messages/Makefile.am3
-rw-r--r--gl/messages/k3b.po46
-rw-r--r--he/Makefile.am1
-rw-r--r--he/messages/Makefile.am3
-rw-r--r--he/messages/k3b.po51
-rw-r--r--hi/Makefile.am1
-rw-r--r--hi/messages/Makefile.am3
-rw-r--r--hi/messages/k3b.po51
-rw-r--r--hu/Makefile.am1
-rw-r--r--hu/messages/Makefile.am3
-rw-r--r--hu/messages/k3b.po51
-rw-r--r--is/Makefile.am1
-rw-r--r--is/messages/Makefile.am3
-rw-r--r--is/messages/k3b.po51
-rw-r--r--it/CMakeLists.txt1
-rw-r--r--it/Makefile.am1
-rw-r--r--it/doc/CMakeLists.txt6
-rw-r--r--it/doc/Makefile.am2
-rw-r--r--it/doc/index.docbook12
-rw-r--r--it/messages/Makefile.am3
-rw-r--r--it/messages/k3b.po66
-rw-r--r--it/messages/k3bsetup.po21
-rw-r--r--it/messages/libk3b.po11
-rw-r--r--ja/Makefile.am1
-rw-r--r--ja/messages/Makefile.am3
-rw-r--r--ja/messages/k3b.po51
-rw-r--r--ka/Makefile.am1
-rw-r--r--ka/messages/Makefile.am3
-rw-r--r--ka/messages/k3b.po101
-rw-r--r--km/Makefile.am1
-rw-r--r--km/messages/Makefile.am3
-rw-r--r--km/messages/k3b.po51
-rw-r--r--lt/Makefile.am1
-rw-r--r--lt/messages/Makefile.am3
-rw-r--r--lt/messages/k3b.po51
-rw-r--r--mk/Makefile.am1
-rw-r--r--mk/messages/Makefile.am3
-rw-r--r--mk/messages/k3b.po46
-rw-r--r--ms/Makefile.am1
-rw-r--r--ms/messages/Makefile.am3
-rw-r--r--ms/messages/k3b.po53
-rw-r--r--nb/Makefile.am1
-rw-r--r--nb/messages/Makefile.am3
-rw-r--r--nb/messages/k3b.po51
-rw-r--r--nds/Makefile.am1
-rw-r--r--nds/messages/Makefile.am3
-rw-r--r--nds/messages/k3b.po51
-rw-r--r--ne/Makefile.am1
-rw-r--r--ne/messages/Makefile.am3
-rw-r--r--ne/messages/k3b.po51
-rw-r--r--nl/CMakeLists.txt1
-rw-r--r--nl/Makefile.am1
-rw-r--r--nl/doc/CMakeLists.txt6
-rw-r--r--nl/doc/Makefile.am2
-rw-r--r--nl/doc/index.docbook12
-rw-r--r--nl/messages/Makefile.am3
-rw-r--r--nl/messages/k3b.po95
-rw-r--r--nl/messages/libk3b.po18
-rw-r--r--nl/messages/libk3bdevice.po18
-rw-r--r--nn/Makefile.am1
-rw-r--r--nn/messages/Makefile.am3
-rw-r--r--nn/messages/k3b.po51
-rw-r--r--pa/Makefile.am1
-rw-r--r--pa/messages/Makefile.am3
-rw-r--r--pa/messages/k3b.po51
-rw-r--r--pl/CMakeLists.txt1
-rw-r--r--pl/Makefile.am1
-rw-r--r--pl/doc/CMakeLists.txt6
-rw-r--r--pl/doc/Makefile.am2
-rw-r--r--pl/doc/index.docbook12
-rw-r--r--pl/messages/Makefile.am3
-rw-r--r--pl/messages/k3b.po195
-rw-r--r--pt/CMakeLists.txt1
-rw-r--r--pt/Makefile.am1
-rw-r--r--pt/doc/CMakeLists.txt6
-rw-r--r--pt/doc/Makefile.am2
-rw-r--r--pt/doc/index.docbook12
-rw-r--r--pt/messages/Makefile.am3
-rw-r--r--pt/messages/k3b.po57
-rw-r--r--pt_BR/CMakeLists.txt1
-rw-r--r--pt_BR/Makefile.am1
-rw-r--r--pt_BR/doc/CMakeLists.txt6
-rw-r--r--pt_BR/doc/Makefile.am2
-rw-r--r--pt_BR/doc/index.docbook12
-rw-r--r--pt_BR/messages/Makefile.am3
-rw-r--r--pt_BR/messages/k3b.po51
-rw-r--r--pt_BR/messages/libk3b.po22
-rw-r--r--pt_BR/messages/libk3bdevice.po15
-rw-r--r--ru/CMakeLists.txt1
-rw-r--r--ru/Makefile.am1
-rw-r--r--ru/doc/CMakeLists.txt6
-rw-r--r--ru/doc/Makefile.am2
-rw-r--r--ru/doc/index.docbook12
-rw-r--r--ru/messages/Makefile.am3
-rw-r--r--ru/messages/k3b.po51
-rw-r--r--ru/messages/libk3b.po13
-rw-r--r--rw/Makefile.am1
-rw-r--r--rw/messages/Makefile.am3
-rw-r--r--rw/messages/k3b.po53
-rw-r--r--se/Makefile.am1
-rw-r--r--se/messages/Makefile.am3
-rw-r--r--se/messages/k3b.po46
-rw-r--r--sk/Makefile.am1
-rw-r--r--sk/messages/Makefile.am3
-rw-r--r--sk/messages/k3b.po51
-rw-r--r--sr/Makefile.am1
-rw-r--r--sr/messages/Makefile.am3
-rw-r--r--sr/messages/k3b.po51
-rw-r--r--sr@Latn/Makefile.am1
-rw-r--r--sr@Latn/messages/Makefile.am3
-rw-r--r--sr@Latn/messages/k3b.po51
-rw-r--r--stamp-h.in0
-rw-r--r--subdirs54
-rw-r--r--sv/CMakeLists.txt1
-rw-r--r--sv/Makefile.am1
-rw-r--r--sv/doc/CMakeLists.txt6
-rw-r--r--sv/doc/Makefile.am2
-rw-r--r--sv/doc/index.docbook12
-rw-r--r--sv/messages/Makefile.am3
-rw-r--r--sv/messages/k3b.po51
-rw-r--r--ta/Makefile.am1
-rw-r--r--ta/messages/Makefile.am3
-rw-r--r--ta/messages/k3b.po46
-rw-r--r--template/messages/k3b.pot581
-rw-r--r--template/messages/libk3b.pot50
-rw-r--r--tr/Makefile.am1
-rw-r--r--tr/messages/Makefile.am3
-rw-r--r--tr/messages/k3b.po51
-rw-r--r--uk/CMakeLists.txt1
-rw-r--r--uk/Makefile.am1
-rw-r--r--uk/doc/CMakeLists.txt6
-rw-r--r--uk/doc/Makefile.am2
-rw-r--r--uk/doc/index.docbook12
-rw-r--r--uk/messages/Makefile.am3
-rw-r--r--uk/messages/k3b.po216
-rw-r--r--uk/messages/libk3b.po80
-rw-r--r--uk/messages/libk3bdevice.po46
-rw-r--r--uz/Makefile.am1
-rw-r--r--uz/messages/Makefile.am3
-rw-r--r--uz/messages/k3b.po51
-rw-r--r--uz@cyrillic/Makefile.am1
-rw-r--r--uz@cyrillic/messages/Makefile.am3
-rw-r--r--uz@cyrillic/messages/k3b.po51
-rw-r--r--zh_CN/Makefile.am1
-rw-r--r--zh_CN/messages/Makefile.am3
-rw-r--r--zh_CN/messages/k3b.po51
-rw-r--r--zh_TW/Makefile.am1
-rw-r--r--zh_TW/messages/Makefile.am3
-rw-r--r--zh_TW/messages/k3b.po95
246 files changed, 2040 insertions, 16268 deletions
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index bdec8fc..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "admin"]
- path = admin
- url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
- path = cmake
- url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index e69de29..0000000
--- a/AUTHORS
+++ /dev/null
diff --git a/CMakeLists.txt b/CMakeLists.txt
index edabbcf..8e1c108 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,13 +9,12 @@
#
#################################################
-cmake_minimum_required( VERSION 2.8 )
+cmake_minimum_required( VERSION 3.1 )
##### general package setup #####################
project( k3b-i18n )
-set( VERSION R14.0.9 )
##### include essential cmake modules ###########
@@ -25,10 +24,14 @@ include( FindPkgConfig ) # required for find_package( TDE )
##### include our cmake modules #################
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )
+##### set version number ########################
+
+tde_set_project_version( )
+
+
##### find required stuff #######################
find_package( TDE )
@@ -42,6 +45,62 @@ tde_setup_paths( )
option( BUILD_DOC "Build documentation" ON )
option( BUILD_MESSAGES "Build message and GUI translation" ON )
+string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
+
+
+###### build documentations for all languages ###
+
+if( BUILD_DOC )
+ file( GLOB_RECURSE _doc_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */doc/* )
+ foreach( _doc_file IN LISTS _doc_files )
+ get_filename_component( _dir ${_doc_file} PATH )
+ list( APPEND _dirs ${_dir} )
+ endforeach()
+ if( _dirs )
+ list( SORT _dirs )
+ list( REMOVE_DUPLICATES _dirs )
+ endif()
+
+ foreach( _doc_dir IN LISTS _dirs )
+ string( REGEX REPLACE "/.*" "" _lang ${_doc_dir} )
+ if( NOT ${_lang} MATCHES "^(html|man|misc|other)$"
+ AND ( ${_lang} STREQUAL "en" OR
+ "${_linguas}" MATCHES "^;*$" OR
+ ";${_linguas};" MATCHES ";${_lang};" ))
+
+ file( GLOB _doc_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${_doc_dir} ${_doc_dir}/*.docbook )
+ if( ${_doc_dir} MATCHES "^${_lang}/doc/[^/]*/" )
+ string( REGEX REPLACE "^${_lang}/doc/(.*)" "\\1" _doc_dest "${_doc_dir}" )
+ else()
+ string( REGEX REPLACE "^${_lang}/doc/(.*)" "\\1" _doc_dest "${_doc_dir}/k3b" )
+ endif()
+ if( _doc_files )
+ list( FIND _doc_files "index.docbook" _find_index )
+ if( -1 EQUAL _find_index )
+ set( _noindex "NOINDEX" )
+ else()
+ unset( _noindex )
+ endif()
+ tde_create_handbook(
+ SOURCE_BASEDIR ${_doc_dir}
+ ${_noindex}
+ LANG ${_lang}
+ DESTINATION ${_doc_dest}
+ )
+ else()
+ file( GLOB _doc_files
+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+ ${_doc_dir}/*.css ${_doc_dir}/*.jpg ${_doc_dir}/*.png )
+ install(
+ FILES ${_doc_files}
+ DESTINATION ${HTML_INSTALL_DIR}/${_lang}/${_doc_dest}
+ )
+ endif()
+ endif()
+ endforeach()
+
+endif()
+
###### build translations for all languages #####
@@ -49,13 +108,9 @@ if( BUILD_MESSAGES )
file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */messages/*.po )
foreach( _po ${po_files} )
- string( REPLACE "/" ";" _path "${_po}" )
- list( GET _path 0 _lang )
- tde_create_translation( FILES ${_po} LANG ${_lang} )
+ string( REGEX REPLACE "/.*" "" _lang ${_po} )
+ if( "${_linguas}" MATCHES "^;*$" OR ";${_linguas};" MATCHES ";${_lang};" )
+ tde_create_translation( FILES ${_po} LANG ${_lang} )
+ endif()
endforeach( )
endif( )
-
-
-###### subdirectories ###########################
-
-tde_auto_add_subdirectories( )
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/ChangeLog
+++ /dev/null
diff --git a/INSTALL b/INSTALL
index 38937e0..722ff76 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1,16 @@
-./configure; make; make install (old school)
+Basic Installation
+==================
+
+k3b-i18n relies on cmake to build.
+
+Here are suggested default options:
+
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index ef74294..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = foreign 1.5
-
-include admin/deps.am
-include admin/Doxyfile.am
-SUBDIRS=$(TOPSUBDIRS)
diff --git a/Makefile.am.in b/Makefile.am.in
deleted file mode 100644
index 4955869..0000000
--- a/Makefile.am.in
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTOMAKE_OPTIONS = foreign 1.5
-
-include admin/deps.am
-include admin/Doxyfile.am
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/NEWS
+++ /dev/null
diff --git a/README b/README
deleted file mode 100644
index 33936f3..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-K3b translation files.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..055a184
--- /dev/null
+++ b/README.md
@@ -0,0 +1,50 @@
+
+ k3b-i18n - internationalized (i18n) files for k3b
+
+
+K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord. Its
+aim is to provide a very user friendly interface to all the tasks that come
+with cd recording.
+
+This module contains the translations for k3b.
+
+.
+
+Contributing
+--------------
+
+If you wish to contribute to k3b-i18n, you might do so:
+
+- TDE Gitea Workspace (TGW) collaboration tool.
+ https://mirror.git.trinitydesktop.org/gitea
+
+- TDE Weblate Translation Workspace (TWTW) collaboration tool.
+ https://mirror.git.trinitydesktop.org/weblate
+
+
+Translations status
+---------------------
+
+### k3b
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/k3b/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/k3b/)
+
+### k3b - device
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/k3b-device/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/k3b-device/)
+
+### k3b - lib
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/k3b-lib/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/k3b-lib/)
+
+### k3b - setup
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/k3b-setup/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/k3b-setup/)
+
+### k3b - tdefile
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/k3b-tdefile/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/k3b-tdefile/)
+
+### k3b - tdeio-videodvd
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/k3b-tdeio-videodvd/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/k3b-tdeio-videodvd/)
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 9c49af3..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,11945 +0,0 @@
-## -*- autoconf -*-
-
-dnl This file is part of the KDE libraries/packages
-dnl Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu)
-dnl (C) 1997,98,99 Stephan Kulow (coolo@kde.org)
-
-dnl This file is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Library General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2 of the License, or (at your option) any later version.
-
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Library General Public License for more details.
-
-dnl You should have received a copy of the GNU Library General Public License
-dnl along with this library; see the file COPYING.LIB. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-dnl Boston, MA 02110-1301, USA.
-
-dnl IMPORTANT NOTE:
-dnl Please do not modify this file unless you expect your modifications to be
-dnl carried into every other module in the repository.
-dnl
-dnl Single-module modifications are best placed in configure.in for tdelibs
-dnl and tdebase or configure.in.in if present.
-
-# KDE_PATH_X_DIRECT
-dnl Internal subroutine of AC_PATH_X.
-dnl Set ac_x_includes and/or ac_x_libraries.
-AC_DEFUN([KDE_PATH_X_DIRECT],
-[
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-if test "$ac_x_includes" = NO; then
- # Guess where to find include files, by looking for this one X11 .h file.
- test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
- # First, try using that file with no special directory specified.
-AC_TRY_CPP([#include <$x_direct_test_include>],
-[# We can compile using X headers with no special include directory.
-ac_x_includes=],
-[# Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
- for ac_dir in \
- /usr/X11/include \
- /usr/X11R6/include \
- /usr/X11R5/include \
- /usr/X11R4/include \
- \
- /usr/include/X11 \
- /usr/include/X11R6 \
- /usr/include/X11R5 \
- /usr/include/X11R4 \
- \
- /usr/local/X11/include \
- /usr/local/X11R6/include \
- /usr/local/X11R5/include \
- /usr/local/X11R4/include \
- \
- /usr/local/include/X11 \
- /usr/local/include/X11R6 \
- /usr/local/include/X11R5 \
- /usr/local/include/X11R4 \
- \
- /usr/X386/include \
- /usr/x386/include \
- /usr/XFree86/include/X11 \
- \
- /usr/include \
- /usr/local/include \
- /usr/unsupported/include \
- /usr/athena/include \
- /usr/local/x11r5/include \
- /usr/lpp/Xamples/include \
- \
- /usr/openwin/include \
- /usr/openwin/share/include \
- ; \
- do
- if test -r "$ac_dir/$x_direct_test_include"; then
- ac_x_includes=$ac_dir
- break
- fi
- done])
-fi # $ac_x_includes = NO
-
-if test "$ac_x_libraries" = NO; then
- # Check for the libraries.
-
- test -z "$x_direct_test_library" && x_direct_test_library=Xt
- test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-
- # See if we find them without any special options.
- # Don't add to $LIBS permanently.
- ac_save_LIBS="$LIBS"
- LIBS="-l$x_direct_test_library $LIBS"
-AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(1)],
-[LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=],
-[LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
- /usr/X11/lib${tdelibsuff} \
- /usr/X11R6/lib${tdelibsuff} \
- /usr/X11R5/lib${tdelibsuff} \
- /usr/X11R4/lib${tdelibsuff} \
- \
- /usr/lib${tdelibsuff}/X11 \
- /usr/lib${tdelibsuff}/X11R6 \
- /usr/lib${tdelibsuff}/X11R5 \
- /usr/lib${tdelibsuff}/X11R4 \
- \
- /usr/local/X11/lib${tdelibsuff} \
- /usr/local/X11R6/lib${tdelibsuff} \
- /usr/local/X11R5/lib${tdelibsuff} \
- /usr/local/X11R4/lib${tdelibsuff} \
- \
- /usr/local/lib${tdelibsuff}/X11 \
- /usr/local/lib${tdelibsuff}/X11R6 \
- /usr/local/lib${tdelibsuff}/X11R5 \
- /usr/local/lib${tdelibsuff}/X11R4 \
- \
- /usr/X386/lib${tdelibsuff} \
- /usr/x386/lib${tdelibsuff} \
- /usr/XFree86/lib${tdelibsuff}/X11 \
- \
- /usr/lib${tdelibsuff} \
- /usr/local/lib${tdelibsuff} \
- /usr/unsupported/lib${tdelibsuff} \
- /usr/athena/lib${tdelibsuff} \
- /usr/local/x11r5/lib${tdelibsuff} \
- /usr/lpp/Xamples/lib${tdelibsuff} \
- /lib/usr/lib${tdelibsuff}/X11 \
- \
- /usr/openwin/lib${tdelibsuff} \
- /usr/openwin/share/lib${tdelibsuff} \
- ; \
-do
-dnl Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
- if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
- ac_x_libraries=$ac_dir
- break 2
- fi
- done
-done])
-fi # $ac_x_libraries = NO
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find a file (or one of more files in a list of dirs)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
- for j in $1;
- do
- echo "configure: __oline__: $i/$j" >&AC_FD_CC
- if test -r "$i/$j"; then
- echo "taking that" >&AC_FD_CC
- $3=$i
- break 2
- fi
- done
-done
-])
-
-dnl KDE_FIND_PATH(program-name, variable-name, list-of-dirs,
-dnl if-not-found, test-parameter, prepend-path)
-dnl
-dnl Look for program-name in list-of-dirs+$PATH.
-dnl If prepend-path is set, look in $PATH+list-of-dirs instead.
-dnl If found, $variable-name is set. If not, if-not-found is evaluated.
-dnl test-parameter: if set, the program is executed with this arg,
-dnl and only a successful exit code is required.
-AC_DEFUN([KDE_FIND_PATH],
-[
- AC_MSG_CHECKING([for $1])
- if test -n "$$2"; then
- kde_cv_path="$$2";
- else
- kde_cache=`echo $1 | sed 'y%./+-%__p_%'`
-
- AC_CACHE_VAL(kde_cv_path_$kde_cache,
- [
- kde_cv_path="NONE"
- kde_save_IFS=$IFS
- IFS=':'
- dirs=""
- for dir in $PATH; do
- dirs="$dirs $dir"
- done
- if test -z "$6"; then dnl Append dirs in PATH (default)
- dirs="$3 $dirs"
- else dnl Prepend dirs in PATH (if 6th arg is set)
- dirs="$dirs $3"
- fi
- IFS=$kde_save_IFS
-
- for dir in $dirs; do
- if test -x "$dir/$1"; then
- if test -n "$5"
- then
- evalstr="$dir/$1 $5 2>&1 "
- if eval $evalstr; then
- kde_cv_path="$dir/$1"
- break
- fi
- else
- kde_cv_path="$dir/$1"
- break
- fi
- fi
- done
-
- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
- ])
-
- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
- fi
-
- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- AC_MSG_RESULT(not found)
- $4
- else
- AC_MSG_RESULT($kde_cv_path)
- $2=$kde_cv_path
-
- fi
-])
-
-AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
-[
- AC_MSG_ERROR([No Qt meta object compiler (moc) found!
-Please check whether you installed Qt correctly.
-You need to have a running moc binary.
-configure tried to run $ac_cv_path_moc and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable MOC to the right one before running
-configure.
-])
-])
-
-AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
-[
- AC_MSG_WARN([No Qt ui compiler (uic) found!
-Please check whether you installed Qt correctly.
-You need to have a running uic binary.
-configure tried to run $ac_cv_path_uic and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable UIC to the right one before running
-configure.
-])
-])
-
-
-AC_DEFUN([KDE_CHECK_UIC_FLAG],
-[
- AC_MSG_CHECKING([whether uic supports -$1 ])
- kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'`
- AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache,
- [
- cat >conftest.ui <<EOT
- <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-EOT
- ac_uic_testrun="$UIC_PATH -$1 $2 conftest.ui >/dev/null"
- if AC_TRY_EVAL(ac_uic_testrun); then
- eval "kde_cv_prog_uic_$kde_cache=yes"
- else
- eval "kde_cv_prog_uic_$kde_cache=no"
- fi
- rm -f conftest*
- ])
-
- if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
- AC_MSG_RESULT([yes])
- :
- $3
- else
- AC_MSG_RESULT([no])
- :
- $4
- fi
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find the meta object compiler and the ui compiler in the PATH,
-dnl in $QTDIR/bin, and some more usual places
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_PATH_QT_MOC_UIC],
-[
- AC_REQUIRE([KDE_CHECK_PERL])
- qt_bindirs=""
- for dir in $kde_qt_dirs; do
- qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
- done
- qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
- if test ! "$ac_qt_bindir" = "NO"; then
- qt_bindirs="$ac_qt_bindir $qt_bindirs"
- fi
-
- KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
- if test -z "$UIC_NOT_NEEDED"; then
- KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
- if test -z "$UIC_PATH" ; then
- KDE_UIC_ERROR_MESSAGE
- exit 1
- else
- UIC=$UIC_PATH
-
- if test $kde_qtver = 3; then
- KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no)
- KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no)
-
- if test x$ac_uic_supports_libpath = xyes; then
- UIC="$UIC -L \$(kde_widgetdir)"
- fi
- if test x$ac_uic_supports_nounload = xyes; then
- UIC="$UIC -nounload"
- fi
- fi
- fi
- else
- UIC="echo uic not available: "
- fi
-
- AC_SUBST(MOC)
- AC_SUBST(UIC)
-
- UIC_TR="i18n"
- if test $kde_qtver = 3; then
- UIC_TR="tr2i18n"
- fi
-
- AC_SUBST(UIC_TR)
-])
-
-AC_DEFUN([KDE_1_CHECK_PATHS],
-[
- KDE_1_CHECK_PATH_HEADERS
-
- KDE_TEST_RPATH=
-
- if test -n "$USE_RPATH"; then
-
- if test -n "$kde_libraries"; then
- KDE_TEST_RPATH="-R $kde_libraries"
- fi
-
- if test -n "$qt_libraries"; then
- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
- fi
-
- if test -n "$x_libraries"; then
- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
- fi
-
- KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
- fi
-
-AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_ERROR([your system fails at linking a small KDE application!
-Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and tdelibs as you did use now.
-For more details about this problem, look at the end of config.log.])
-fi
-
-if eval `TDEDIR= ./conftest 2>&5`; then
- kde_result=done
-else
- kde_result=problems
-fi
-
-TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-kde_have_all_paths=yes
-
-KDE_SET_PATHS($kde_result)
-
-])
-
-AC_DEFUN([KDE_SET_PATHS],
-[
- kde_cv_all_paths="kde_have_all_paths=\"yes\" \
- kde_htmldir=\"$kde_htmldir\" \
- kde_appsdir=\"$kde_appsdir\" \
- kde_icondir=\"$kde_icondir\" \
- kde_sounddir=\"$kde_sounddir\" \
- kde_datadir=\"$kde_datadir\" \
- kde_locale=\"$kde_locale\" \
- kde_cgidir=\"$kde_cgidir\" \
- kde_confdir=\"$kde_confdir\" \
- kde_kcfgdir=\"$kde_kcfgdir\" \
- kde_mimedir=\"$kde_mimedir\" \
- kde_toolbardir=\"$kde_toolbardir\" \
- kde_wallpaperdir=\"$kde_wallpaperdir\" \
- kde_templatesdir=\"$kde_templatesdir\" \
- kde_bindir=\"$kde_bindir\" \
- kde_servicesdir=\"$kde_servicesdir\" \
- kde_servicetypesdir=\"$kde_servicetypesdir\" \
- kde_moduledir=\"$kde_moduledir\" \
- kde_styledir=\"$kde_styledir\" \
- kde_widgetdir=\"$kde_widgetdir\" \
- xdg_appsdir=\"$xdg_appsdir\" \
- xdg_menudir=\"$xdg_menudir\" \
- xdg_directorydir=\"$xdg_directorydir\" \
- kde_result=$1"
-])
-
-AC_DEFUN([KDE_SET_DEFAULT_PATHS],
-[
-if test "$1" = "default"; then
-
- if test -z "$kde_htmldir"; then
- kde_htmldir='\${datadir}/doc/HTML'
- fi
- if test -z "$kde_appsdir"; then
- kde_appsdir='\${datadir}/applnk'
- fi
- if test -z "$kde_icondir"; then
- kde_icondir='\${datadir}/icons'
- fi
- if test -z "$kde_sounddir"; then
- kde_sounddir='\${datadir}/sounds'
- fi
- if test -z "$kde_datadir"; then
- kde_datadir='\${datadir}/apps'
- fi
- if test -z "$kde_locale"; then
- kde_locale='\${datadir}/locale'
- fi
- if test -z "$kde_cgidir"; then
- kde_cgidir='\${exec_prefix}/cgi-bin'
- fi
- if test -z "$kde_confdir"; then
- kde_confdir='\${datadir}/config'
- fi
- if test -z "$kde_kcfgdir"; then
- kde_kcfgdir='\${datadir}/config.kcfg'
- fi
- if test -z "$kde_mimedir"; then
- kde_mimedir='\${datadir}/mimelnk'
- fi
- if test -z "$kde_toolbardir"; then
- kde_toolbardir='\${datadir}/toolbar'
- fi
- if test -z "$kde_wallpaperdir"; then
- kde_wallpaperdir='\${datadir}/wallpapers'
- fi
- if test -z "$kde_templatesdir"; then
- kde_templatesdir='\${datadir}/templates'
- fi
- if test -z "$kde_bindir"; then
- kde_bindir='\${exec_prefix}/bin'
- fi
- if test -z "$kde_servicesdir"; then
- kde_servicesdir='\${datadir}/services'
- fi
- if test -z "$kde_servicetypesdir"; then
- kde_servicetypesdir='\${datadir}/servicetypes'
- fi
- if test -z "$kde_moduledir"; then
- if test "$kde_qtver" = "2"; then
- kde_moduledir='\${libdir}/kde2'
- else
- kde_moduledir='\${libdir}/trinity'
- fi
- fi
- if test -z "$kde_styledir"; then
- kde_styledir='\${libdir}/trinity/plugins/styles'
- fi
- if test -z "$kde_widgetdir"; then
- kde_widgetdir='\${libdir}/trinity/plugins/designer'
- fi
- if test -z "$xdg_appsdir"; then
- xdg_appsdir='\${datadir}/applications/kde'
- fi
- if test -z "$xdg_menudir"; then
- xdg_menudir='\${sysconfdir}/xdg/menus'
- fi
- if test -z "$xdg_directorydir"; then
- xdg_directorydir='\${datadir}/desktop-directories'
- fi
-
- KDE_SET_PATHS(defaults)
-
-else
-
- if test $kde_qtver = 1; then
- AC_MSG_RESULT([compiling])
- KDE_1_CHECK_PATHS
- else
- AC_MSG_ERROR([path checking not yet supported for KDE 2])
- fi
-
-fi
-])
-
-AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS],
-[ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
- test -z "$kde_icondir" || test -z "$kde_sounddir" ||
- test -z "$kde_datadir" || test -z "$kde_locale" ||
- test -z "$kde_cgidir" || test -z "$kde_confdir" ||
- test -z "$kde_kcfgdir" ||
- test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
- test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
- test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
- test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
- test -z "$kde_styledir" || test -z "kde_widgetdir" ||
- test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
- test "x$kde_have_all_paths" != "xyes"; then
- kde_have_all_paths=no
- fi
-])
-
-AC_DEFUN([KDE_MISSING_PROG_ERROR],
-[
- AC_MSG_ERROR([The important program $1 was not found!
-Please check whether you installed KDE correctly.
-])
-])
-
-AC_DEFUN([KDE_MISSING_ARTS_ERROR],
-[
- AC_MSG_ERROR([The important program $1 was not found!
-Please check whether you installed aRts correctly or use
---without-arts to compile without aRts support (this will remove functionality).
-])
-])
-
-AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
-[
- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
- test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
- if test -n "$TDEDIRS"; then
- kde_save_IFS=$IFS
- IFS=:
- for dir in $TDEDIRS; do
- kde_default_bindirs="$dir/bin $kde_default_bindirs "
- done
- IFS=$kde_save_IFS
- fi
-])
-
-AC_DEFUN([KDE_SUBST_PROGRAMS],
-[
- AC_ARG_WITH(arts,
- AC_HELP_STRING([--without-arts],[build without aRts [default=no]]),
- [build_arts=$withval],
- [build_arts=yes]
- )
- AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
- if test "$build_arts" = "no"; then
- AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts])
- fi
-
- KDE_SET_DEFAULT_BINDIRS
- kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
- KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
- KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
- if test "$build_arts" '!=' "no"; then
- KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
- KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
- fi
- KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
-
- kde32ornewer=1
- kde33ornewer=1
- if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
- kde32ornewer=
- kde33ornewer=
- else
- if test "$kde_qtver" = "3"; then
- if test "$kde_qtsubver" -le 1; then
- kde32ornewer=
- fi
- if test "$kde_qtsubver" -le 2; then
- kde33ornewer=
- fi
- if test "$KDECONFIG" != "compiled"; then
- if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
- kde33ornewer=
- fi
- fi
- fi
- fi
-
- if test -n "$kde32ornewer"; then
- KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
- KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
- fi
- if test -n "$kde33ornewer"; then
- KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
- AC_SUBST(MAKETDEWIDGETS)
- fi
- KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
-
- if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
- kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share"
- test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
- AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
- if test "$KDE_XSL_STYLESHEET" = "NO"; then
- KDE_XSL_STYLESHEET=""
- else
- KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/tde-chunk.xsl"
- fi
- fi
-
- DCOP_DEPENDENCIES='$(DCOPIDL)'
- if test -n "$kde32ornewer"; then
- KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
- DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
- AC_SUBST(KCONFIG_COMPILER)
- AC_SUBST(KCFG_DEPENDENCIES)
- AC_SUBST(DCOPIDLNG)
- fi
- AC_SUBST(DCOPIDL)
- AC_SUBST(DCOPIDL2CPP)
- AC_SUBST(DCOP_DEPENDENCIES)
- AC_SUBST(MCOPIDL)
- AC_SUBST(ARTSCCONFIG)
- AC_SUBST(MEINPROC)
- AC_SUBST(KDE_XSL_STYLESHEET)
- AC_SUBST(XMLLINT)
-])dnl
-
-AC_DEFUN([AC_CREATE_KFSSTND],
-[
-AC_REQUIRE([AC_CHECK_RPATH])
-
-AC_MSG_CHECKING([for KDE paths])
-kde_result=""
-kde_cached_paths=yes
-AC_CACHE_VAL(kde_cv_all_paths,
-[
- KDE_SET_DEFAULT_PATHS($1)
- kde_cached_paths=no
-])
-eval "$kde_cv_all_paths"
-KDE_CHECK_PATHS_FOR_COMPLETENESS
-if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
- # wrong values were cached, may be, we can set better ones
- kde_result=
- kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir=
- kde_datadir= kde_locale= kde_cgidir= kde_confdir= kde_kcfgdir=
- kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
- kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
- kde_have_all_paths=
- kde_styledir=
- kde_widgetdir=
- xdg_appsdir = xdg_menudir= xdg_directorydir=
- KDE_SET_DEFAULT_PATHS($1)
- eval "$kde_cv_all_paths"
- KDE_CHECK_PATHS_FOR_COMPLETENESS
- kde_result="$kde_result (cache overridden)"
-fi
-if test "$kde_have_all_paths" = "no"; then
- AC_MSG_ERROR([configure could not run a little KDE program to test the environment.
-Since it had compiled and linked before, it must be a strange problem on your system.
-Look at config.log for details. If you are not able to fix this, look at
-http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-(If you're using an egcs version on Linux, you may update binutils!)
-])
-else
- rm -f conftest*
- AC_MSG_RESULT($kde_result)
-fi
-
-bindir=$kde_bindir
-
-KDE_SUBST_PROGRAMS
-
-])
-
-AC_DEFUN([AC_SUBST_KFSSTND],
-[
-AC_SUBST(kde_htmldir)
-AC_SUBST(kde_appsdir)
-AC_SUBST(kde_icondir)
-AC_SUBST(kde_sounddir)
-AC_SUBST(kde_datadir)
-AC_SUBST(kde_locale)
-AC_SUBST(kde_confdir)
-AC_SUBST(kde_kcfgdir)
-AC_SUBST(kde_mimedir)
-AC_SUBST(kde_wallpaperdir)
-AC_SUBST(kde_bindir)
-dnl X Desktop Group standards
-AC_SUBST(xdg_appsdir)
-AC_SUBST(xdg_menudir)
-AC_SUBST(xdg_directorydir)
-dnl for KDE 2
-AC_SUBST(kde_templatesdir)
-AC_SUBST(kde_servicesdir)
-AC_SUBST(kde_servicetypesdir)
-AC_SUBST(kde_moduledir)
-AC_SUBST(tdeinitdir, '$(kde_moduledir)')
-AC_SUBST(kde_styledir)
-AC_SUBST(kde_widgetdir)
-if test "$kde_qtver" = 1; then
- kde_minidir="$kde_icondir/mini"
-else
-# for KDE 1 - this breaks KDE2 apps using minidir, but
-# that's the plan ;-/
- kde_minidir="/dev/null"
-fi
-dnl AC_SUBST(kde_minidir)
-dnl AC_SUBST(kde_cgidir)
-dnl AC_SUBST(kde_toolbardir)
-])
-
-AC_DEFUN([KDE_MISC_TESTS],
-[
- dnl Checks for libraries.
- AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD
- AC_SUBST(LIBUTIL)
- AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for *BSD
- AC_SUBST(LIBCOMPAT)
- kde_have_crypt=
- AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes],
- AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [
- AC_MSG_WARN([you have no crypt in either libcrypt or libc.
-You should install libcrypt from another source or configure with PAM
-support])
- kde_have_crypt=no
- ]))
- AC_SUBST(LIBCRYPT)
- if test $kde_have_crypt = yes; then
- AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
- fi
- AC_CHECK_SOCKLEN_T
- AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
- AC_CHECK_LIB(dnet_stub, dnet_ntoa,
- [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
- fi
- AC_CHECK_FUNC(inet_ntoa)
- if test $ac_cv_func_inet_ntoa = no; then
- AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
- fi
- AC_CHECK_FUNC(connect)
- if test $ac_cv_func_connect = no; then
- AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
- $X_EXTRA_LIBS)
- fi
-
- AC_CHECK_FUNC(remove)
- if test $ac_cv_func_remove = no; then
- AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
- fi
-
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- AC_CHECK_FUNC(shmat, ,
- AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
-
- # more headers that need to be explicitly included on darwin
- AC_CHECK_HEADERS(sys/types.h stdint.h)
-
- # sys/bitypes.h is needed for uint32_t and friends on Tru64
- AC_CHECK_HEADERS(sys/bitypes.h)
-
- # darwin requires a poll emulation library
- AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
-
- # for some image handling on Mac OS X
- AC_CHECK_HEADERS(Carbon/Carbon.h)
-
- # CoreAudio framework
- AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
- AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
- FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
- ])
-
- AC_CHECK_RES_INIT
- AC_SUBST(LIB_POLL)
- AC_SUBST(FRAMEWORK_COREAUDIO)
- LIBSOCKET="$X_EXTRA_LIBS"
- AC_SUBST(LIBSOCKET)
- AC_SUBST(X_EXTRA_LIBS)
- AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
- AC_SUBST(LIBUCB)
-
- case $host in dnl this *is* LynxOS specific
- *-*-lynxos* )
- AC_MSG_CHECKING([LynxOS header file wrappers])
- [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"]
- AC_MSG_RESULT(disabled)
- AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS
- ;;
- esac
-
- KDE_CHECK_TYPES
- KDE_CHECK_LIBDL
- KDE_CHECK_STRLCPY
- KDE_CHECK_PIE_SUPPORT
-
-# darwin needs this to initialize the environment
-AC_CHECK_HEADERS(crt_externs.h)
-AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])])
-
-AH_VERBATIM(_DARWIN_ENVIRON,
-[
-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-# include <sys/time.h>
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#endif
-])
-
-AH_VERBATIM(_AIX_STRINGS_H_BZERO,
-[
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero.
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-])
-
-AC_CHECK_FUNCS([vsnprintf snprintf])
-
-AH_VERBATIM(_TRU64,[
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-])
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Find the header files and libraries for X-Windows. Extended the
-dnl macro AC_PATH_X
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([K_PATH_X],
-[
-AC_REQUIRE([KDE_MISC_TESTS])dnl
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_ARG_ENABLE(
- embedded,
- AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]),
- kde_use_qt_emb=$enableval,
- kde_use_qt_emb=no
-)
-
-AC_ARG_ENABLE(
- qtopia,
- AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]),
- kde_use_qt_emb_palm=$enableval,
- kde_use_qt_emb_palm=no
-)
-
-AC_ARG_ENABLE(
- mac,
- AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]),
- kde_use_qt_mac=$enableval,
- kde_use_qt_mac=no
-)
-
-# used to disable x11-specific stuff on special platforms
-AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no")
-
-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-
-AC_MSG_CHECKING(for X)
-
-AC_CACHE_VAL(kde_cv_have_x,
-[# One or both of the vars are not set, and there is no cached value.
-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
- kde_x_includes=NO
-else
- kde_x_includes=$x_includes
-fi
-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
- kde_x_libraries=NO
-else
- kde_x_libraries=$x_libraries
-fi
-
-# below we use the standard autoconf calls
-ac_x_libraries=$kde_x_libraries
-ac_x_includes=$kde_x_includes
-
-KDE_PATH_X_DIRECT
-dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries.
-dnl Unfortunately, if compiling with the N32 ABI, this is not the correct
-dnl location. The correct location is /usr/lib32 or an undefined value
-dnl (the linker is smart enough to pick the correct default library).
-dnl Things work just fine if you use just AC_PATH_X_DIRECT.
-dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to
-dnl /usr/openwin/include, which doesn't work. /usr/include does work, so
-dnl x_includes should be left alone.
-case "$host" in
-mips-sgi-irix6*)
- ;;
-*-*-solaris*)
- ;;
-*)
- _AC_PATH_X_XMKMF
- if test -z "$ac_x_includes"; then
- ac_x_includes="."
- fi
- if test -z "$ac_x_libraries"; then
- ac_x_libraries="/usr/lib${tdelibsuff}"
- fi
-esac
-#from now on we use our own again
-
-# when the user already gave --x-includes, we ignore
-# what the standard autoconf macros told us.
-if test "$kde_x_includes" = NO; then
- kde_x_includes=$ac_x_includes
-fi
-
-# for --x-libraries too
-if test "$kde_x_libraries" = NO; then
- kde_x_libraries=$ac_x_libraries
-fi
-
-if test "$kde_x_includes" = NO; then
- AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!])
-fi
-
-if test "$kde_x_libraries" = NO; then
- AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!])
-fi
-
-# Record where we found X for the cache.
-kde_cv_have_x="have_x=yes \
- kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
-])dnl
-
-eval "$kde_cv_have_x"
-
-if test "$have_x" != yes; then
- AC_MSG_RESULT($have_x)
- no_x=yes
-else
- AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes])
-fi
-
-if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
- X_INCLUDES=""
- x_includes="."; dnl better than nothing :-
- else
- x_includes=$kde_x_includes
- X_INCLUDES="-I$x_includes"
-fi
-
-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then
- X_LDFLAGS=""
- x_libraries="/usr/lib"; dnl better than nothing :-
- else
- x_libraries=$kde_x_libraries
- X_LDFLAGS="-L$x_libraries"
-fi
-all_includes="$X_INCLUDES"
-all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS"
-
-# Check for libraries that X11R6 Xt/Xaw programs need.
-ac_save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-# check for ICE first), but we must link in the order -lSM -lICE or
-# we get undefined symbols. So assume we have SM if we have ICE.
-# These have to be linked with before -lX11, unlike the other
-# libraries we check for below, so use a different variable.
-# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-AC_CHECK_LIB(ICE, IceConnectionNumber,
- [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS)
-LDFLAGS="$ac_save_LDFLAGS"
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-
-AC_MSG_CHECKING(for libXext)
-AC_CACHE_VAL(kde_cv_have_libXext,
-[
-kde_ldflags_safe="$LDFLAGS"
-kde_libs_safe="$LIBS"
-
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-LIBS="-lXext -lX11 $LIBSOCKET"
-
-AC_TRY_LINK([
-#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-],
-[
-printf("hello Xext\n");
-],
-kde_cv_have_libXext=yes,
-kde_cv_have_libXext=no
-)
-
-LDFLAGS=$kde_ldflags_safe
-LIBS=$kde_libs_safe
-])
-
-AC_MSG_RESULT($kde_cv_have_libXext)
-
-if test "$kde_cv_have_libXext" = "no"; then
- AC_MSG_ERROR([We need a working libXext to proceed. Since configure
-can't find it itself, we stop here assuming that make wouldn't find
-them either.])
-fi
-
-LIB_XEXT="-lXext"
-QTE_NORTTI=""
-
-elif test "$kde_use_qt_emb" = "yes"; then
- dnl We're using QT Embedded
- CPPFLAGS=-DQWS
- CXXFLAGS="$CXXFLAGS -fno-rtti"
- QTE_NORTTI="-fno-rtti -DQWS"
- X_PRE_LIBS=""
- LIB_X11=""
- LIB_XEXT=""
- LIB_XRENDER=""
- LIBSM=""
- X_INCLUDES=""
- X_LDFLAGS=""
- x_includes=""
- x_libraries=""
-elif test "$kde_use_qt_mac" = "yes"; then
- dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
- dnl be included to get the information) --Sam
- CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
- CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
- X_PRE_LIBS=""
- LIB_X11=""
- LIB_XEXT=""
- LIB_XRENDER=""
- LIBSM=""
- X_INCLUDES=""
- X_LDFLAGS=""
- x_includes=""
- x_libraries=""
-fi
-AC_SUBST(X_PRE_LIBS)
-AC_SUBST(LIB_X11)
-AC_SUBST(LIB_XRENDER)
-AC_SUBST(LIBSM)
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(x_includes)
-AC_SUBST(x_libraries)
-AC_SUBST(QTE_NORTTI)
-AC_SUBST(LIB_XEXT)
-
-])
-
-AC_DEFUN([KDE_PRINT_QT_PROGRAM],
-[
-AC_REQUIRE([KDE_USE_QT])
-cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qglobal.h>
-#include <qapplication.h>
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qevent.h>
-#include <qstring.h>
-#include <qstyle.h>
-EOF
-
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
-#error 1
-#endif
-EOF
-fi
-fi
-
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qcursor.h>
-#include <qstylefactory.h>
-#include <private/qucomextra_p.h>
-EOF
-fi
-
-echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-cat >> conftest.$ac_ext <<EOF
-#error 1
-#endif
-
-int main() {
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
- QStringList *t = new QStringList();
- Q_UNUSED(t);
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
- QString s;
- s.setLatin1("Elvis is alive", 14);
-EOF
-fi
-fi
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
- (void)QStyleFactory::create(QString::null);
- QCursor c(Qt::WhatsThisCursor);
-EOF
-fi
-cat >> conftest.$ac_ext <<EOF
- return 0;
-}
-EOF
-])
-
-AC_DEFUN([KDE_USE_QT],
-[
-if test -z "$1"; then
- # Current default Qt version: 3.3
- kde_qtver=3
- kde_qtsubver=3
-else
- kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
- # following is the check if subversion isnt found in passed argument
- if test "$kde_qtsubver" = "$1"; then
- kde_qtsubver=1
- fi
- kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
- if test "$kde_qtver" = "1"; then
- kde_qtsubver=42
- fi
-fi
-
-if test -z "$2"; then
- if test "$kde_qtver" = "2"; then
- if test $kde_qtsubver -gt 0; then
- kde_qt_minversion=">= Qt 2.2.2"
- else
- kde_qt_minversion=">= Qt 2.0.2"
- fi
- fi
- if test "$kde_qtver" = "3"; then
- if test $kde_qtsubver -gt 0; then
- if test $kde_qtsubver -gt 1; then
- if test $kde_qtsubver -gt 2; then
- kde_qt_minversion=">= Qt 3.3 and < 4.0"
- else
- kde_qt_minversion=">= Qt 3.2 and < 4.0"
- fi
- else
- kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0"
- fi
- else
- kde_qt_minversion=">= Qt 3.0 and < 4.0"
- fi
- fi
- if test "$kde_qtver" = "1"; then
- kde_qt_minversion=">= 1.42 and < 2.0"
- fi
-else
- kde_qt_minversion="$2"
-fi
-
-if test -z "$3"; then
- if test $kde_qtver = 3; then
- if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
- qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
- kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
- else
- kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
- fi
- fi
- if test $kde_qtver = 2; then
- if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="QT_VERSION >= 222"
- else
- kde_qt_verstring="QT_VERSION >= 200"
- fi
- fi
- if test $kde_qtver = 1; then
- kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
- fi
-else
- kde_qt_verstring="$3"
-fi
-
-if test $kde_qtver = 4; then
- kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
-fi
-if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${tdelibsuff}/qt-3.3"
- if test -z "$PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- fi
- if test "$PKG_CONFIG" != "no" ; then
- if $PKG_CONFIG --exists qt-mt ; then
- kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
- fi
- fi
-fi
-if test $kde_qtver = 2; then
- kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-fi
-if test $kde_qtver = 1; then
- kde_qt_dirs="$QTDIR /usr/lib/qt"
-fi
-])
-
-AC_DEFUN([KDE_CHECK_QT_DIRECT],
-[
-AC_REQUIRE([KDE_USE_QT])
-AC_MSG_CHECKING([if Qt compiles without flags])
-AC_CACHE_VAL(kde_cv_qt_direct,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_includes"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-else
-LIBS="$LIBQT $LIBSOCKET"
-fi
-LD_LIBRARY_PATH=
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-KDE_PRINT_QT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
- kde_cv_qt_direct="yes"
-else
- kde_cv_qt_direct="no"
- echo "configure: failed program was:" >&AC_FD_CC
- cat conftest.$ac_ext >&AC_FD_CC
-fi
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-AC_LANG_RESTORE
-])
-
-if test "$kde_cv_qt_direct" = "yes"; then
- AC_MSG_RESULT(yes)
- $1
-else
- AC_MSG_RESULT(no)
- $2
-fi
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the Qt headers and libraries.
-dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_PATH_QT_1_3],
-[
-AC_REQUIRE([K_PATH_X])
-AC_REQUIRE([KDE_USE_QT])
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-dnl ------------------------------------------------------------------------
-dnl Add configure flag to enable linking to MT version of Qt library.
-dnl ------------------------------------------------------------------------
-
-AC_ARG_ENABLE(
- mt,
- AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]),
- kde_use_qt_mt=$enableval,
- [
- if test $kde_qtver = 3; then
- kde_use_qt_mt=yes
- else
- kde_use_qt_mt=no
- fi
- ]
-)
-
-USING_QT_MT=""
-
-dnl ------------------------------------------------------------------------
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
-dnl ------------------------------------------------------------------------
-
-KDE_MT_LDFLAGS=
-KDE_MT_LIBS=
-if test "x$kde_use_qt_mt" = "xyes"; then
- KDE_CHECK_THREADING
- if test "x$kde_use_threading" = "xyes"; then
- CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
- KDE_MT_LDFLAGS="$USE_THREADS"
- KDE_MT_LIBS="$LIBPTHREAD"
- else
- kde_use_qt_mt=no
- fi
-fi
-AC_SUBST(KDE_MT_LDFLAGS)
-AC_SUBST(KDE_MT_LIBS)
-
-kde_qt_was_given=yes
-
-dnl ------------------------------------------------------------------------
-dnl If we haven't been told how to link to Qt, we work it out for ourselves.
-dnl ------------------------------------------------------------------------
-if test -z "$LIBQT_GLOB"; then
- if test "x$kde_use_qt_emb" = "xyes"; then
- LIBQT_GLOB="libqte.*"
- else
- LIBQT_GLOB="libqt.*"
- fi
-fi
-
-dnl ------------------------------------------------------------
-dnl If we got --enable-embedded then adjust the Qt library name.
-dnl ------------------------------------------------------------
-if test "x$kde_use_qt_emb" = "xyes"; then
- qtlib="qte"
-else
- qtlib="qt"
-fi
-
-kde_int_qt="-l$qtlib"
-
-if test -z "$LIBQPE"; then
-dnl ------------------------------------------------------------
-dnl If we got --enable-palmtop then add -lqpe to the link line
-dnl ------------------------------------------------------------
- if test "x$kde_use_qt_emb" = "xyes"; then
- if test "x$kde_use_qt_emb_palm" = "xyes"; then
- LIB_QPE="-lqpe"
- else
- LIB_QPE=""
- fi
- else
- LIB_QPE=""
- fi
-fi
-
-dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
-dnl ------------------------------------------------------------------------
-
-if test "x$kde_use_qt_mt" = "xyes"; then
- LIBQT="-l$qtlib-mt"
- kde_int_qt="-l$qtlib-mt"
- LIBQT_GLOB="lib$qtlib-mt.*"
- USING_QT_MT="using -mt"
-else
- LIBQT="-l$qtlib"
-fi
-
-if test $kde_qtver != 1; then
-
- AC_REQUIRE([AC_FIND_PNG])
- AC_REQUIRE([AC_FIND_JPEG])
- LIBQT="$LIBQT $LIBPNG $LIBJPEG"
-fi
-
-if test $kde_qtver = 3; then
- AC_REQUIRE([KDE_CHECK_LIBDL])
- LIBQT="$LIBQT $LIBDL"
-fi
-
-AC_MSG_CHECKING([for Qt])
-
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-fi
-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-qt_libraries=""
-qt_includes=""
-AC_ARG_WITH(qt-dir,
- AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
- [ ac_qt_includes="$withval"/include
- ac_qt_libraries="$withval"/lib${tdelibsuff}
- ac_qt_bindir="$withval"/bin
- ])
-
-AC_ARG_WITH(qt-includes,
- AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
- [
- ac_qt_includes="$withval"
- ])
-
-kde_qt_libs_given=no
-
-AC_ARG_WITH(qt-libraries,
- AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
- [ ac_qt_libraries="$withval"
- kde_qt_libs_given=yes
- ])
-
-AC_CACHE_VAL(ac_cv_have_qt,
-[#try to guess Qt locations
-
-qt_incdirs=""
-for dir in $kde_qt_dirs; do
- qt_incdirs="$qt_incdirs $dir/include $dir"
-done
-if test -z "$PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-fi
-if test "$PKG_CONFIG" != "no" ; then
- if $PKG_CONFIG --exists qt-mt ; then
- qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
- fi
-fi
-qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
-if test ! "$ac_qt_includes" = "NO"; then
- qt_incdirs="$ac_qt_includes $qt_incdirs"
-fi
-
-if test "$kde_qtver" != "1"; then
- kde_qt_header=qstyle.h
-else
- kde_qt_header=qglobal.h
-fi
-
-AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
-ac_qt_includes="$qt_incdir"
-
-qt_libdirs=""
-for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir/lib $dir"
-done
-if test -z "$PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-fi
-if test "$PKG_CONFIG" != "no" ; then
- if $PKG_CONFIG --exists qt-mt ; then
- qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
- fi
-fi
-qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
-if test ! "$ac_qt_libraries" = "NO"; then
- qt_libdir=$ac_qt_libraries
-else
- qt_libdirs="$ac_qt_libraries $qt_libdirs"
- # if the Qt was given, the chance is too big that libqt.* doesn't exist
- qt_libdir=NONE
- for dir in $qt_libdirs; do
- try="ls -1 $dir/${LIBQT_GLOB}"
- if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
- done
-fi
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
- if test -e "$a"; then
- LIBQT="$LIBQT ${kde_int_qt}_incremental"
- break
- fi
-done
-
-ac_qt_libraries="$qt_libdir"
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
-
-KDE_PRINT_QT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
- rm -f conftest*
-else
- echo "configure: failed program was:" >&AC_FD_CC
- cat conftest.$ac_ext >&AC_FD_CC
- ac_qt_libraries="NO"
-fi
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-AC_LANG_RESTORE
-if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
- ac_cv_have_qt="have_qt=no"
- ac_qt_notfound=""
- missing_qt_mt=""
- if test "$ac_qt_includes" = NO; then
- if test "$ac_qt_libraries" = NO; then
- ac_qt_notfound="(headers and libraries)";
- else
- ac_qt_notfound="(headers)";
- fi
- else
- if test "x$kde_use_qt_mt" = "xyes"; then
- missing_qt_mt="
-Make sure that you have compiled Qt with thread support!"
- ac_qt_notfound="(library $qtlib-mt)";
- else
- ac_qt_notfound="(library $qtlib)";
- fi
- fi
-
- AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-For more details about this problem, look at the end of config.log.$missing_qt_mt])
-else
- have_qt="yes"
-fi
-])
-
-eval "$ac_cv_have_qt"
-
-if test "$have_qt" != yes; then
- AC_MSG_RESULT([$have_qt]);
-else
- ac_cv_have_qt="have_qt=yes \
- ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
- AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT])
-
- qt_libraries="$ac_qt_libraries"
- qt_includes="$ac_qt_includes"
-fi
-
-if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
- KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
-fi
-
-AC_SUBST(qt_libraries)
-AC_SUBST(qt_includes)
-
-if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
-else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
-fi
-
-if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
- QT_LDFLAGS=""
-else
- QT_LDFLAGS="-L$qt_libraries"
- all_libraries="$QT_LDFLAGS $all_libraries"
-fi
-test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
-
-AC_SUBST(QT_INCLUDES)
-AC_SUBST(QT_LDFLAGS)
-AC_PATH_QT_MOC_UIC
-
-KDE_CHECK_QT_JPEG
-
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
-else
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
-fi
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
- if test -e "$a"; then
- LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
- break
- fi
-done
-
-AC_SUBST(LIB_QT)
-AC_SUBST(LIB_QPE)
-
-AC_SUBST(kde_qtver)
-])
-
-AC_DEFUN([AC_PATH_QT],
-[
-AC_PATH_QT_1_3
-])
-
-AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
-[
-AC_REQUIRE([AC_PATH_QT_MOC_UIC])
-
-if test x$ac_uic_supports_libpath = xyes; then
-
-AC_MSG_CHECKING([if UIC has KDE plugins available])
-AC_CACHE_VAL(kde_cv_uic_plugins,
-[
-cat > actest.ui << EOF
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>NewConnectionDialog</class>
-<widget class="QDialog">
- <widget class="KLineEdit">
- <property name="name">
- <cstring>testInput</cstring>
- </property>
- </widget>
-</widget>
-</UI>
-EOF
-
-
-
-kde_cv_uic_plugins=no
-kde_line="$UIC_PATH -L $kde_widgetdir"
-if test x$ac_uic_supports_nounload = xyes; then
- kde_line="$kde_line -nounload"
-fi
-kde_line="$kde_line -impl actest.h actest.ui > actest.cpp"
-if AC_TRY_EVAL(kde_line); then
- # if you're trying to debug this check and think it's incorrect,
- # better check your installation. The check _is_ correct - your
- # installation is not.
- if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then
- kde_cv_uic_plugins=yes
- fi
-fi
-rm -f actest.ui actest.cpp
-])
-
-AC_MSG_RESULT([$kde_cv_uic_plugins])
-if test "$kde_cv_uic_plugins" != yes; then
- AC_MSG_ERROR([
-you need to install tdelibs first.
-
-If you did install tdelibs, then the Qt version that is picked up by
-this configure is not the same version you used to compile tdelibs.
-The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
-_same Qt version_, compiled with the _same compiler_ and the same Qt
-configuration settings.
-])
-fi
-fi
-])
-
-AC_DEFUN([KDE_CHECK_FINAL],
-[
- AC_ARG_ENABLE(final,
- AC_HELP_STRING([--enable-final],
- [build size optimized apps (experimental - needs lots of memory)]),
- kde_use_final=$enableval, kde_use_final=no)
-
- if test "x$kde_use_final" = "xyes"; then
- KDE_USE_FINAL_TRUE=""
- KDE_USE_FINAL_FALSE="#"
- else
- KDE_USE_FINAL_TRUE="#"
- KDE_USE_FINAL_FALSE=""
- fi
- AC_SUBST(KDE_USE_FINAL_TRUE)
- AC_SUBST(KDE_USE_FINAL_FALSE)
-])
-
-AC_DEFUN([KDE_CHECK_CLOSURE],
-[
- AC_ARG_ENABLE(closure,
- AC_HELP_STRING([--enable-closure],[delay template instantiation]),
- kde_use_closure=$enableval, kde_use_closure=no)
-
- KDE_NO_UNDEFINED=""
- if test "x$kde_use_closure" = "xyes"; then
- KDE_USE_CLOSURE_TRUE=""
- KDE_USE_CLOSURE_FALSE="#"
-# CXXFLAGS="$CXXFLAGS $REPO"
- else
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
- case $host in
- *-*-linux-gnu)
- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
- [KDE_NO_UNDEFINED=""])],
- [KDE_NO_UNDEFINED=""])
- ;;
- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
- AC_SUBST(KDE_NO_UNDEFINED)
-])
-
-dnl Check if the linker supports --enable-new-dtags and --as-needed
-AC_DEFUN([KDE_CHECK_NEW_LDFLAGS],
-[
- AC_ARG_ENABLE(new_ldflags,
- AC_HELP_STRING([--enable-new-ldflags],
- [enable the new linker flags]),
- kde_use_new_ldflags=$enableval,
- kde_use_new_ldflags=no)
-
- LDFLAGS_AS_NEEDED=""
- LDFLAGS_NEW_DTAGS=""
- if test "x$kde_use_new_ldflags" = "xyes"; then
- LDFLAGS_NEW_DTAGS=""
- KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags],
- [LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],)
-
- KDE_CHECK_COMPILER_FLAG([Wl,--as-needed],
- [LDFLAGS_AS_NEEDED="-Wl,--as-needed"],)
- fi
- AC_SUBST(LDFLAGS_AS_NEEDED)
- AC_SUBST(LDFLAGS_NEW_DTAGS)
-])
-
-AC_DEFUN([KDE_CHECK_NMCHECK],
-[
- AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]),
- kde_use_nmcheck=$enableval, kde_use_nmcheck=no)
-
- if test "$kde_use_nmcheck" = "yes"; then
- KDE_USE_NMCHECK_TRUE=""
- KDE_USE_NMCHECK_FALSE="#"
- else
- KDE_USE_NMCHECK_TRUE="#"
- KDE_USE_NMCHECK_FALSE=""
- fi
- AC_SUBST(KDE_USE_NMCHECK_TRUE)
- AC_SUBST(KDE_USE_NMCHECK_FALSE)
-])
-
-AC_DEFUN([KDE_EXPAND_MAKEVAR], [
-savex=$exec_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-tmp=$$2
-while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done
-exec_prefix=$savex
-])
-
-dnl ------------------------------------------------------------------------
-dnl Now, the same with KDE
-dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed)
-dnl and $(kde_includes) will be the kdehdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_BASE_PATH_KDE],
-[
-AC_REQUIRE([KDE_CHECK_STL])
-AC_REQUIRE([AC_PATH_QT])dnl
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_CHECK_RPATH
-AC_MSG_CHECKING([for KDE])
-
-if test "${prefix}" != NONE; then
- kde_includes=${includedir}
- KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
-
- kde_libraries=${libdir}
- KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
-
-else
- ac_kde_includes=
- ac_kde_libraries=
- kde_libraries=""
- kde_includes=""
-fi
-
-AC_CACHE_VAL(ac_cv_have_kde,
-[#try to guess kde locations
-
-if test "$kde_qtver" = 1; then
- kde_check_header="ksock.h"
- kde_check_lib="libtdecore.la"
-else
- kde_check_header="ksharedptr.h"
- kde_check_lib="libtdeio.la"
-fi
-
-if test -z "$1"; then
-
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
-test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
-kde_incdirs="$ac_kde_includes $kde_incdirs"
-AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
-ac_kde_includes="$kde_incdir"
-
-if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
- AC_MSG_ERROR([
-in the prefix, you've chosen, are no KDE headers installed. This will fail.
-So, check this please and use another prefix!])
-fi
-
-kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
-test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
-AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
-ac_kde_libraries="$kde_libdir"
-
-kde_widgetdir=NO
-dnl this might be somewhere else
-AC_FIND_FILE("trinity/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir)
-
-if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
-AC_MSG_ERROR([
-in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-So, check this please and use another prefix!])
-fi
-
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/tdewidgets.la"; then
-AC_MSG_ERROR([
-I can't find the designer plugins. These are required and should have been installed
-by tdelibs])
-fi
-
-if test -n "$kde_widgetdir"; then
- kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
-fi
-
-
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then
- ac_cv_have_kde="have_kde=no"
-else
- ac_cv_have_kde="have_kde=yes \
- ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-fi
-
-else dnl test -z $1, e.g. from tdelibs
-
- ac_cv_have_kde="have_kde=no"
-
-fi
-])dnl
-
-eval "$ac_cv_have_kde"
-
-if test "$have_kde" != "yes"; then
- if test "${prefix}" = NONE; then
- ac_kde_prefix="$ac_default_prefix"
- else
- ac_kde_prefix="$prefix"
- fi
- if test "$exec_prefix" = NONE; then
- ac_kde_exec_prefix="$ac_kde_prefix"
- AC_MSG_RESULT([will be installed in $ac_kde_prefix])
- else
- ac_kde_exec_prefix="$exec_prefix"
- AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix])
- fi
-
- kde_libraries="${libdir}"
- kde_includes="${includedir}"
-
-else
- ac_cv_have_kde="have_kde=yes \
- ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
- AC_MSG_RESULT([libraries $ac_kde_libraries, headers $ac_kde_includes])
-
- kde_libraries="$ac_kde_libraries"
- kde_includes="$ac_kde_includes"
-fi
-AC_SUBST(kde_libraries)
-AC_SUBST(kde_includes)
-
-if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" || test "$kde_includes" = "/usr/include"; then
- KDE_INCLUDES=""
-else
- KDE_INCLUDES="-I$kde_includes"
- all_includes="$KDE_INCLUDES $all_includes"
-fi
-
-KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"
-
-KDE_LDFLAGS="-L$kde_libraries"
-if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then
- all_libraries="$KDE_LDFLAGS $all_libraries"
-fi
-
-AC_SUBST(KDE_LDFLAGS)
-AC_SUBST(KDE_INCLUDES)
-
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-all_libraries="$all_libraries $USER_LDFLAGS"
-all_includes="$all_includes $USER_INCLUDES"
-AC_SUBST(all_includes)
-AC_SUBST(all_libraries)
-
-if test -z "$1"; then
-KDE_CHECK_UIC_PLUGINS
-fi
-
-ac_kde_libraries="$kde_libdir"
-
-AC_SUBST(AUTODIRS)
-
-
-])
-
-AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
-[
-AC_MSG_CHECKING(for extra includes)
-AC_ARG_WITH(extra-includes,AC_HELP_STRING([--with-extra-includes=DIR],[adds non standard include paths]),
- kde_use_extra_includes="$withval",
- kde_use_extra_includes=NONE
-)
-kde_extra_includes=
-if test -n "$kde_use_extra_includes" && \
- test "$kde_use_extra_includes" != "NONE"; then
-
- ac_save_ifs=$IFS
- IFS=':'
- for dir in $kde_use_extra_includes; do
- kde_extra_includes="$kde_extra_includes $dir"
- USER_INCLUDES="$USER_INCLUDES -I$dir"
- done
- IFS=$ac_save_ifs
- kde_use_extra_includes="added"
-else
- kde_use_extra_includes="no"
-fi
-AC_SUBST(USER_INCLUDES)
-
-AC_MSG_RESULT($kde_use_extra_includes)
-
-kde_extra_libs=
-AC_MSG_CHECKING(for extra libs)
-AC_ARG_WITH(extra-libs,AC_HELP_STRING([--with-extra-libs=DIR],[adds non standard library paths]),
- kde_use_extra_libs=$withval,
- kde_use_extra_libs=NONE
-)
-if test -n "$kde_use_extra_libs" && \
- test "$kde_use_extra_libs" != "NONE"; then
-
- ac_save_ifs=$IFS
- IFS=':'
- for dir in $kde_use_extra_libs; do
- kde_extra_libs="$kde_extra_libs $dir"
- KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
- USER_LDFLAGS="$USER_LDFLAGS -L$dir"
- done
- IFS=$ac_save_ifs
- kde_use_extra_libs="added"
-else
- kde_use_extra_libs="no"
-fi
-
-AC_SUBST(USER_LDFLAGS)
-
-AC_MSG_RESULT($kde_use_extra_libs)
-
-])
-
-AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
-[
- AC_MSG_CHECKING([for KDE headers installed])
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-cat > conftest.$ac_ext <<EOF
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-#include <stdio.h>
-#include "confdefs.h"
-#include <kapp.h>
-
-int main() {
- printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
- printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
- printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
- printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
- printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
- printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
- printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
- printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
- printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
- printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
- printf("kde_wallpaperdir=\\"%s\\"\n",
- TDEApplication::kde_wallpaperdir().data());
- printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
- printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
- printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
- printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
- printf("kde_moduledir=\\"/tmp/dummy\\"\n");
- printf("kde_styledir=\\"/tmp/dummy\\"\n");
- printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
- printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
- printf("xdg_menudir=\\"/tmp/dummy\\"\n");
- printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
- printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
- return 0;
- }
-EOF
-
- ac_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$all_includes $CPPFLAGS"
- if AC_TRY_EVAL(ac_compile); then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_ERROR([your system is not able to compile a small KDE application!
-Check, if you installed the KDE header files correctly.
-For more details about this problem, look at the end of config.log.])
- fi
- CPPFLAGS=$ac_save_CPPFLAGS
-
- AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_CHECK_KDEQTADDON],
-[
-AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
-[
- kde_ldflags_safe="$LDFLAGS"
- kde_libs_safe="$LIBS"
- kde_cxxflags_safe="$CXXFLAGS"
-
- LIBS="-lkde-qt-addon $LIBQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
- LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
-
- AC_TRY_LINK([
- #include <qdom.h>
- ],
- [
- QDomDocument doc;
- ],
- kde_cv_have_kdeqtaddon=yes,
- kde_cv_have_kdeqtaddon=no
- )
-
- LDFLAGS=$kde_ldflags_safe
- LIBS=$kde_libs_safe
- CXXFLAGS=$kde_cxxflags_safe
-])
-
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
-
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
- AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
-It is a separate package (and CVS module) named kde-qt-addon.])
-fi
-])
-
-AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
-[
- AC_REQUIRE([KDE_MISC_TESTS])
- AC_REQUIRE([KDE_CHECK_LIBDL])
- AC_REQUIRE([K_PATH_X])
-
-if test $kde_qtver = 3; then
- case $host in
- *cygwin*) lib_kded="-ltdeinit_kded" ;;
- *) lib_kded="" ;;
- esac
- AC_SUBST(LIB_KDED, $lib_kded)
- AC_SUBST(LIB_TDECORE, "-ltdecore")
- AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_TDEIO, "-ltdeio")
- AC_SUBST(LIB_KJS, "-lkjs")
- AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_KAB, "-lkab")
- AC_SUBST(LIB_TDEABC, "-ltdeabc")
- AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_TDESPELL, "-ltdespell")
- AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
- AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
- AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
- AC_SUBST(LIB_TDEPIM, "-ltdepim")
- AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
- AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
- AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
- AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
-# these are for backward compatibility
- AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
- AC_SUBST(LIB_TDEFILE, "-ltdeio")
-elif test $kde_qtver = 2; then
- AC_SUBST(LIB_TDECORE, "-ltdecore")
- AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_TDEIO, "-ltdeio")
- AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
- AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_TDEFILE, "-ltdefile")
- AC_SUBST(LIB_KAB, "-lkab")
- AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_TDESPELL, "-ltdespell")
- AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
- AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-else
- AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
- AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
- AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
- AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
- AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
-fi
-])
-
-AC_DEFUN([AC_PATH_KDE],
-[
- AC_BASE_PATH_KDE
- AC_ARG_ENABLE(path-check,AC_HELP_STRING([--disable-path-check],[don't try to find out, where to install]),
- [
- if test "$enableval" = "no";
- then ac_use_path_checking="default"
- else ac_use_path_checking=""
- fi
- ],
- [
- if test "$kde_qtver" = 1;
- then ac_use_path_checking=""
- else ac_use_path_checking="default"
- fi
- ]
- )
-
- AC_CREATE_KFSSTND($ac_use_path_checking)
-
- AC_SUBST_KFSSTND
- KDE_CREATE_LIBS_ALIASES
-])
-
-dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found])
-AC_DEFUN([KDE_CHECK_FUNC_EXT],
-[
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(kde_cv_func_$1,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-kde_safe_LIBS="$LIBS"
-LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_COMPILE([
-$2
-],
-[
-$3
-],
-kde_cv_func_$1=yes,
-kde_cv_func_$1=no)
-CXXFLAGS="$save_CXXFLAGS"
-LIBS="$kde_safe_LIBS"
-AC_LANG_RESTORE
-])
-
-AC_MSG_RESULT($kde_cv_func_$1)
-
-AC_MSG_CHECKING([if $1 needs custom prototype])
-AC_CACHE_VAL(kde_cv_proto_$1,
-[
-if test "x$kde_cv_func_$1" = xyes; then
- kde_cv_proto_$1=no
-else
- case "$1" in
- setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
- kde_cv_proto_$1="yes - in libtdefakes"
- ;;
- *)
- kde_cv_proto_$1=unknown
- ;;
- esac
-fi
-
-if test "x$kde_cv_proto_$1" = xunknown; then
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
- kde_safe_libs=$LIBS
- LIBS="$LIBS $X_EXTRA_LIBS"
- AC_TRY_LINK([
-$2
-
-extern "C" $4;
-],
-[
-$3
-],
-[ kde_cv_func_$1=yes
- kde_cv_proto_$1=yes ],
- [kde_cv_proto_$1="$1 unavailable"]
-)
-LIBS=$kde_safe_libs
-AC_LANG_RESTORE
-fi
-])
-AC_MSG_RESULT($kde_cv_proto_$1)
-
-if test "x$kde_cv_func_$1" = xyes; then
- AC_DEFINE(HAVE_$5, 1, [Define if you have $1])
- $6
-fi
-if test "x$kde_cv_proto_$1" = xno; then
- AC_DEFINE(HAVE_$5_PROTO, 1,
- [Define if you have the $1 prototype])
-fi
-
-AH_VERBATIM([_HAVE_$5_PROTO],
-[
-#if !defined(HAVE_$5_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-$4;
-#ifdef __cplusplus
-}
-#endif
-#endif
-])
-])
-
-AC_DEFUN([AC_CHECK_SETENV],
-[
- KDE_CHECK_FUNC_EXT(setenv, [
-#include <stdlib.h>
-],
- [setenv("VAR", "VALUE", 1);],
- [int setenv (const char *, const char *, int)],
- [SETENV])
-])
-
-AC_DEFUN([AC_CHECK_UNSETENV],
-[
- KDE_CHECK_FUNC_EXT(unsetenv, [
-#include <stdlib.h>
-],
- [unsetenv("VAR");],
- [void unsetenv (const char *)],
- [UNSETENV])
-])
-
-AC_DEFUN([AC_CHECK_GETDOMAINNAME],
-[
- KDE_CHECK_FUNC_EXT(getdomainname, [
-#include <stdlib.h>
-#include <unistd.h>
-#include <netdb.h>
-],
- [
-char buffer[200];
-getdomainname(buffer, 200);
-],
- [#include <sys/types.h>
- int getdomainname (char *, size_t)],
- [GETDOMAINNAME])
-])
-
-AC_DEFUN([AC_CHECK_GETHOSTNAME],
-[
- KDE_CHECK_FUNC_EXT(gethostname, [
-#include <stdlib.h>
-#include <unistd.h>
-],
- [
-char buffer[200];
-gethostname(buffer, 200);
-],
- [int gethostname (char *, unsigned int)],
- [GETHOSTNAME])
-])
-
-AC_DEFUN([AC_CHECK_USLEEP],
-[
- KDE_CHECK_FUNC_EXT(usleep, [
-#include <unistd.h>
-],
- [
-usleep(200);
-],
- [int usleep (unsigned int)],
- [USLEEP])
-])
-
-
-AC_DEFUN([AC_CHECK_RANDOM],
-[
- KDE_CHECK_FUNC_EXT(random, [
-#include <stdlib.h>
-],
- [
-random();
-],
- [long int random(void)],
- [RANDOM])
-
- KDE_CHECK_FUNC_EXT(srandom, [
-#include <stdlib.h>
-],
- [
-srandom(27);
-],
- [void srandom(unsigned int)],
- [SRANDOM])
-
-])
-
-AC_DEFUN([AC_CHECK_INITGROUPS],
-[
- KDE_CHECK_FUNC_EXT(initgroups, [
-#include <sys/types.h>
-#include <unistd.h>
-#include <grp.h>
-],
- [
-char buffer[200];
-initgroups(buffer, 27);
-],
- [int initgroups(const char *, gid_t)],
- [INITGROUPS])
-])
-
-AC_DEFUN([AC_CHECK_MKSTEMPS],
-[
- KDE_CHECK_FUNC_EXT(mkstemps, [
-#include <stdlib.h>
-#include <unistd.h>
-],
- [
-mkstemps("/tmp/aaaXXXXXX", 6);
-],
- [int mkstemps(char *, int)],
- [MKSTEMPS])
-])
-
-AC_DEFUN([AC_CHECK_MKSTEMP],
-[
- KDE_CHECK_FUNC_EXT(mkstemp, [
-#include <stdlib.h>
-#include <unistd.h>
-],
- [
-mkstemp("/tmp/aaaXXXXXX");
-],
- [int mkstemp(char *)],
- [MKSTEMP])
-])
-
-AC_DEFUN([AC_CHECK_MKDTEMP],
-[
- KDE_CHECK_FUNC_EXT(mkdtemp, [
-#include <stdlib.h>
-#include <unistd.h>
-],
- [
-mkdtemp("/tmp/aaaXXXXXX");
-],
- [char *mkdtemp(char *)],
- [MKDTEMP])
-])
-
-
-AC_DEFUN([AC_CHECK_RES_INIT],
-[
- AC_MSG_CHECKING([if res_init needs -lresolv])
- kde_libs_safe="$LIBS"
- LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
- AC_TRY_LINK(
- [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
- ],
- [
- res_init();
- ],
- [
- LIBRESOLV="-lresolv"
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
- ],
- [ AC_MSG_RESULT(no) ]
- )
- LIBS=$kde_libs_safe
- AC_SUBST(LIBRESOLV)
-
- KDE_CHECK_FUNC_EXT(res_init,
- [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
- ],
- [res_init()],
- [int res_init(void)],
- [RES_INIT])
-])
-
-AC_DEFUN([AC_CHECK_STRLCPY],
-[
- KDE_CHECK_FUNC_EXT(strlcpy, [
-#include <string.h>
-],
-[ char buf[20];
- strlcpy(buf, "KDE function test", sizeof(buf));
-],
- [unsigned long strlcpy(char*, const char*, unsigned long)],
- [STRLCPY])
-])
-
-AC_DEFUN([AC_CHECK_STRLCAT],
-[
- KDE_CHECK_FUNC_EXT(strlcat, [
-#include <string.h>
-],
-[ char buf[20];
- buf[0]='\0';
- strlcat(buf, "KDE function test", sizeof(buf));
-],
- [unsigned long strlcat(char*, const char*, unsigned long)],
- [STRLCAT])
-])
-
-AC_DEFUN([AC_CHECK_RES_QUERY],
-[
- KDE_CHECK_FUNC_EXT(res_query, [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-#include <netdb.h>
-],
-[
-res_query(NULL, 0, 0, NULL, 0);
-],
- [int res_query(const char *, int, int, unsigned char *, int)],
- [RES_QUERY])
-])
-
-AC_DEFUN([AC_CHECK_DN_SKIPNAME],
-[
- KDE_CHECK_FUNC_EXT(dn_skipname, [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-],
-[
-dn_skipname (NULL, NULL);
-],
- [int dn_skipname (unsigned char *, unsigned char *)],
- [DN_SKIPNAME])
-])
-
-
-AC_DEFUN([AC_FIND_GIF],
- [AC_MSG_CHECKING([for giflib])
-AC_CACHE_VAL(ac_cv_lib_gif,
-[ac_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
-else
-LIBS="$all_libraries -lgif"
-fi
-AC_TRY_LINK(dnl
-[
-#ifdef __cplusplus
-extern "C" {
-#endif
-int GifLastError(void);
-#ifdef __cplusplus
-}
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-],
- [return GifLastError();],
- eval "ac_cv_lib_gif=yes",
- eval "ac_cv_lib_gif=no")
-LIBS="$ac_save_LIBS"
-])dnl
-if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
- AC_MSG_RESULT(yes)
- AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
-else
- AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
-fi
-])
-
-AC_DEFUN([KDE_FIND_JPEG_HELPER],
-[
-AC_MSG_CHECKING([for libjpeg$2])
-AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
-[
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(
-[
-#ifdef __cplusplus
-extern "C" {
-#endif
-void jpeg_CreateDecompress();
-#ifdef __cplusplus
-}
-#endif
-],
-[jpeg_CreateDecompress();],
- eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
- eval "ac_cv_lib_jpeg_$1=no")
-LIBS="$ac_save_LIBS"
-CFLAGS="$ac_save_CFLAGS"
-])
-
-if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then
- LIBJPEG="$ac_cv_lib_jpeg_$1"
- AC_MSG_RESULT($ac_cv_lib_jpeg_$1)
-else
- AC_MSG_RESULT(no)
- $3
-fi
-
-])
-
-AC_DEFUN([AC_FIND_JPEG],
-[
-dnl first look for libraries
-KDE_FIND_JPEG_HELPER(6b, 6b,
- KDE_FIND_JPEG_HELPER(normal, [],
- [
- LIBJPEG=
- ]
- )
-)
-
-dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
-dnl requires system dependent includes loaded before it)
-jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
-test "x$jpeg_incdir" = xNO && jpeg_incdir=
-
-dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in tdehtml)
-dnl if only one is missing, it means a configuration error, but we still
-dnl only warn
-if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
- AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg])
-else
- if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
- AC_MSG_WARN([
-There is an installation error in jpeg support. You seem to have only one
-of either the headers _or_ the libraries installed. You may need to either
-provide correct --with-extra-... options, or the development package of
-libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-Disabling JPEG support.
-])
- else
- AC_MSG_WARN([libjpeg not found. disable JPEG support.])
- fi
- jpeg_incdir=
- LIBJPEG=
-fi
-
-AC_SUBST(LIBJPEG)
-AH_VERBATIM(_AC_CHECK_JPEG,
-[/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-])
-])
-
-AC_DEFUN([KDE_CHECK_QT_JPEG],
-[
-if test -n "$LIBJPEG"; then
-AC_MSG_CHECKING([if Qt needs $LIBJPEG])
-AC_CACHE_VAL(kde_cv_qt_jpeg,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
-LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
-ac_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(
-[#include <qapplication.h>],
- [
- int argc;
- char** argv;
- QApplication app(argc, argv);],
- eval "kde_cv_qt_jpeg=no",
- eval "kde_cv_qt_jpeg=yes")
-LIBS="$ac_save_LIBS"
-CXXFLAGS="$ac_save_CXXFLAGS"
-AC_LANG_RESTORE
-fi
-])
-
-if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
- AC_MSG_RESULT(yes)
- LIBJPEG_QT='$(LIBJPEG)'
-else
- AC_MSG_RESULT(no)
- LIBJPEG_QT=
-fi
-
-])
-
-AC_DEFUN([AC_FIND_ZLIB],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for libz])
-AC_CACHE_VAL(ac_cv_lib_z,
-[
-kde_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(dnl
-[
-#include<zlib.h>
-#include<string.h>
-],
-[
- char buf[42];
- gzFile f = (gzFile) 0;
- /* this would segfault.. but we only link, don't run */
- (void) gzgets(f, buf, sizeof(buf));
-
- return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
-],
- eval "ac_cv_lib_z='-lz'",
- eval "ac_cv_lib_z=no")
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if test ! "$ac_cv_lib_z" = no; then
- AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
- LIBZ="$ac_cv_lib_z"
- AC_MSG_RESULT($ac_cv_lib_z)
-else
- AC_MSG_ERROR(not found.
- Possibly configure picks up an outdated version
- installed by XFree86. Remove it from your system.
-
- Check your installation and look into config.log)
- LIBZ=""
-fi
-AC_SUBST(LIBZ)
-])
-
-AC_DEFUN([KDE_TRY_TIFFLIB],
-[
-AC_MSG_CHECKING([for libtiff $1])
-
-AC_CACHE_VAL(kde_cv_libtiff_$1,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-else
-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm"
-fi
-kde_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
-[
-#include<tiffio.h>
-],
- [return (TIFFOpen( "", "r") == 0); ],
-[
- kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
-], [
- kde_cv_libtiff_$1=no
-])
-
-LIBS="$kde_save_LIBS"
-CXXFLAGS="$kde_save_CXXFLAGS"
-AC_LANG_RESTORE
-])
-
-if test "$kde_cv_libtiff_$1" = "no"; then
- AC_MSG_RESULT(no)
- LIBTIFF=""
- $3
-else
- LIBTIFF="$kde_cv_libtiff_$1"
- AC_MSG_RESULT(yes)
- AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff])
- $2
-fi
-
-])
-
-AC_DEFUN([AC_FIND_TIFF],
-[
-AC_REQUIRE([K_PATH_X])
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_REQUIRE([AC_FIND_JPEG])
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-KDE_TRY_TIFFLIB(tiff, [],
- KDE_TRY_TIFFLIB(tiff34))
-
-AC_SUBST(LIBTIFF)
-])
-
-AC_DEFUN([KDE_FIND_LIBEXR],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_CACHE_VAL(ac_cv_libexr,
-[
- if test -z "$PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- fi
-
- AC_MSG_CHECKING([for OpenEXR libraries])
-
- if test "$PKG_CONFIG" = "no" ; then
- AC_MSG_RESULT(no)
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
- else
- if ! $PKG_CONFIG --exists OpenEXR ; then
- AC_MSG_RESULT(no)
- EXRSTATUS=no
- else
- if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
- AC_MSG_RESULT(no)
- EXRSTATUS=old
- else
- kde_save_LIBS="$LIBS"
- LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- kde_save_CXXFLAGS="$CXXFLAGS"
- EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
- CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
-
- AC_TRY_LINK(dnl
- [
- #include <ImfRgbaFile.h>
- ],
- [
- using namespace Imf;
- RgbaInputFile file ("dummy");
- return 0;
- ],
- eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
- eval "ac_cv_libexr=no"
- )
- LIBS="$kde_save_LIBS"
- CXXFLAGS="$kde_save_CXXFLAGS"
- AC_LANG_RESTORE
- ])dnl
- if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
- AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
- LIB_EXR="$ac_cv_libexr"
- AC_MSG_RESULT($ac_cv_libexr)
- else
- AC_MSG_RESULT(no)
- LIB_EXR=""
- fi
- fi
- fi
- fi
- AC_SUBST(LIB_EXR)
- AC_SUBST(EXR_FLAGS)
-])
-
-
-
-AC_DEFUN([AC_FIND_PNG],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_MSG_CHECKING([for libpng])
-AC_CACHE_VAL(ac_cv_lib_png,
-[
-kde_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-else
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
-fi
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
- [
- #include<png.h>
- ],
- [
- png_structp png_ptr = png_create_read_struct( /* image ptr */
- PNG_LIBPNG_VER_STRING, 0, 0, 0 );
- return( png_ptr != 0 );
- ],
- eval "ac_cv_lib_png='-lpng $LIBZ -lm'",
- eval "ac_cv_lib_png=no"
-)
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
- AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
- LIBPNG="$ac_cv_lib_png"
- AC_SUBST(LIBPNG)
- AC_MSG_RESULT($ac_cv_lib_png)
-else
- AC_MSG_RESULT(no)
- LIBPNG=""
- AC_SUBST(LIBPNG)
-fi
-])
-
-
-AC_DEFUN([AC_FIND_JASPER],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_REQUIRE([AC_FIND_JPEG])
-AC_MSG_CHECKING([for jasper])
-AC_CACHE_VAL(ac_cv_jasper,
-[
-kde_save_LIBS="$LIBS"
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
- [
- #include<jasper/jasper.h>
- ],
- [
- return( jas_init() );
- ],
- eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
- eval "ac_cv_jasper=no"
-)
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then
- AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper])
- LIB_JASPER="$ac_cv_jasper"
- AC_MSG_RESULT($ac_cv_jasper)
-else
- AC_MSG_RESULT(no)
- LIB_JASPER=""
-fi
-AC_SUBST(LIB_JASPER)
-])
-
-AC_DEFUN([AC_CHECK_BOOL],
-[
- AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool])
-])
-
-AC_DEFUN([AC_CHECK_GNU_EXTENSIONS],
-[
-AC_MSG_CHECKING(if you need GNU extensions)
-AC_CACHE_VAL(ac_cv_gnu_extensions,
-[
-cat > conftest.c << EOF
-#include <features.h>
-
-#ifdef __GNU_LIBRARY__
-yes
-#endif
-EOF
-
-if (eval "$ac_cpp conftest.c") 2>&5 |
- egrep "yes" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_gnu_extensions=yes
-else
- ac_cv_gnu_extensions=no
-fi
-])
-
-AC_MSG_RESULT($ac_cv_gnu_extensions)
-if test "$ac_cv_gnu_extensions" = "yes"; then
- AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions])
-fi
-])
-
-AC_DEFUN([KDE_CHECK_COMPILER_FLAG],
-[
-AC_MSG_CHECKING([whether $CXX supports -$1])
-kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
-AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
-[
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -$1"
- AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cxx_$kde_cache=yes"], [])
- CXXFLAGS="$save_CXXFLAGS"
- AC_LANG_RESTORE
-])
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- AC_MSG_RESULT(yes)
- :
- $2
-else
- AC_MSG_RESULT(no)
- :
- $3
-fi
-])
-
-AC_DEFUN([KDE_CHECK_C_COMPILER_FLAG],
-[
-AC_MSG_CHECKING([whether $CC supports -$1])
-kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
-AC_CACHE_VAL(kde_cv_prog_cc_$kde_cache,
-[
- AC_LANG_SAVE
- AC_LANG_C
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -$1"
- AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cc_$kde_cache=yes"], [])
- CFLAGS="$save_CFLAGS"
- AC_LANG_RESTORE
-])
-if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
- AC_MSG_RESULT(yes)
- :
- $2
-else
- AC_MSG_RESULT(no)
- :
- $3
-fi
-])
-
-
-dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables
-dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever])
-dnl it's all white-space separated
-AC_DEFUN([AC_REMOVE_FORBIDDEN],
-[ __val=$$1
- __forbid=" $2 "
- if test -n "$__val"; then
- __new=""
- ac_save_IFS=$IFS
- IFS=" "
- for i in $__val; do
- case "$__forbid" in
- *" $i "*) AC_MSG_WARN([found forbidden $i in $1, removing it]) ;;
- *) # Careful to not add spaces, where there were none, because otherwise
- # libtool gets confused, if we change e.g. CXX
- if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
- esac
- done
- IFS=$ac_save_IFS
- $1=$__new
- fi
-])
-
-
-AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
-[
- AC_MSG_CHECKING([whether $CC is blacklisted])
-
- dnl In theory we have tu run this test against $CC and $CXX
- dnl in C and in C++ mode, because its perfectly legal for
- dnl the user to mix compiler versions, since C has a defined
- dnl ABI.
- dnl
- dnl For now, we assume the user is not on crack.
-
- AC_TRY_COMPILE([
-#ifdef __GNUC__
-#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
-choke me
-#endif
-#endif
-], ,
- kde_bad_compiler=no,
- kde_bad_compiler=yes
-)
-
- AC_MSG_RESULT($kde_bad_compiler)
-
-if test "$kde_bad_compiler" = "yes"; then
- AC_MSG_ERROR([
-
-This particular compiler version is blacklisted because it
-is known to miscompile KDE. Please use a newer version, or
-if that is not yet available, choose an older version.
-
-Please do not report a bug or bother us reporting this
-configure error. We know about it, and we introduced
-it by intention to avoid untraceable bugs or crashes in KDE.
-
-])
-fi
-
-])
-
-
-AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
-[
- AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline],
- kde_cv_opt_noinline_match,
- [
- kde_cv_opt_noinline_match=irrelevant
- dnl if we don't use both -O2 and -fno-inline, this check is moot
- if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \
- && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then
-
- ac_cflags_save="$CFLAGS"
- CFLAGS="$CFLAGS -D_USE_GNU"
-
- AC_TRY_LINK([
- #include <string.h>
-], [ const char *pt, *et;
- et = __extension__ ({ char __a0, __a1, __a2; (__builtin_constant_p ( ";," ) && ((size_t)(const void *)(( ";," )+ 1) - (size_t)(const void *)( ";," ) == 1) ? ((__a0 =((__const char *) ( ";," ))[0], __a0 == '\0') ? ((void) ( pt ),((void *)0) ) : ((__a1 = ((__const char *) ( ";," ))[1], __a1== '\0') ? (__extension__ (__builtin_constant_p ( __a0 ) && ( __a0 ) == '\0' ? (char *) __rawmemchr ( pt , __a0) : strchr( pt , __a0 ))) : ((__a2 = ((__const char *) ( ";," ))[2], __a2 == '\0') ? __strpbrk_c2 ( pt , __a0, __a1) :(((__const char *) ( ";," ))[3] == '\0' ? __strpbrk_c3 ( pt ,__a0, __a1, __a2): strpbrk ( pt , ";," ))))) : strpbrk ( pt , ";," )); }) ;
-],
- kde_cv_opt_noinline_match=yes,
- kde_cv_opt_noinline_match=no
- )
-
- CFLAGS="$ac_cflags_save"
- fi
- ])
-])
-
-
-dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
-AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
-[dnl
-if test "x$kde_use_qt_emb" != "xyes"; then
- AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath])
-else
- AC_REMOVE_FORBIDDEN(CXX, [-rpath])
- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-rpath])
-fi
-])
-
-AC_DEFUN([AC_CHECK_COMPILERS],
-[
- AC_ARG_ENABLE(debug,
- AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
- [
- case $enableval in
- yes)
- kde_use_debug_code="yes"
- kde_use_debug_define=no
- ;;
- full)
- kde_use_debug_code="full"
- kde_use_debug_define=no
- ;;
- *)
- kde_use_debug_code="no"
- kde_use_debug_define=yes
- ;;
- esac
- ],
- [kde_use_debug_code="no"
- kde_use_debug_define=no
- ])
-
- dnl Just for configure --help
- AC_ARG_ENABLE(dummyoption,
- AC_HELP_STRING([--disable-debug],
- [disables debug output and debug symbols [default=no]]),
- [],[])
-
- AC_ARG_ENABLE(strict,
- AC_HELP_STRING([--enable-strict],
- [compiles with strict compiler options (may not work!)]),
- [
- if test $enableval = "no"; then
- kde_use_strict_options="no"
- else
- kde_use_strict_options="yes"
- fi
- ], [kde_use_strict_options="no"])
-
- AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similar]),
- [
- if test $enableval = "no"; then
- kde_use_warnings="no"
- else
- kde_use_warnings="yes"
- fi
- ], [kde_use_warnings="yes"])
-
- dnl enable warnings for debug build
- if test "$kde_use_debug_code" != "no"; then
- kde_use_warnings=yes
- fi
-
- AC_ARG_ENABLE(profile,AC_HELP_STRING([--enable-profile],[creates profiling infos [default=no]]),
- [kde_use_profiling=$enableval],
- [kde_use_profiling="no"]
- )
-
- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
- CFLAGS=" $CFLAGS"
-
- AC_PROG_CC
-
- AC_PROG_CPP
-
- if test "$GCC" = "yes"; then
- if test "$kde_use_debug_code" != "no"; then
- if test $kde_use_debug_code = "full"; then
- CFLAGS="-g3 -fno-inline $CFLAGS"
- else
- CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS"
- fi
- else
- CFLAGS="-O2 $CFLAGS"
- fi
- fi
-
- if test "$kde_use_debug_define" = "yes"; then
- CFLAGS="-DNDEBUG $CFLAGS"
- fi
-
-
- case "$host" in
- *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
- *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
- esac
-
- if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then
- LDFLAGS=""
- fi
-
- CXXFLAGS=" $CXXFLAGS"
-
- AC_PROG_CXX
-
- KDE_CHECK_FOR_BAD_COMPILER
-
- if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
- if test "$kde_use_debug_code" != "no"; then
- if test "$CXX" = "KCC"; then
- CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
- else
- if test "$kde_use_debug_code" = "full"; then
- CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
- else
- CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS"
- fi
- fi
- KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-
- dnl convenience compiler flags
- KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""])
- AC_SUBST(WOVERLOADED_VIRTUAL)
- else
- if test "$CXX" = "KCC"; then
- CXXFLAGS="+K3 $CXXFLAGS"
- else
- CXXFLAGS="-O2 $CXXFLAGS"
- fi
- fi
- fi
-
- if test "$kde_use_debug_define" = "yes"; then
- CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS"
- fi
-
- if test "$kde_use_profiling" = "yes"; then
- KDE_CHECK_COMPILER_FLAG(pg,
- [
- CFLAGS="-pg $CFLAGS"
- CXXFLAGS="-pg $CXXFLAGS"
- ])
- fi
-
- if test "$kde_use_warnings" = "yes"; then
- if test "$GCC" = "yes"; then
- CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS"
- case $host in
- *-*-linux-gnu)
- CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
- CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS"
- KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
- KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
- ;;
- esac
- KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
- KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
- dnl ### FIXME: revert for KDE 4
- KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"])
- fi
- fi
-
- if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then
- CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
- fi
-
- AC_ARG_ENABLE(pch,
- AC_HELP_STRING([--enable-pch],
- [enables precompiled header support (currently only KCC or gcc >=3.4+unsermake) [default=no]]),
- [ kde_use_pch=$enableval ],[ kde_use_pch=no ])
-
- HAVE_GCC_VISIBILITY=0
- AC_SUBST([HAVE_GCC_VISIBILITY])
-
- if test "$GXX" = "yes"; then
- gcc_no_reorder_blocks=NO
- KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES])
- if test $kde_use_debug_code != "no" && \
- test $kde_use_debug_code != "full" && \
- test "YES" = "$gcc_no_reorder_blocks" ; then
- CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
- CFLAGS="$CFLAGS -fno-reorder-blocks"
- fi
- KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
- KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
- KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
- KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS= )
- ENABLE_PERMISSIVE_FLAG="-fpermissive"
-
- if test "$kde_use_pch" = "yes"; then
- AC_MSG_CHECKING(whether gcc supports precompiling c header files)
- echo >conftest.h
- if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
- kde_gcc_supports_pch=yes
- AC_MSG_RESULT(yes)
- else
- kde_gcc_supports_pch=no
- AC_MSG_RESULT(no)
- fi
- if test "$kde_gcc_supports_pch" = "yes"; then
- AC_MSG_CHECKING(whether gcc supports precompiling c++ header files)
- if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
- kde_gcc_supports_pch=yes
- AC_MSG_RESULT(yes)
- else
- kde_gcc_supports_pch=no
- AC_MSG_RESULT(no)
- fi
- fi
- rm -f conftest.h conftest.h.gch
- fi
-
- KDE_CHECK_FOR_OPT_NOINLINE_MATCH
- if test "x$kde_cv_opt_noinline_match" = "xno" ; then
- CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
- fi
- fi
- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
- if test "$CXX" = "KCC"; then
- dnl unfortunately we currently cannot disable exception support in KCC
- dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
- dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"])
- dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= )
-
- if test "$kde_use_pch" = "yes"; then
- dnl TODO: support --pch-dir!
- KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"])
- dnl the below works (but the dir must exist), but it's
- dnl useless for a whole package.
- dnl The are precompiled headers for each source file, so when compiling
- dnl from scratch, it doesn't make a difference, and they take up
- dnl around ~5Mb _per_ sourcefile.
- dnl KDE_CHECK_COMPILER_FLAG(-pch_dir /tmp,
- dnl [CXXFLAGS="$CXXFLAGS --pch_dir `pwd`/pcheaders"])
- fi
- dnl this flag controls inlining. by default KCC inlines in optimisation mode
- dnl all implementations that are defined inside the class {} declaration.
- dnl because of templates-compatibility with broken gcc compilers, this
- dnl can cause excessive inlining. This flag limits it to a sane level
- KDE_CHECK_COMPILER_FLAG(-inline_keyword_space_time=6,[CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"])
- KDE_CHECK_COMPILER_FLAG(-inline_auto_space_time=2,[CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"])
- KDE_CHECK_COMPILER_FLAG(-inline_implicit_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"])
- KDE_CHECK_COMPILER_FLAG(-inline_generated_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"])
- dnl Some source files are shared between multiple executables
- dnl (or libraries) and some of those need template instantiations.
- dnl In that case KCC needs to compile those sources with
- dnl --one_instantiation_per_object. To make it easy for us we compile
- dnl _all_ objects with that flag (--one_per is a shorthand).
- KDE_CHECK_COMPILER_FLAG(-one_per, [CXXFLAGS="$CXXFLAGS --one_per"])
- fi
- AC_SUBST(USE_EXCEPTIONS)
- dnl obsolete macro - provided to keep things going
- USE_RTTI=
- AC_SUBST(USE_RTTI)
-
- case "$host" in
- *-*-irix*) test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;;
- *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";;
- *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";;
- *-*-solaris*)
- if test "$GXX" = yes; then
- libstdcpp=`$CXX -print-file-name=libstdc++.so`
- if test ! -f $libstdcpp; then
- AC_MSG_ERROR([You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so])
- fi
- fi
- ;;
- esac
-
- AC_VALIDIFY_CXXFLAGS
-
- AC_PROG_CXXCPP
-
- if test "$GCC" = yes; then
- NOOPT_CFLAGS=-O0
- fi
- KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0])
-
- AC_ARG_ENABLE(coverage,
- AC_HELP_STRING([--enable-coverage],[use gcc coverage testing]), [
- if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
- ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
- ac_coverage_linker="-lgcc"
- elif test "$am_cv_CC_dependencies_compiler_type" = "gcc"; then
- ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
- ac_coverage_linker=""
- else
- AC_MSG_ERROR([coverage with your compiler is not supported])
- fi
- CFLAGS="$CFLAGS $ac_coverage_compiler"
- CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
- LDFLAGS="$LDFLAGS $ac_coverage_linker"
- ])
-
- AC_SUBST(NOOPT_CXXFLAGS)
- AC_SUBST(NOOPT_CFLAGS)
- AC_SUBST(ENABLE_PERMISSIVE_FLAG)
-
- KDE_CHECK_NEW_LDFLAGS
- KDE_CHECK_FINAL
- KDE_CHECK_CLOSURE
- KDE_CHECK_NMCHECK
-
- ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
-])
-
-AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
- [
- AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-
- safe_CXXFLAGS=$CXXFLAGS
- safe_LDFLAGS=$LDFLAGS
- CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
- LDFLAGS="$LDFLAGS -shared -fPIC"
-
- AC_TRY_LINK(
- [
- /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
- #include <string>
- int some_function( void ) __attribute__ ((visibility("default")));
- int some_function( void )
- {
- std::string s("blafasel");
- return 0;
- }
- ], [/* elvis is alive */],
- kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
-
- CXXFLAGS=$safe_CXXFLAGS
- LDFLAGS=$safe_LDFLAGS
- AC_LANG_RESTORE
- ]
- )
-
- if test x$kde_cv_val_gcc_visibility_bug = xno; then
- CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
- fi
- ]
-)
-
-AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
-[
- AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
-
- AC_MSG_CHECKING([grepping for visibility push/pop in headers])
-
- if test "x$GXX" = "xyes"; then
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_EGREP_CPP(
- [GCC visibility push],
- [ #include <exception>
- ],
- [
- AC_MSG_RESULT(yes)
- kde_stdc_visibility_patched=yes ],
- [
- AC_MSG_RESULT(no)
- AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for
- visibility support. Disabling -fvisibility=hidden])
-
- kde_stdc_visibility_patched=no ])
-
- AC_LANG_RESTORE
-
- kde_have_gcc_visibility=no
- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
- [
- kde_have_gcc_visibility=yes
- dnl the whole toolchain is just a mess, gcc is just too buggy
- dnl to handle STL with visibility enabled. Lets reconsider
- dnl when gcc 4.2 is out or when things get fixed in the compiler.
- dnl Contact mueller@kde.org for details.
- AC_ARG_ENABLE(gcc-hidden-visibility,
- AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
- [kde_have_gcc_visibility=$enableval],
- [kde_have_gcc_visibility=no])
-
- AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-
- safe_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS $all_includes"
-
- AC_TRY_COMPILE(
- [
-#include <qglobal.h>
-#if Q_EXPORT - 0 != 0
-/* if this compiles, then Q_EXPORT is undefined */
-/* if Q_EXPORT is nonempty, this will break compilation */
-#endif
- ], [/* elvis is alive */],
- kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
-
- CXXFLAGS=$safe_CXXFLAGS
- AC_LANG_RESTORE
- ]
- )
-
- if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
- KDE_CHECK_VISIBILITY_GCC_BUG
- HAVE_GCC_VISIBILITY=1
- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
- fi
- ])
- fi
-])
-
-AC_DEFUN([KDE_ADD_DEPENDENCIES],
-[
- [A]M_DEPENDENCIES(CC)
- [A]M_DEPENDENCIES(CXX)
-])
-
-dnl just a wrapper to clean up configure.in
-AC_DEFUN([KDE_PROG_LIBTOOL],
-[
-AC_REQUIRE([AC_CHECK_COMPILERS])
-AC_REQUIRE([AC_ENABLE_SHARED])
-AC_REQUIRE([AC_ENABLE_STATIC])
-
-AC_REQUIRE([AC_LIBTOOL_DLOPEN])
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_OBJEXT
-AC_EXEEXT
-
-AM_PROG_LIBTOOL
-AC_LIBTOOL_CXX
-
-LIBTOOL_SHELL="/bin/sh ./libtool"
-# LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
-AC_SUBST(KDE_PLUGIN)
-
-# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
-KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
-AC_SUBST(KDE_CHECK_PLUGIN)
-
-# we patch configure quite some so we better keep that consistent for incremental runs
-AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
-])
-
-AC_DEFUN([KDE_CHECK_LIB64],
-[
- AC_ARG_ENABLE(libsuffix,
- AC_HELP_STRING([--enable-libsuffix],
- [/lib directory suffix (64,32,none,auto[=default])]),
- tdelibsuff=$enableval, tdelibsuff="auto")
-
- if test "$tdelibsuff" = "auto"; then
-
-cat > conftest.c << EOF
-#include <stdio.h>
-int main() {
- return 0;
-}
-EOF
- tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
- s,.*/lib\([[^\/]]*\)/.*,\1,
- p
-}'`
- rm -rf conftest.*
- fi
-
- if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
- tdelibsuff=
- fi
- if test -z "$tdelibsuff"; then
- AC_MSG_RESULT([not using lib directory suffix])
- AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
- else
- if test "$libdir" = '${exec_prefix}/lib'; then
- libdir="$libdir${tdelibsuff}"
- AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
- fi
- AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
- AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
- fi
-])
-
-AC_DEFUN([KDE_CHECK_TYPES],
-[ AC_CHECK_SIZEOF(int, 4)dnl
- AC_CHECK_SIZEOF(short)dnl
- AC_CHECK_SIZEOF(long, 4)dnl
- AC_CHECK_SIZEOF(char *, 4)dnl
-])dnl
-
-dnl Not used - kept for compat only?
-AC_DEFUN([KDE_DO_IT_ALL],
-[
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE($1, $2)
-AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
-AC_CHECK_COMPILERS
-KDE_PROG_LIBTOOL
-AM_KDE_WITH_NLS
-AC_PATH_KDE
-])
-
-AC_DEFUN([AC_CHECK_RPATH],
-[
-AC_MSG_CHECKING(for rpath)
-AC_ARG_ENABLE(rpath,
- AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]),
- USE_RPATH=$enableval, USE_RPATH=yes)
-
-if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-
- KDE_RPATH="-R \$(libdir)"
-
- if test "$kde_libraries" != "$libdir"; then
- KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)"
- fi
-
- if test -n "$qt_libraries"; then
- KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
- fi
- dnl $x_libraries is set to /usr/lib in case
- if test -n "$X_LDFLAGS"; then
- X_RPATH="-R \$(x_libraries)"
- KDE_RPATH="$KDE_RPATH $X_RPATH"
- fi
- if test -n "$KDE_EXTRA_RPATH"; then
- KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
- fi
-fi
-AC_SUBST(KDE_EXTRA_RPATH)
-AC_SUBST(KDE_RPATH)
-AC_SUBST(X_RPATH)
-AC_MSG_RESULT($USE_RPATH)
-])
-
-dnl Check for the type of the third argument of getsockname
-AC_DEFUN([AC_CHECK_SOCKLEN_T],
-[
- AC_MSG_CHECKING(for socklen_t)
- AC_CACHE_VAL(kde_cv_socklen_t,
- [
- AC_LANG_PUSH(C++)
- kde_cv_socklen_t=no
- AC_TRY_COMPILE([
- #include <sys/types.h>
- #include <sys/socket.h>
- ],
- [
- socklen_t len;
- getpeername(0,0,&len);
- ],
- [
- kde_cv_socklen_t=yes
- kde_cv_socklen_t_equiv=socklen_t
- ])
- AC_LANG_POP(C++)
- ])
- AC_MSG_RESULT($kde_cv_socklen_t)
- if test $kde_cv_socklen_t = no; then
- AC_MSG_CHECKING([for socklen_t equivalent for socket functions])
- AC_CACHE_VAL(kde_cv_socklen_t_equiv,
- [
- kde_cv_socklen_t_equiv=int
- AC_LANG_PUSH(C++)
- for t in int size_t unsigned long "unsigned long"; do
- AC_TRY_COMPILE([
- #include <sys/types.h>
- #include <sys/socket.h>
- ],
- [
- $t len;
- getpeername(0,0,&len);
- ],
- [
- kde_cv_socklen_t_equiv="$t"
- break
- ])
- done
- AC_LANG_POP(C++)
- ])
- AC_MSG_RESULT($kde_cv_socklen_t_equiv)
- fi
- AC_DEFINE_UNQUOTED(kde_socklen_t, $kde_cv_socklen_t_equiv,
- [type to use in place of socklen_t if not defined])
- AC_DEFINE_UNQUOTED(ksize_t, $kde_cv_socklen_t_equiv,
- [type to use in place of socklen_t if not defined (deprecated, use kde_socklen_t)])
-])
-
-dnl This is a merge of some macros out of the gettext aclocal.m4
-dnl since we don't need anything, I took the things we need
-dnl the copyright for them is:
-dnl >
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-dnl >
-dnl for this file it is relicensed under LGPL
-
-AC_DEFUN([AM_KDE_WITH_NLS],
- [
- dnl If we use NLS figure out what method
-
- AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt,
- [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
- if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
- AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it])
- GMSGFMT=":"
- fi
- MSGFMT=$GMSGFMT
- AC_SUBST(GMSGFMT)
- AC_SUBST(MSGFMT)
-
- AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is no GNU xgettext we define it as : so that the
- dnl Makefiles still can work.
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
- AC_MSG_RESULT(
- [found xgettext programs is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
- fi
- AC_SUBST(XGETTEXT)
-
- ])
-
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-# serial 1
-# Stephan Kulow: I appended a _KDE against name conflicts
-
-dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR,
-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
- /*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
- ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
- AC_MSG_RESULT([$]$1)
-else
- AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# serial 1
-
-AC_DEFUN([AM_LC_MESSAGES],
- [if test $ac_cv_header_locale_h = yes; then
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
- if test $am_cv_val_LC_MESSAGES = yes; then
- AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your locale.h file contains LC_MESSAGES])
- fi
- fi])
-
-dnl From Jim Meyering.
-dnl FIXME: migrate into libit.
-
-AC_DEFUN([AM_FUNC_OBSTACK],
-[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
- [AC_TRY_LINK([#include "obstack.h"],
- [struct obstack *mem;obstack_free(mem,(char *) 0)],
- am_cv_func_obstack=yes,
- am_cv_func_obstack=no)])
- if test $am_cv_func_obstack = yes; then
- AC_DEFINE(HAVE_OBSTACK)
- else
- LIBOBJS="$LIBOBJS obstack.o"
- fi
-])
-
-dnl From Jim Meyering. Use this if you use the GNU error.[ch].
-dnl FIXME: Migrate into libit
-
-AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
-[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
- am_cv_lib_error_at_line=yes,
- am_cv_lib_error_at_line=no)])
- if test $am_cv_lib_error_at_line = no; then
- LIBOBJS="$LIBOBJS error.o"
- fi
- AC_SUBST(LIBOBJS)dnl
-])
-
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# serial 1
-# Stephan Kulow: I put a KDE in it to avoid name conflicts
-
-AC_DEFUN([AM_KDE_GNU_GETTEXT],
- [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AC_PROG_RANLIB])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_REQUIRE([AC_TYPE_OFF_T])dnl
- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
- AC_REQUIRE([AC_FUNC_ALLOCA])dnl
- AC_REQUIRE([AC_FUNC_MMAP])dnl
- AC_REQUIRE([AM_KDE_WITH_NLS])dnl
- AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h])
- AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next])
-
- AC_MSG_CHECKING(for stpcpy)
- AC_CACHE_VAL(kde_cv_func_stpcpy,
- [
- kde_safe_cxxflags=$CXXFLAGS
- CXXFLAGS="-Werror"
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_TRY_COMPILE([
- #include <string.h>
- ],
- [
- char buffer[200];
- stpcpy(buffer, buffer);
- ],
- kde_cv_func_stpcpy=yes,
- kde_cv_func_stpcpy=no)
- AC_LANG_RESTORE
- CXXFLAGS=$kde_safe_cxxflags
- ])
- AC_MSG_RESULT($kde_cv_func_stpcpy)
- if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then
- AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy])
- fi
-
- AM_LC_MESSAGES
-
- if test "x$CATOBJEXT" != "x"; then
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
- AC_MSG_CHECKING(for catalogs to be installed)
- NEW_LINGUAS=
- for lang in ${LINGUAS=$ALL_LINGUAS}; do
- case "$ALL_LINGUAS" in
- *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
- esac
- done
- LINGUAS=$NEW_LINGUAS
- AC_MSG_RESULT($LINGUAS)
- fi
-
- dnl Construct list of names of catalog files to be constructed.
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
-
- ])
-
-AC_DEFUN([AC_HAVE_XPM],
- [AC_REQUIRE_CPP()dnl
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$XPM_LDFLAGS" && XPM_LDFLAGS=
- test -z "$XPM_INCLUDE" && XPM_INCLUDE=
-
- AC_ARG_WITH(xpm,AC_HELP_STRING([--without-xpm],[disable color pixmap XPM tests]),
- xpm_test=$withval, xpm_test="yes")
- if test "x$xpm_test" = xno; then
- ac_cv_have_xpm=no
- else
- AC_MSG_CHECKING(for XPM)
- AC_CACHE_VAL(ac_cv_have_xpm,
- [
- ac_save_ldflags="$LDFLAGS"
- ac_save_cflags="$CFLAGS"
- if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
- else
- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET"
- fi
- CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES"
- test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS"
- AC_TRY_LINK([#include <X11/xpm.h>],[],
- ac_cv_have_xpm="yes",ac_cv_have_xpm="no")
- LDFLAGS="$ac_save_ldflags"
- CFLAGS="$ac_save_cflags"
- ])dnl
-
- if test "$ac_cv_have_xpm" = no; then
- AC_MSG_RESULT(no)
- XPM_LDFLAGS=""
- XPMINC=""
- $2
- else
- AC_DEFINE(HAVE_XPM, 1, [Define if you have XPM support])
- if test "$XPM_LDFLAGS" = ""; then
- XPMLIB='-lXpm $(LIB_X11)'
- else
- XPMLIB="-L$XPM_LDFLAGS -lXpm "'$(LIB_X11)'
- fi
- if test "$XPM_INCLUDE" = ""; then
- XPMINC=""
- else
- XPMINC="-I$XPM_INCLUDE"
- fi
- AC_MSG_RESULT(yes)
- $1
- fi
- fi
- AC_SUBST(XPMINC)
- AC_SUBST(XPMLIB)
-])
-
-AC_DEFUN([AC_HAVE_DPMS],
- [AC_REQUIRE_CPP()dnl
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS=
- test -z "$DPMS_INCLUDE" && DPMS_INCLUDE=
- DPMS_LIB=
-
- AC_ARG_WITH(dpms,AC_HELP_STRING([--without-dpms],[disable DPMS power saving]),
- dpms_test=$withval, dpms_test="yes")
- if test "x$dpms_test" = xno; then
- ac_cv_have_dpms=no
- else
- AC_MSG_CHECKING(for DPMS)
- dnl Note: ac_cv_have_dpms can be no, yes, or -lXdpms.
- dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms".
- AC_CACHE_VAL(ac_cv_have_dpms,
- [
- if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then
- AC_MSG_RESULT(no)
- ac_cv_have_dpms="no"
- else
- ac_save_ldflags="$LDFLAGS"
- ac_save_cflags="$CFLAGS"
- ac_save_libs="$LIBS"
- LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries"
- LIBS="-lX11 -lXext $LIBSOCKET"
- CFLAGS="$CFLAGS $X_INCLUDES"
- test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
- AC_TRY_LINK([
- #include <X11/Xproto.h>
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/extensions/dpms.h>
- int foo_test_dpms()
- { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
- ac_cv_have_dpms="yes", [
- LIBS="-lXdpms $LIBS"
- AC_TRY_LINK([
- #include <X11/Xproto.h>
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/extensions/dpms.h>
- int foo_test_dpms()
- { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
- [
- ac_cv_have_dpms="-lXdpms"
- ],ac_cv_have_dpms="no")
- ])
- LDFLAGS="$ac_save_ldflags"
- CFLAGS="$ac_save_cflags"
- LIBS="$ac_save_libs"
- fi
- ])dnl
-
- if test "$ac_cv_have_dpms" = no; then
- AC_MSG_RESULT(no)
- DPMS_LDFLAGS=""
- DPMSINC=""
- $2
- else
- AC_DEFINE(HAVE_DPMS, 1, [Define if you have DPMS support])
- if test "$ac_cv_have_dpms" = "-lXdpms"; then
- DPMS_LIB="-lXdpms"
- fi
- if test "$DPMS_LDFLAGS" = ""; then
- DPMSLIB="$DPMS_LIB "'$(LIB_X11)'
- else
- DPMSLIB="$DPMS_LDFLAGS $DPMS_LIB "'$(LIB_X11)'
- fi
- if test "$DPMS_INCLUDE" = ""; then
- DPMSINC=""
- else
- DPMSINC="-I$DPMS_INCLUDE"
- fi
- AC_MSG_RESULT(yes)
- $1
- fi
- fi
- ac_save_cflags="$CFLAGS"
- CFLAGS="$CFLAGS $X_INCLUDES"
- test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
- AH_TEMPLATE(HAVE_DPMSCAPABLE_PROTO,
- [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
- AC_CHECK_DECL(DPMSCapable,
- AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
- [#include <X11/Xlib.h>
- #include <X11/extensions/dpms.h>])
- AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
- [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
- AC_CHECK_DECL(DPMSInfo,
- AC_DEFINE(HAVE_DPMSINFO_PROTO),,
- [#include <X11/Xlib.h>
- #include <X11/extensions/dpms.h>])
- CFLAGS="$ac_save_cflags"
- AC_SUBST(DPMSINC)
- AC_SUBST(DPMSLIB)
-])
-
-AC_DEFUN([AC_HAVE_GL],
- [AC_REQUIRE_CPP()dnl
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$GL_LDFLAGS" && GL_LDFLAGS=
- test -z "$GL_INCLUDE" && GL_INCLUDE=
-
- AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
- gl_test=$withval, gl_test="yes")
- if test "x$kde_use_qt_emb" = "xyes"; then
- # GL and Qt Embedded is a no-go for now.
- ac_cv_have_gl=no
- elif test "x$gl_test" = xno; then
- ac_cv_have_gl=no
- else
- AC_MSG_CHECKING(for GL)
- AC_CACHE_VAL(ac_cv_have_gl,
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- ac_save_ldflags=$LDFLAGS
- ac_save_cxxflags=$CXXFLAGS
- ac_save_libs=$LIBS
- LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
- LIBS="$LIBS -lGL -lGLU"
- test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
- LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
- CXXFLAGS="$CFLAGS $X_INCLUDES"
- test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
- AC_TRY_LINK([#include <GL/gl.h>
-#include <GL/glu.h>
-], [],
- ac_cv_have_gl="yes", ac_cv_have_gl="no")
- AC_LANG_RESTORE
- LDFLAGS=$ac_save_ldflags
- CXXFLAGS=$ac_save_cxxflags
- LIBS=$ac_save_libs
- ])dnl
-
- if test "$ac_cv_have_gl" = "no"; then
- AC_MSG_RESULT(no)
- GL_LDFLAGS=""
- GLINC=""
- $2
- else
- AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
- if test "$GL_LDFLAGS" = ""; then
- GLLIB='-lGLU -lGL $(LIB_X11)'
- else
- GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
- fi
- if test "$GL_INCLUDE" = ""; then
- GLINC=""
- else
- GLINC="-I$GL_INCLUDE"
- fi
- AC_MSG_RESULT($ac_cv_have_gl)
- $1
- fi
- fi
- AC_SUBST(GLINC)
- AC_SUBST(GLLIB)
-])
-
-
- dnl shadow password and PAM magic - maintained by ossi@kde.org
-
-AC_DEFUN([KDE_PAM], [
- AC_REQUIRE([KDE_CHECK_LIBDL])
-
- want_pam=
- AC_ARG_WITH(pam,
- AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]),
- [ if test "x$withval" = "xyes"; then
- want_pam=yes
- pam_service=kde
- elif test "x$withval" = "xno"; then
- want_pam=no
- else
- want_pam=yes
- pam_service=$withval
- fi
- ], [ pam_service=kde ])
-
- use_pam=
- PAMLIBS=
- if test "x$want_pam" != xno; then
- AC_CHECK_LIB(pam, pam_start, [
- AC_CHECK_HEADER(security/pam_appl.h,
- [ pam_header=security/pam_appl.h ],
- [ AC_CHECK_HEADER(pam/pam_appl.h,
- [ pam_header=pam/pam_appl.h ],
- [
- AC_MSG_WARN([PAM detected, but no headers found!
-Make sure you have the necessary development packages installed.])
- ]
- )
- ]
- )
- ], , $LIBDL)
- if test -z "$pam_header"; then
- if test "x$want_pam" = xyes; then
- AC_MSG_ERROR([--with-pam was specified, but cannot compile with PAM!])
- fi
- else
- AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
- PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
- use_pam=yes
-
- dnl darwin claims to be something special
- if test "$pam_header" = "pam/pam_appl.h"; then
- AC_DEFINE(HAVE_PAM_PAM_APPL_H, 1, [Define if your PAM headers are in pam/ instead of security/])
- fi
-
- dnl test whether struct pam_message is const (Linux) or not (Sun)
- AC_MSG_CHECKING(for const pam_message)
- AC_EGREP_HEADER([struct pam_message], $pam_header,
- [ AC_EGREP_HEADER([const struct pam_message], $pam_header,
- [AC_MSG_RESULT([const: Linux-type PAM])],
- [AC_MSG_RESULT([nonconst: Sun-type PAM])
- AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM support takes non-const arguments (Solaris)])]
- )],
- [AC_MSG_RESULT([not found - assume const, Linux-type PAM])])
- fi
- fi
-
- AC_SUBST(PAMLIBS)
-])
-
-dnl DEF_PAM_SERVICE(arg name, full name, define name)
-AC_DEFUN([DEF_PAM_SERVICE], [
- AC_ARG_WITH($1-pam,
- AC_HELP_STRING([--with-$1-pam=[val]],[override PAM service from --with-pam for $2]),
- [ if test "x$use_pam" = xyes; then
- $3_PAM_SERVICE=$withval
- else
- AC_MSG_ERROR([Cannot use use --with-$1-pam, as no PAM was detected.
-You may want to enforce it by using --with-pam.])
- fi
- ],
- [ if test "x$use_pam" = xyes; then
- $3_PAM_SERVICE="$pam_service"
- fi
- ])
- if test -n "$$3_PAM_SERVICE"; then
- AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE])
- AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2])
- fi
- AC_SUBST($3_PAM_SERVICE)
-])
-
-AC_DEFUN([KDE_SHADOWPASSWD], [
- AC_REQUIRE([KDE_PAM])
-
- AC_CHECK_LIB(shadow, getspent,
- [ LIBSHADOW="-lshadow"
- ac_use_shadow=yes
- ],
- [ dnl for UnixWare
- AC_CHECK_LIB(gen, getspent,
- [ LIBGEN="-lgen"
- ac_use_shadow=yes
- ],
- [ AC_CHECK_FUNC(getspent,
- [ ac_use_shadow=yes ],
- [ ac_use_shadow=no ])
- ])
- ])
- AC_SUBST(LIBSHADOW)
- AC_SUBST(LIBGEN)
-
- AC_MSG_CHECKING([for shadow passwords])
-
- AC_ARG_WITH(shadow,
- AC_HELP_STRING([--with-shadow],[If you want shadow password support]),
- [ if test "x$withval" != "xno"; then
- use_shadow=yes
- else
- use_shadow=no
- fi
- ], [
- use_shadow="$ac_use_shadow"
- ])
-
- if test "x$use_shadow" = xyes; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_SHADOW, 1, [Define if you use shadow passwords])
- else
- AC_MSG_RESULT(no)
- LIBSHADOW=
- LIBGEN=
- fi
-
- dnl finally make the relevant binaries setuid root, if we have shadow passwds.
- dnl this still applies, if we could use it indirectly through pam.
- if test "x$use_shadow" = xyes ||
- ( test "x$use_pam" = xyes && test "x$ac_use_shadow" = xyes ); then
- case $host in
- *-*-freebsd* | *-*-netbsd* | *-*-openbsd*)
- SETUIDFLAGS="-m 4755 -o root";;
- *)
- SETUIDFLAGS="-m 4755";;
- esac
- fi
- AC_SUBST(SETUIDFLAGS)
-
-])
-
-AC_DEFUN([KDE_PASSWDLIBS], [
- AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
- AC_REQUIRE([KDE_PAM])
- AC_REQUIRE([KDE_SHADOWPASSWD])
-
- if test "x$use_pam" = "xyes"; then
- PASSWDLIBS="$PAMLIBS"
- else
- PASSWDLIBS="$LIBCRYPT $LIBSHADOW $LIBGEN"
- fi
-
- dnl FreeBSD uses a shadow-like setup, where /etc/passwd holds the users, but
- dnl /etc/master.passwd holds the actual passwords. /etc/master.passwd requires
- dnl root to read, so kcheckpass needs to be root (even when using pam, since pam
- dnl may need to read /etc/master.passwd).
- case $host in
- *-*-freebsd*)
- SETUIDFLAGS="-m 4755 -o root"
- ;;
- *)
- ;;
- esac
-
- AC_SUBST(PASSWDLIBS)
-])
-
-AC_DEFUN([KDE_CHECK_LIBDL],
-[
-AC_CHECK_LIB(dl, dlopen, [
-LIBDL="-ldl"
-ac_cv_have_dlfcn=yes
-])
-
-AC_CHECK_LIB(dld, shl_unload, [
-LIBDL="-ldld"
-ac_cv_have_shload=yes
-])
-
-AC_SUBST(LIBDL)
-])
-
-AC_DEFUN([KDE_CHECK_DLOPEN],
-[
-KDE_CHECK_LIBDL
-AC_CHECK_HEADERS(dlfcn.h dl.h)
-if test "$ac_cv_header_dlfcn_h" = "no"; then
- ac_cv_have_dlfcn=no
-fi
-
-if test "$ac_cv_header_dl_h" = "no"; then
- ac_cv_have_shload=no
-fi
-
-dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE
-dnl (MM)
-AC_ARG_ENABLE(dlopen,
-AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]),
-enable_dlopen=$enableval,
-enable_dlopen=yes)
-
-# override the user's opinion, if we know it better ;)
-if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then
- enable_dlopen=no
-fi
-
-if test "$ac_cv_have_dlfcn" = "yes"; then
- AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn])
-fi
-
-if test "$ac_cv_have_shload" = "yes"; then
- AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload])
-fi
-
-if test "$enable_dlopen" = no ; then
- test -n "$1" && eval $1
-else
- test -n "$2" && eval $2
-fi
-
-])
-
-AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING],
-[
-KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no)
-KDE_PROG_LIBTOOL
-AC_MSG_CHECKING([dynamic loading])
-eval "`egrep '^build_libtool_libs=' libtool`"
-if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then
- dynamic_loading=yes
- AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING)
-else
- dynamic_loading=no
-fi
-AC_MSG_RESULT($dynamic_loading)
-if test "$dynamic_loading" = "yes"; then
- $1
-else
- $2
-fi
-])
-
-AC_DEFUN([KDE_ADD_INCLUDES],
-[
-if test -z "$1"; then
- test_include="Pix.h"
-else
- test_include="$1"
-fi
-
-AC_MSG_CHECKING([for libg++ ($test_include)])
-
-AC_CACHE_VAL(kde_cv_libgpp_includes,
-[
-kde_cv_libgpp_includes=no
-
- for ac_dir in \
- \
- /usr/include/g++ \
- /usr/include \
- /usr/unsupported/include \
- /opt/include \
- $extra_include \
- ; \
- do
- if test -r "$ac_dir/$test_include"; then
- kde_cv_libgpp_includes=$ac_dir
- break
- fi
- done
-])
-
-AC_MSG_RESULT($kde_cv_libgpp_includes)
-if test "$kde_cv_libgpp_includes" != "no"; then
- all_includes="-I$kde_cv_libgpp_includes $all_includes $USER_INCLUDES"
-fi
-])
-])
-
-AC_DEFUN([KDE_CHECK_LIBPTHREAD],
-[
- dnl This code is here specifically to handle the
- dnl various flavors of threading library on FreeBSD
- dnl 4-, 5-, and 6-, and the (weird) rules around it.
- dnl There may be an environment PTHREAD_LIBS that
- dnl specifies what to use; otherwise, search for it.
- dnl -pthread is special cased and unsets LIBPTHREAD
- dnl below if found.
- LIBPTHREAD=""
-
- if test -n "$PTHREAD_LIBS"; then
- if test "x$PTHREAD_LIBS" = "x-pthread" ; then
- LIBPTHREAD="PTHREAD"
- else
- PTHREAD_LIBS_save="$PTHREAD_LIBS"
- PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
- AC_MSG_CHECKING([for pthread_create in $PTHREAD_LIBS])
- KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [
- LIBPTHREAD="$PTHREAD_LIBS_save"])
- PTHREAD_LIBS="$PTHREAD_LIBS_save"
- fi
- fi
-
- dnl Is this test really needed, in the face of the Tru64 test below?
- if test -z "$LIBPTHREAD"; then
- AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"])
- fi
-
- dnl This is a special Tru64 check, see BR 76171 issue #18.
- if test -z "$LIBPTHREAD" ; then
- AC_MSG_CHECKING([for pthread_create in -lpthread])
- kde_safe_libs=$LIBS
- LIBS="$LIBS -lpthread"
- AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[
- AC_MSG_RESULT(yes)
- LIBPTHREAD="-lpthread"],[
- AC_MSG_RESULT(no)])
- LIBS=$kde_safe_libs
- fi
-
- dnl Un-special-case for FreeBSD.
- if test "x$LIBPTHREAD" = "xPTHREAD" ; then
- LIBPTHREAD=""
- fi
-
- AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN([KDE_CHECK_PTHREAD_OPTION],
-[
- USE_THREADS=""
- if test -z "$LIBPTHREAD"; then
- KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"])
- fi
-
- AH_VERBATIM(__svr_define, [
-#if defined(__SVR4) && !defined(__svr4__)
-#define __svr4__ 1
-#endif
-])
- case $host_os in
- solaris*)
- KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"])
- CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
- ;;
- freebsd*)
- CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
- ;;
- aix*)
- CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
- LIBPTHREAD="$LIBPTHREAD -lc_r"
- ;;
- linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
- if test "$CXX" = "KCC"; then
- CXXFLAGS="$CXXFLAGS --thread_safe"
- NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
- fi
- ;;
- *)
- ;;
- esac
- AC_SUBST(USE_THREADS)
- AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN([KDE_CHECK_THREADING],
-[
- AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
- AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION])
- dnl default is yes if libpthread is found and no if no libpthread is available
- if test -z "$LIBPTHREAD"; then
- if test -z "$USE_THREADS"; then
- kde_check_threading_default=no
- else
- kde_check_threading_default=yes
- fi
- else
- kde_check_threading_default=yes
- fi
- AC_ARG_ENABLE(threading,AC_HELP_STRING([--disable-threading],[disables threading even if libpthread found]),
- kde_use_threading=$enableval, kde_use_threading=$kde_check_threading_default)
- if test "x$kde_use_threading" = "xyes"; then
- AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define if you have a working libpthread (will enable threaded code)])
- fi
-])
-
-AC_DEFUN([KDE_TRY_LINK_PYTHON],
-[
-if test "$kde_python_link_found" = no; then
-
-if test "$1" = normal; then
- AC_MSG_CHECKING(if a Python application links)
-else
- AC_MSG_CHECKING(if Python depends on $2)
-fi
-
-AC_CACHE_VAL(kde_cv_try_link_python_$1,
-[
-kde_save_cflags="$CFLAGS"
-CFLAGS="$CFLAGS $PYTHONINC"
-kde_save_libs="$LIBS"
-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
-kde_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-AC_TRY_LINK(
-[
-#include <Python.h>
-],[
- PySys_SetArgv(1, 0);
-],
- [kde_cv_try_link_python_$1=yes],
- [kde_cv_try_link_python_$1=no]
-)
-CFLAGS="$kde_save_cflags"
-LIBS="$kde_save_libs"
-LDFLAGS="$kde_save_ldflags"
-])
-
-if test "$kde_cv_try_link_python_$1" = "yes"; then
- AC_MSG_RESULT(yes)
- kde_python_link_found=yes
- if test ! "$1" = normal; then
- LIBPYTHON="$LIBPYTHON $2"
- fi
- $3
-else
- AC_MSG_RESULT(no)
- $4
-fi
-
-fi
-
-])
-
-AC_DEFUN([KDE_CHECK_PYTHON_DIR],
-[
-AC_MSG_CHECKING([for Python directory])
-
-AC_CACHE_VAL(kde_cv_pythondir,
-[
- if test -z "$PYTHONDIR"; then
- kde_cv_pythondir=/usr/local
- else
- kde_cv_pythondir="$PYTHONDIR"
- fi
-])
-
-AC_ARG_WITH(pythondir,
-AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]),
-[
- ac_python_dir=$withval
-], ac_python_dir=$kde_cv_pythondir
-)
-
-AC_MSG_RESULT($ac_python_dir)
-])
-
-AC_DEFUN([KDE_CHECK_PYTHON_INTERN],
-[
-AC_REQUIRE([KDE_CHECK_LIBDL])
-AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
-AC_REQUIRE([KDE_CHECK_PYTHON_DIR])
-
-if test -z "$1"; then
- version="1.5"
-else
- version="$1"
-fi
-
-AC_MSG_CHECKING([for Python$version])
-
-python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-AC_FIND_FILE(Python.h, $python_incdirs, python_incdir)
-if test ! -r $python_incdir/Python.h; then
- AC_FIND_FILE(python$version/Python.h, $python_incdirs, python_incdir)
- python_incdir=$python_incdir/python$version
- if test ! -r $python_incdir/Python.h; then
- python_incdir=no
- fi
-fi
-
-PYTHONINC=-I$python_incdir
-
-python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
-AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
-if test ! -r $python_libdir/libpython$version.so; then
- AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
- if test ! -r $python_libdir/libpython$version.a; then
- AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir)
- python_libdir=$python_libdir/python$version/config
- if test ! -r $python_libdir/libpython$version.a; then
- python_libdir=no
- fi
- fi
-fi
-
-PYTHONLIB=-L$python_libdir
-kde_orig_LIBPYTHON=$LIBPYTHON
-if test -z "$LIBPYTHON"; then
- LIBPYTHON=-lpython$version
-fi
-
-AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
-python_moddir=$python_moddir/python$version
-if test ! -r $python_moddir/copy.py; then
- python_moddir=no
-fi
-
-PYTHONMODDIR=$python_moddir
-
-AC_MSG_RESULT(header $python_incdir library $python_libdir modules $python_moddir)
-
-if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
- LIBPYTHON=$kde_orig_LIBPYTHON
- test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
- test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
- $2
-else
- dnl Note: this test is very weak
- kde_python_link_found=no
- KDE_TRY_LINK_PYTHON(normal)
- KDE_TRY_LINK_PYTHON(m, -lm)
- KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD)
- KDE_TRY_LINK_PYTHON(tcl, -ltcl)
- KDE_TRY_LINK_PYTHON(db2, -ldb2)
- KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm])
- KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil])
- KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil])
- KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3])
- KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil])
- KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm])
- KDE_TRY_LINK_PYTHON(pthread_and_panel_curses, [$LIBPTHREAD $LIBDL -lm -lpanel -lcurses])
- KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [],
- [AC_MSG_WARN([it seems, Python depends on another library.
- Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
- and contact the authors to let them know about this problem])
- ])
-
- LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
- AC_SUBST(PYTHONINC)
- AC_SUBST(PYTHONLIB)
- AC_SUBST(LIBPYTHON)
- AC_SUBST(PYTHONMODDIR)
- AC_DEFINE(HAVE_PYTHON, 1, [Define if you have the development files for python])
-fi
-
-])
-
-
-AC_DEFUN([KDE_CHECK_PYTHON],
-[
- KDE_CHECK_PYTHON_INTERN("2.5",
- [KDE_CHECK_PYTHON_INTERN("2.4",
- [KDE_CHECK_PYTHON_INTERN("2.3",
- [KDE_CHECK_PYTHON_INTERN("2.2",
- [KDE_CHECK_PYTHON_INTERN("2.1",
- [KDE_CHECK_PYTHON_INTERN("2.0",
- [KDE_CHECK_PYTHON_INTERN($1, $2) ])
- ])
- ])
- ])
- ])
- ])
-])
-
-AC_DEFUN([KDE_CHECK_STL],
-[
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- ac_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-
- AC_MSG_CHECKING([if C++ programs can be compiled])
- AC_CACHE_VAL(kde_cv_stl_works,
- [
- AC_TRY_COMPILE([
-#include <string>
-using namespace std;
-],[
- string astring="Hallo Welt.";
- astring.erase(0, 6); // now astring is "Welt"
- return 0;
-], kde_cv_stl_works=yes,
- kde_cv_stl_works=no)
-])
-
- AC_MSG_RESULT($kde_cv_stl_works)
-
- if test "$kde_cv_stl_works" = "yes"; then
- # back compatible
- AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
- else
- AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs.
-Check config.log for details - if you're using a Linux distribution you might miss
-a package named similar to libstdc++-dev.])
- fi
-
- CXXFLAGS="$ac_save_CXXFLAGS"
- AC_LANG_RESTORE
-])
-
-AC_DEFUN([AC_FIND_QIMGIO],
- [AC_REQUIRE([AC_FIND_JPEG])
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for qimgio])
-AC_CACHE_VAL(ac_cv_lib_qimgio,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_save_LIBS="$LIBS"
-ac_save_CXXFLAGS="$CXXFLAGS"
-LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-AC_TRY_RUN(dnl
-[
-#include <qimageio.h>
-#include <qstring.h>
-int main() {
- QString t = "hallo";
- t.fill('t');
- qInitImageIO();
-}
-],
- ac_cv_lib_qimgio=yes,
- ac_cv_lib_qimgio=no,
- ac_cv_lib_qimgio=no)
-LIBS="$ac_save_LIBS"
-CXXFLAGS="$ac_save_CXXFLAGS"
-AC_LANG_RESTORE
-])dnl
-if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then
- LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG"
- AC_MSG_RESULT(yes)
- AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available])
- AC_SUBST(LIBQIMGIO)
-else
- AC_MSG_RESULT(not found)
-fi
-])
-
-AC_DEFUN([AM_DISABLE_LIBRARIES],
-[
- AC_PROVIDE([AM_ENABLE_STATIC])
- AC_PROVIDE([AM_ENABLE_SHARED])
- enable_static=no
- enable_shared=yes
-])
-
-
-AC_DEFUN([AC_CHECK_UTMP_FILE],
-[
- AC_MSG_CHECKING([for utmp file])
-
- AC_CACHE_VAL(kde_cv_utmp_file,
- [
- kde_cv_utmp_file=no
-
- for ac_file in \
- \
- /var/run/utmp \
- /var/adm/utmp \
- /etc/utmp \
- ; \
- do
- if test -r "$ac_file"; then
- kde_cv_utmp_file=$ac_file
- break
- fi
- done
- ])
-
- if test "$kde_cv_utmp_file" != "no"; then
- AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
- $1
- AC_MSG_RESULT($kde_cv_utmp_file)
- else
- $2
- AC_MSG_RESULT([non found])
- fi
-])
-
-
-AC_DEFUN([KDE_CREATE_SUBDIRSLIST],
-[
-
-DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
-TOPSUBDIRS=""
-
-if test ! -s $srcdir/subdirs; then
- dnl Note: Makefile.common creates subdirs, so this is just a fallback
- files=`cd $srcdir && ls -1`
- dirs=`for i in $files; do if test -d $i; then echo $i; fi; done`
- for i in $dirs; do
- echo $i >> $srcdir/subdirs
- done
-fi
-
-ac_topsubdirs=
-if test -s $srcdir/inst-apps; then
- ac_topsubdirs="`cat $srcdir/inst-apps`"
-elif test -s $srcdir/subdirs; then
- ac_topsubdirs="`cat $srcdir/subdirs`"
-fi
-
-for i in $ac_topsubdirs; do
- AC_MSG_CHECKING([if $i should be compiled])
- if test -d $srcdir/$i; then
- install_it="yes"
- for j in $DO_NOT_COMPILE; do
- if test $i = $j; then
- install_it="no"
- fi
- done
- else
- install_it="no"
- fi
- AC_MSG_RESULT($install_it)
- vari=`echo $i | sed -e 's,[[-+.@]],_,g'`
- if test $install_it = "yes"; then
- TOPSUBDIRS="$TOPSUBDIRS $i"
- eval "$vari""_SUBDIR_included=yes"
- else
- eval "$vari""_SUBDIR_included=no"
- fi
-done
-
-AC_SUBST(TOPSUBDIRS)
-])
-
-AC_DEFUN([KDE_CHECK_NAMESPACES],
-[
-AC_MSG_CHECKING(whether C++ compiler supports namespaces)
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE([
-],
-[
-namespace Foo {
- extern int i;
- namespace Bar {
- extern int i;
- }
-}
-
-int Foo::i = 0;
-int Foo::Bar::i = 1;
-],[
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_NAMESPACES)
-], [
-AC_MSG_RESULT(no)
-])
-AC_LANG_RESTORE
-])
-
-dnl ------------------------------------------------------------------------
-dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_CHECK_S_ISSOCK],
-[
-AC_MSG_CHECKING(for S_ISSOCK)
-AC_CACHE_VAL(ac_cv_have_s_issock,
-[
-AC_TRY_LINK(
-[
-#include <sys/stat.h>
-],
-[
-struct stat buff;
-int b = S_ISSOCK( buff.st_mode );
-],
-ac_cv_have_s_issock=yes,
-ac_cv_have_s_issock=no)
-])
-AC_MSG_RESULT($ac_cv_have_s_issock)
-if test "$ac_cv_have_s_issock" = "yes"; then
- AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.])
-fi
-
-AH_VERBATIM(_ISSOCK,
-[
-#ifndef HAVE_S_ISSOCK
-#define HAVE_S_ISSOCK
-#define S_ISSOCK(mode) (1==0)
-#endif
-])
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure@kde.org
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_CHECK_KDEMAXPATHLEN],
-[
-AC_MSG_CHECKING(for MAXPATHLEN)
-AC_CACHE_VAL(ac_cv_maxpathlen,
-[
-cat > conftest.$ac_ext <<EOF
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-#include <stdio.h>
-#include <sys/param.h>
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-KDE_HELLO MAXPATHLEN
-
-EOF
-
-ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out"
-
-if AC_TRY_EVAL(ac_try) && test -s conftest.out; then
- ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out`
-else
- ac_cv_maxpathlen=1024
-fi
-
-rm conftest.*
-
-])
-AC_MSG_RESULT($ac_cv_maxpathlen)
-AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
-])
-
-AC_DEFUN([KDE_CHECK_HEADER],
-[
- kde_safe_cppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $all_includes"
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_CHECK_HEADER([$1], [$2], [$3], [$4])
- AC_LANG_RESTORE
- CPPFLAGS=$kde_safe_cppflags
-])
-
-AC_DEFUN([KDE_CHECK_HEADERS],
-[
- AH_CHECK_HEADERS([$1])
- AC_LANG_SAVE
- kde_safe_cppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $all_includes"
- AC_LANG_CPLUSPLUS
- AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
- CPPFLAGS=$kde_safe_cppflags
- AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_FAST_CONFIGURE],
-[
- dnl makes configure fast (needs perl)
- AC_ARG_ENABLE(fast-perl, AC_HELP_STRING([--disable-fast-perl],[disable fast Makefile generation (needs perl)]),
- with_fast_perl=$enableval, with_fast_perl=yes)
-])
-
-AC_DEFUN([KDE_CONF_FILES],
-[
- val=
- if test -f $srcdir/configure.files ; then
- val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files`
- fi
- CONF_FILES=
- if test -n "$val" ; then
- for i in $val ; do
- CONF_FILES="$CONF_FILES $i"
- done
- fi
- AC_SUBST(CONF_FILES)
-])dnl
-
-dnl This sets the prefix, for arts and tdelibs
-dnl Do NOT use in any other module.
-dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
-AC_DEFUN([KDE_SET_PREFIX_CORE],
-[
- unset CDPATH
- dnl make $TDEDIR the default for the installation
- AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
-
- if test "x$prefix" = "xNONE"; then
- prefix=$ac_default_prefix
- ac_configure_args="$ac_configure_args --prefix=$prefix"
- fi
- # And delete superfluous '/' to make compares easier
- prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
- exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-
- kde_libs_prefix='$(prefix)'
- kde_libs_htmldir='$(kde_htmldir)'
- AC_SUBST(kde_libs_prefix)
- AC_SUBST(kde_libs_htmldir)
- KDE_FAST_CONFIGURE
- KDE_CONF_FILES
-])
-
-
-AC_DEFUN([KDE_SET_PREFIX],
-[
- unset CDPATH
- dnl We can't give real code to that macro, only a value.
- dnl It only matters for --help, since we set the prefix in this function anyway.
- AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
-
- KDE_SET_DEFAULT_BINDIRS
- if test "x$prefix" = "xNONE"; then
- dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
- KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
- else
- dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
- kde_save_PATH="$PATH"
- PATH="$exec_prefix/bin:$prefix/bin:$PATH"
- KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
- PATH="$kde_save_PATH"
- fi
-
- kde_libs_prefix=`$KDECONFIG --prefix`
- if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
- AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
- This means it has been moved since you installed it.
- This won't work. Please recompile tdelibs for the new prefix.
- ])
- fi
- kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-
- AC_MSG_CHECKING([where to install])
- if test "x$prefix" = "xNONE"; then
- prefix=$kde_libs_prefix
- AC_MSG_RESULT([$prefix (as returned by tde-config)])
- else
- dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
- given_prefix=$prefix
- AC_MSG_RESULT([$prefix (as requested)])
- fi
-
- # And delete superfluous '/' to make compares easier
- prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
- exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
- given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-
- AC_SUBST(KDECONFIG)
- AC_SUBST(kde_libs_prefix)
- AC_SUBST(kde_libs_htmldir)
-
- KDE_FAST_CONFIGURE
- KDE_CONF_FILES
-])
-
-pushdef([AC_PROG_INSTALL],
-[
- dnl our own version, testing for a -p flag
- popdef([AC_PROG_INSTALL])
- dnl as AC_PROG_INSTALL works as it works we first have
- dnl to save if the user didn't specify INSTALL, as the
- dnl autoconf one overwrites INSTALL and we have no chance to find
- dnl out afterwards
- test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
- test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM
- test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT
- AC_PROG_INSTALL
-
- if test -z "$kde_save_INSTALL_given" ; then
- # OK, user hasn't given any INSTALL, autoconf found one for us
- # now we test, if it supports the -p flag
- AC_MSG_CHECKING(for -p flag to install)
- rm -f confinst.$$.* > /dev/null 2>&1
- echo "Testtest" > confinst.$$.orig
- ac_res=no
- if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then
- if test -f confinst.$$.new ; then
- # OK, -p seems to do no harm to install
- INSTALL="${INSTALL} -p"
- ac_res=yes
- fi
- fi
- rm -f confinst.$$.*
- AC_MSG_RESULT($ac_res)
- fi
- dnl the following tries to resolve some signs and wonders coming up
- dnl with different autoconf/automake versions
- dnl e.g.:
- dnl *automake 1.4 install-strip sets A_M_INSTALL_PROGRAM_FLAGS to -s
- dnl and has INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(A_M_INSTALL_PROGRAM_FLAGS)
- dnl it header-vars.am, so there the actual INSTALL_PROGRAM gets the -s
- dnl *automake 1.4a (and above) use INSTALL_STRIP_FLAG and only has
- dnl INSTALL_PROGRAM = @INSTALL_PROGRAM@ there, but changes the
- dnl install-@DIR@PROGRAMS targets to explicitly use that flag
- dnl *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as
- dnl INSTALL_SCRIPT, which breaks with automake <= 1.4
- dnl *autoconf >2.13 (since 10.Apr 1999) has not that failure
- dnl *sometimes KDE does not use the install-@DIR@PROGRAM targets from
- dnl automake (due to broken Makefile.am or whatever) to install programs,
- dnl and so does not see the -s flag in automake > 1.4
- dnl to clean up that mess we:
- dnl +set INSTALL_PROGRAM to use INSTALL_STRIP_FLAG
- dnl which cleans KDE's program with automake > 1.4;
- dnl +set INSTALL_SCRIPT to only use INSTALL, to clean up autoconf's problems
- dnl with automake<=1.4
- dnl note that dues to this sometimes two '-s' flags are used (if KDE
- dnl properly uses install-@DIR@PROGRAMS, but I don't care
- dnl
- dnl And to all this comes, that I even can't write in comments variable
- dnl names used by automake, because it is so stupid to think I wanted to
- dnl _use_ them, therefor I have written A_M_... instead of AM_
- dnl hmm, I wanted to say something ... ahh yes: Arghhh.
-
- if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
- INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)'
- fi
- if test -z "$kde_save_INSTALL_SCRIPT_given" ; then
- INSTALL_SCRIPT='${INSTALL}'
- fi
-])dnl
-
-AC_DEFUN([KDE_LANG_CPLUSPLUS],
-[AC_LANG_CPLUSPLUS
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
-pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS])
-])
-
-pushdef([AC_LANG_CPLUSPLUS],
-[popdef([AC_LANG_CPLUSPLUS])
-KDE_LANG_CPLUSPLUS
-])
-
-AC_DEFUN([KDE_CHECK_LONG_LONG],
-[
-AC_MSG_CHECKING(for long long)
-AC_CACHE_VAL(kde_cv_c_long_long,
-[
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_TRY_LINK([], [
- long long foo = 0;
- foo = foo+1;
- ],
- kde_cv_c_long_long=yes, kde_cv_c_long_long=no)
- AC_LANG_RESTORE
-])
-AC_MSG_RESULT($kde_cv_c_long_long)
-if test "$kde_cv_c_long_long" = yes; then
- AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have long long as datatype])
-fi
-])
-
-AC_DEFUN([KDE_CHECK_LIB],
-[
- kde_save_LDFLAGS="$LDFLAGS"
- dnl AC_CHECK_LIB modifies LIBS, so save it here
- kde_save_LIBS="$LIBS"
- LDFLAGS="$LDFLAGS $all_libraries"
- case $host_os in
- aix*) LDFLAGS="-brtl $LDFLAGS"
- test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
- ;;
- esac
- AC_CHECK_LIB($1, $2, $3, $4, $5)
- LDFLAGS="$kde_save_LDFLAGS"
- LIBS="$kde_save_LIBS"
-])
-
-AC_DEFUN([KDE_JAVA_PREFIX],
-[
- dir=`dirname "$1"`
- base=`basename "$1"`
- list=`ls -1 $dir 2> /dev/null`
- for entry in $list; do
- if test -d $dir/$entry/bin; then
- case $entry in
- $base)
- javadirs="$javadirs $dir/$entry/bin"
- ;;
- esac
- elif test -d $dir/$entry/jre/bin; then
- case $entry in
- $base)
- javadirs="$javadirs $dir/$entry/jre/bin"
- ;;
- esac
- fi
- done
-])
-
-dnl KDE_CHEC_JAVA_DIR(onlyjre)
-AC_DEFUN([KDE_CHECK_JAVA_DIR],
-[
-
-AC_ARG_WITH(java,
-AC_HELP_STRING([--with-java=javadir],[use java installed in javadir, --without-java disables]),
-[ ac_java_dir=$withval
-], ac_java_dir=""
-)
-
-AC_MSG_CHECKING([for Java])
-
-dnl at this point ac_java_dir is either a dir, 'no' to disable, or '' to say look in $PATH
-if test "x$ac_java_dir" = "xno"; then
- kde_java_bindir=no
- kde_java_includedir=no
- kde_java_libjvmdir=no
- kde_java_libgcjdir=no
- kde_java_libhpidir=no
-else
- if test "x$ac_java_dir" = "x"; then
-
-
- dnl No option set -> collect list of candidate paths
- if test -n "$JAVA_HOME"; then
- KDE_JAVA_PREFIX($JAVA_HOME)
- fi
- KDE_JAVA_PREFIX(/usr/j2se)
- KDE_JAVA_PREFIX(/usr/lib/j2se)
- KDE_JAVA_PREFIX(/usr/j*dk*)
- KDE_JAVA_PREFIX(/usr/lib/j*dk*)
- KDE_JAVA_PREFIX(/opt/j*sdk*)
- KDE_JAVA_PREFIX(/usr/lib/java*)
- KDE_JAVA_PREFIX(/usr/java*)
- KDE_JAVA_PREFIX(/usr/java/j*dk*)
- KDE_JAVA_PREFIX(/usr/java/j*re*)
- KDE_JAVA_PREFIX(/usr/lib/SunJava2*)
- KDE_JAVA_PREFIX(/usr/lib/SunJava*)
- KDE_JAVA_PREFIX(/usr/lib/IBMJava2*)
- KDE_JAVA_PREFIX(/usr/lib/IBMJava*)
- KDE_JAVA_PREFIX(/opt/java*)
-
- kde_cv_path="NONE"
- kde_save_IFS=$IFS
- IFS=':'
- for dir in $PATH; do
- if test -d "$dir"; then
- javadirs="$javadirs $dir"
- fi
- done
- IFS=$kde_save_IFS
- jredirs=
-
- dnl Now javadirs contains a list of paths that exist, all ending with bin/
- for dir in $javadirs; do
- dnl Check for the java executable
- if test -x "$dir/java"; then
- sane_path=$(cd $dir; /bin/pwd)
- dnl And also check for a libjvm.so somewhere under there
- dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
- if test "$sane_path" != "/usr/bin"; then
- libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
- if test ! -f $libjvmdir/libjvm.so; then continue; fi
- jredirs="$jredirs $dir"
- fi
- fi
- done
-
- dnl Now jredirs contains a reduced list, of paths where both java and ../**/libjvm.so was found
- JAVAC=
- JAVA=
- kde_java_bindir=no
- for dir in $jredirs; do
- JAVA="$dir/java"
- kde_java_bindir=$dir
- if test -x "$dir/javac"; then
- JAVAC="$dir/javac"
- break
- fi
- done
-
- if test -n "$JAVAC"; then
- dnl this substitution might not work - well, we test for jni.h below
- kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'`
- else
- kde_java_includedir=no
- fi
- else
- dnl config option set
- kde_java_bindir=$ac_java_dir/bin
- if test -x $ac_java_dir/bin/java && test ! -x $ac_java_dir/bin/javac; then
- kde_java_includedir=no
- else
- kde_java_includedir=$ac_java_dir/include
- fi
- fi
-fi
-
-dnl At this point kde_java_bindir and kde_java_includedir are either set or "no"
-if test "x$kde_java_bindir" != "xno"; then
-
- dnl Look for libjvm.so
- kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
- dnl Look for libgcj.so
- kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
- dnl Look for libhpi.so and avoid green threads
- kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
-
- dnl Now check everything's fine under there
- dnl the include dir is our flag for having the JDK
- if test -d "$kde_java_includedir"; then
- if test ! -x "$kde_java_bindir/javac"; then
- AC_MSG_ERROR([javac not found under $kde_java_bindir - it seems you passed a wrong --with-java.])
- fi
- if test ! -x "$kde_java_bindir/javah"; then
- AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
- fi
- if test ! -x "$kde_java_bindir/jar"; then
- AC_MSG_ERROR([jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
- fi
- if test ! -r "$kde_java_includedir/jni.h"; then
- AC_MSG_ERROR([jni.h not found under $kde_java_includedir. Use --with-java or --without-java.])
- fi
-
- jni_includes="-I$kde_java_includedir"
- dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
- dnl and under linux here..
-
- dnl not needed for gcj
-
- if test "x$kde_java_libgcjdir" = "x"; then
- test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux"
- test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris"
- test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix"
- fi
-
- else
- JAVAC=
- jni_includes=
- fi
-
- if test "x$kde_java_libgcjdir" = "x"; then
- if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
- AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.])
- fi
- else
- if test ! -r "$kde_java_libgcjdir/libgcj.so"; then
- AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.])
- fi
- fi
-
- if test ! -x "$kde_java_bindir/java"; then
- AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
- fi
-
- dnl not needed for gcj compile
-
- if test "x$kde_java_libgcjdir" = "x"; then
- if test ! -r "$kde_java_libhpidir/libhpi.so"; then
- AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
- fi
- fi
-
- if test -n "$jni_includes"; then
- dnl Check for JNI version
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- ac_cxxflags_safe="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $all_includes $jni_includes"
-
- AC_TRY_COMPILE([
- #include <jni.h>
- ],
- [
- #ifndef JNI_VERSION_1_2
- Syntax Error
- #endif
- ],[ kde_jni_works=yes ],
- [ kde_jni_works=no ])
-
- if test $kde_jni_works = no; then
- AC_MSG_ERROR([Incorrect version of $kde_java_includedir/jni.h.
- You need to have Java Development Kit (JDK) version 1.2.
-
- Use --with-java to specify another location.
- Use --without-java to configure without java support.
- Or download a newer JDK and try again.
- See e.g. http://java.sun.com/products/jdk/1.2 ])
- fi
-
- CXXFLAGS="$ac_cxxflags_safe"
- AC_LANG_RESTORE
-
- dnl All tests ok, inform and subst the variables
-
- JAVAC=$kde_java_bindir/javac
- JAVAH=$kde_java_bindir/javah
- JAR=$kde_java_bindir/jar
- AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
- if test "x$kde_java_libgcjdir" = "x"; then
- JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
- else
- JVMLIBS="-L$kde_java_libgcjdir -lgcj"
- fi
- AC_MSG_RESULT([java JDK in $kde_java_bindir])
-
- else
- AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
- AC_MSG_RESULT([java JRE in $kde_java_bindir])
- fi
-elif test -d "/Library/Java/Home"; then
- kde_java_bindir="/Library/Java/Home/bin"
- jni_includes="-I/Library/Java/Home/include"
-
- JAVAC=$kde_java_bindir/javac
- JAVAH=$kde_java_bindir/javah
- JAR=$kde_java_bindir/jar
- JVMLIBS="-Wl,-framework,JavaVM"
-
- AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
- AC_MSG_RESULT([Apple Java Framework])
-else
- AC_MSG_RESULT([none found])
-fi
-
-AC_SUBST(JAVAC)
-AC_SUBST(JAVAH)
-AC_SUBST(JAR)
-AC_SUBST(JVMLIBS)
-AC_SUBST(jni_includes)
-
-# for backward compat
-kde_cv_java_includedir=$kde_java_includedir
-kde_cv_java_bindir=$kde_java_bindir
-])
-
-dnl this is a redefinition of autoconf 2.5x's AC_FOREACH.
-dnl When the argument list becomes big, as in KDE for AC_OUTPUT in
-dnl big packages, m4_foreach is dog-slow. So use our own version of
-dnl it. (matz@kde.org)
-m4_define([mm_foreach],
-[m4_pushdef([$1])_mm_foreach($@)m4_popdef([$1])])
-m4_define([mm_car], [[$1]])
-m4_define([mm_car2], [[$@]])
-m4_define([_mm_foreach],
-[m4_if(m4_quote($2), [], [],
- [m4_define([$1], mm_car($2))$3[]_mm_foreach([$1],
- mm_car2(m4_shift($2)),
- [$3])])])
-m4_define([AC_FOREACH],
-[mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])])
-
-AC_DEFUN([KDE_NEED_FLEX],
-[
-kde_libs_safe=$LIBS
-LIBS="$LIBS $USER_LDFLAGS"
-AM_PROG_LEX
-LIBS=$kde_libs_safe
-if test -z "$LEXLIB"; then
- AC_MSG_ERROR([You need to have flex installed.])
-fi
-AC_SUBST(LEXLIB)
-])
-
-AC_DEFUN([AC_PATH_QTOPIA],
-[
- dnl TODO: use AC_CACHE_VAL
-
- if test -z "$1"; then
- qtopia_minver_maj=1
- qtopia_minver_min=5
- qtopia_minver_pat=0
- else
- qtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"`
- qtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"`
- qtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"`
- fi
-
- qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
- qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat"
-
- AC_REQUIRE([AC_PATH_QT])
-
- AC_MSG_CHECKING([for Qtopia])
-
- LIB_QTOPIA="-lqpe"
- AC_SUBST(LIB_QTOPIA)
-
- kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
-
- ac_qtopia_incdir=NO
-
- AC_ARG_WITH(qtopia-dir,
- AC_HELP_STRING([--with-qtopia-dir=DIR],[where the root of Qtopia is installed]),
- [ ac_qtopia_incdir="$withval"/include] )
-
- qtopia_incdirs=""
- for dir in $kde_qtopia_dirs; do
- qtopia_incdirs="$qtopia_incdirs $dir/include"
- done
-
- if test ! "$ac_qtopia_incdir" = "NO"; then
- qtopia_incdirs="$ac_qtopia_incdir $qtopia_incdirs"
- fi
-
- qtopia_incdir=""
- AC_FIND_FILE(qpe/qpeapplication.h, $qtopia_incdirs, qtopia_incdir)
- ac_qtopia_incdir="$qtopia_incdir"
-
- if test -z "$qtopia_incdir"; then
- AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.])
- fi
-
- qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`;
- qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`;
- qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`;
-
- qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat"
- qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat"
- if test "$qtopia_ver" -lt "$qtopia_minver"; then
- AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr
-is required.])
- fi
-
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-
- ac_cxxflags_safe="$CXXFLAGS"
- ac_ldflags_safe="$LDFLAGS"
- ac_libs_safe="$LIBS"
-
- CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
- LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
- LIBS="$LIBS $LIB_QTOPIA $LIBQT"
-
- cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qpe/qpeapplication.h>
-#include <qpe/version.h>
-
-int main( int argc, char **argv )
-{
- QPEApplication app( argc, argv );
- return 0;
-}
-EOF
-
- if AC_TRY_EVAL(ac_link) && test -s conftest; then
- rm -f conftest*
- else
- rm -f conftest*
- AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at
-the end of config.log])
- fi
-
- CXXFLAGS="$ac_cxxflags_safe"
- LDFLAGS="$ac_ldflags_safe"
- LIBS="$ac_libs_safe"
-
- AC_LANG_RESTORE
-
- QTOPIA_INCLUDES="-I$qtopia_incdir"
- AC_SUBST(QTOPIA_INCLUDES)
-
- AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir])
-])
-
-
-AC_DEFUN([KDE_INIT_DOXYGEN],
-[
-AC_MSG_CHECKING([for Qt docs])
-kde_qtdir=
-if test "${with_qt_dir+set}" = set; then
- kde_qtdir="$with_qt_dir"
-fi
-
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-AC_MSG_RESULT($QTDOCDIR)
-
-AC_SUBST(QTDOCDIR)
-
-KDE_FIND_PATH(dot, DOT, [], [])
-if test -n "$DOT"; then
- KDE_HAVE_DOT="YES"
-else
- KDE_HAVE_DOT="NO"
-fi
-AC_SUBST(KDE_HAVE_DOT)
-KDE_FIND_PATH(doxygen, DOXYGEN, [], [])
-AC_SUBST(DOXYGEN)
-
-DOXYGEN_PROJECT_NAME="$1"
-DOXYGEN_PROJECT_NUMBER="$2"
-AC_SUBST(DOXYGEN_PROJECT_NAME)
-AC_SUBST(DOXYGEN_PROJECT_NUMBER)
-
-KDE_HAS_DOXYGEN=no
-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
- KDE_HAS_DOXYGEN=yes
-fi
-AC_SUBST(KDE_HAS_DOXYGEN)
-
-])
-
-
-AC_DEFUN([AC_FIND_BZIP2],
-[
-AC_MSG_CHECKING([for bzDecompress in libbz2])
-AC_CACHE_VAL(ac_cv_lib_bzip2,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET"
-kde_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(dnl
-[
-#define BZ_NO_STDIO
-#include<bzlib.h>
-],
- [ bz_stream s; (void) bzDecompress(&s); ],
- eval "ac_cv_lib_bzip2='-lbz2'",
- eval "ac_cv_lib_bzip2=no")
-LIBS="$kde_save_LIBS"
-CXXFLAGS="$kde_save_CXXFLAGS"
-AC_LANG_RESTORE
-])dnl
-AC_MSG_RESULT($ac_cv_lib_bzip2)
-
-if test ! "$ac_cv_lib_bzip2" = no; then
- BZIP2DIR=bzip2
-
- LIBBZ2="$ac_cv_lib_bzip2"
- AC_SUBST(LIBBZ2)
-
-else
-
- cxx_shared_flag=
- ld_shared_flag=
- KDE_CHECK_COMPILER_FLAG(shared, [
- ld_shared_flag="-shared"
- ])
- KDE_CHECK_COMPILER_FLAG(fPIC, [
- cxx_shared_flag="-fPIC"
- ])
-
- AC_MSG_CHECKING([for BZ2_bzDecompress in (shared) libbz2])
- AC_CACHE_VAL(ac_cv_lib_bzip2_prefix,
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- kde_save_LIBS="$LIBS"
- LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET"
- kde_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES"
-
- AC_TRY_LINK(dnl
- [
- #define BZ_NO_STDIO
- #include<bzlib.h>
- ],
- [ bz_stream s; (void) BZ2_bzDecompress(&s); ],
- eval "ac_cv_lib_bzip2_prefix='-lbz2'",
- eval "ac_cv_lib_bzip2_prefix=no")
- LIBS="$kde_save_LIBS"
- CXXFLAGS="$kde_save_CXXFLAGS"
- AC_LANG_RESTORE
- ])dnl
-
- AC_MSG_RESULT($ac_cv_lib_bzip2_prefix)
-
- if test ! "$ac_cv_lib_bzip2_prefix" = no; then
- BZIP2DIR=bzip2
-
- LIBBZ2="$ac_cv_lib_bzip2_prefix"
- AC_SUBST(LIBBZ2)
-
- AC_DEFINE(NEED_BZ2_PREFIX, 1, [Define if the libbz2 functions need the BZ2_ prefix])
- dnl else, we just ignore this
- fi
-
-fi
-AM_CONDITIONAL(include_BZIP2, test -n "$BZIP2DIR")
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the SSL headers and libraries.
-dnl $(SSL_LDFLAGS) will be -Lsslliblocation (if needed)
-dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([KDE_CHECK_SSL],
-[
-LIBSSL="-lssl -lcrypto"
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-ac_ssl_includes=NO ac_ssl_libraries=NO
-ssl_libraries=""
-ssl_includes=""
-AC_ARG_WITH(ssl-dir,
- AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
- [ ac_ssl_includes="$withval"/include
- ac_ssl_libraries="$withval"/lib$tdelibsuff
- ])
-
-want_ssl=yes
-AC_ARG_WITH(ssl,
- AC_HELP_STRING([--without-ssl],[disable SSL checks]),
- [want_ssl=$withval])
-
-if test $want_ssl = yes; then
-
-AC_MSG_CHECKING(for OpenSSL)
-
-AC_CACHE_VAL(ac_cv_have_ssl,
-[#try to guess OpenSSL locations
-
- ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes"
- ssl_incdirs="$ac_ssl_includes $ssl_incdirs"
- AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
- ac_ssl_includes="$ssl_incdir"
-
- ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
- if test ! "$ac_ssl_libraries" = "NO"; then
- ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
- fi
-
- test=NONE
- ssl_libdir=NONE
- for dir in $ssl_libdirs; do
- try="ls -1 $dir/libssl*"
- if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
- done
-
- ac_ssl_libraries="$ssl_libdir"
-
- ac_ldflags_safe="$LDFLAGS"
- ac_libs_safe="$LIBS"
-
- LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries"
- LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref"
-
- AC_TRY_LINK(,void RSAPrivateEncrypt(void);RSAPrivateEncrypt();,
- ac_ssl_rsaref="yes"
- ,
- ac_ssl_rsaref="no"
- )
-
- LDFLAGS="$ac_ldflags_safe"
- LIBS="$ac_libs_safe"
-
- if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then
- have_ssl=no
- else
- have_ssl=yes;
- fi
-
- ])
-
- eval "$ac_cv_have_ssl"
-
- AC_MSG_RESULT([libraries $ac_ssl_libraries, headers $ac_ssl_includes])
-
- AC_MSG_CHECKING([whether OpenSSL uses rsaref])
- AC_MSG_RESULT($ac_ssl_rsaref)
-
- AC_MSG_CHECKING([for easter eggs])
- AC_MSG_RESULT([none found])
-
-else
- have_ssl=no
-fi
-
-if test "$have_ssl" = yes; then
- AC_MSG_CHECKING(for OpenSSL version)
- dnl Check for SSL version
- AC_CACHE_VAL(ac_cv_ssl_version,
- [
-
- cat >conftest.$ac_ext <<EOF
-#include <openssl/opensslv.h>
-#include <stdio.h>
- int main() {
-
-#ifndef OPENSSL_VERSION_NUMBER
- printf("ssl_version=\\"error\\"\n");
-#else
- if (OPENSSL_VERSION_NUMBER < 0x00906000)
- printf("ssl_version=\\"old\\"\n");
- else
- printf("ssl_version=\\"ok\\"\n");
-#endif
- return (0);
- }
-EOF
-
- ac_save_CPPFLAGS=$CPPFLAGS
- if test "$ac_ssl_includes" != "/usr/include"; then
- CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes"
- fi
-
- if AC_TRY_EVAL(ac_link); then
-
- if eval `./conftest 2>&5`; then
- if test $ssl_version = error; then
- AC_MSG_ERROR([$ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !])
- else
- if test $ssl_version = old; then
- AC_MSG_WARN([OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled.])
- have_ssl=no
- fi
- fi
- ac_cv_ssl_version="ssl_version=$ssl_version"
- else
- AC_MSG_ERROR([Your system couldn't run a small SSL test program.
- Check config.log, and if you can't figure it out, send a mail to
- David Faure <faure@kde.org>, attaching your config.log])
- fi
-
- else
- AC_MSG_ERROR([Your system couldn't link a small SSL test program.
- Check config.log, and if you can't figure it out, send a mail to
- David Faure <faure@kde.org>, attaching your config.log])
- fi
- CPPFLAGS=$ac_save_CPPFLAGS
-
- ])
-
- eval "$ac_cv_ssl_version"
- AC_MSG_RESULT($ssl_version)
-fi
-
-if test "$have_ssl" != yes; then
- LIBSSL="";
-else
- AC_DEFINE(HAVE_SSL, 1, [If we are going to use OpenSSL])
- ac_cv_have_ssl="have_ssl=yes \
- ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref"
-
-
- ssl_libraries="$ac_ssl_libraries"
- ssl_includes="$ac_ssl_includes"
-
- if test "$ac_ssl_rsaref" = yes; then
- LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref"
- fi
-
- if test $ssl_version = "old"; then
- AC_DEFINE(HAVE_OLD_SSL_API, 1, [Define if you have OpenSSL < 0.9.6])
- fi
-fi
-
-SSL_INCLUDES=
-
-if test "$ssl_includes" = "/usr/include"; then
- if test -f /usr/kerberos/include/krb5.h; then
- SSL_INCLUDES="-I/usr/kerberos/include"
- fi
-elif test "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then
- SSL_INCLUDES="-I$ssl_includes"
-fi
-
-if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then
- SSL_LDFLAGS=""
-else
- SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries"
-fi
-
-AC_SUBST(SSL_INCLUDES)
-AC_SUBST(SSL_LDFLAGS)
-AC_SUBST(LIBSSL)
-])
-
-AC_DEFUN([KDE_CHECK_STRLCPY],
-[
- AC_REQUIRE([AC_CHECK_STRLCAT])
- AC_REQUIRE([AC_CHECK_STRLCPY])
- AC_CHECK_SIZEOF(size_t)
- AC_CHECK_SIZEOF(unsigned long)
-
- AC_MSG_CHECKING([sizeof size_t == sizeof unsigned long])
- AC_TRY_COMPILE(,[
- #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
- choke me
- #endif
- ],AC_MSG_RESULT([yes]),[
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([
- Apparently on your system our assumption sizeof size_t == sizeof unsigned long
- does not apply. Please mail kde-devel@kde.org with a description of your system!
- ])
- ])
-])
-
-AC_DEFUN([KDE_CHECK_BINUTILS],
-[
- AC_MSG_CHECKING([if ld supports unversioned version maps])
-
- kde_save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
- echo "{ local: extern \"C++\" { foo }; };" > conftest.map
- AC_TRY_LINK([int foo;],
-[
-#ifdef __INTEL_COMPILER
-icc apparently does not support libtools version-info and version-script
-at the same time. Dunno where the bug is, but until somebody figured out,
-better disable the optional version scripts.
-#endif
-
- foo = 42;
-], kde_supports_versionmaps=yes, kde_supports_versionmaps=no)
- LDFLAGS="$kde_save_LDFLAGS"
- rm -f conftest.map
- AM_CONDITIONAL(include_VERSION_SCRIPT,
- [test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"])
-
- AC_MSG_RESULT($kde_supports_versionmaps)
-])
-
-AC_DEFUN([AM_PROG_OBJC],[
-AC_CHECK_PROGS(OBJC, gcc, gcc)
-test -z "$OBJC" && AC_MSG_ERROR([no acceptable objective-c gcc found in \$PATH])
-if test "x${OBJCFLAGS-unset}" = xunset; then
- OBJCFLAGS="-g -O2"
-fi
-AC_SUBST(OBJCFLAGS)
-_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)])
-])
-
-AC_DEFUN([KDE_CHECK_PERL],
-[
- KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [
- AC_MSG_ERROR([No Perl found in your $PATH.
-We need perl to generate some code.])
- ])
- AC_SUBST(PERL)
-])
-
-AC_DEFUN([KDE_CHECK_LARGEFILE],
-[
-AC_SYS_LARGEFILE
-if test "$ac_cv_sys_file_offset_bits" != no; then
- CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-fi
-
-if test "x$ac_cv_sys_large_files" != "xno"; then
- CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1"
-fi
-
-])
-
-dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in)
-dnl which allows to search for libs that get installed into the KDE prefix.
-dnl
-dnl Syntax: KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not)
-dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
-dnl also defines KSTUFF_PKG_ERRORS on error
-AC_DEFUN([KDE_PKG_CHECK_MODULES], [
-
- PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
- if test "$prefix" != "$kde_libs_prefix"; then
- PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
- fi
- export PKG_CONFIG_PATH
- PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
-])
-
-
-dnl Check for PIE support in the compiler and linker
-AC_DEFUN([KDE_CHECK_PIE_SUPPORT],
-[
- AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support,
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- safe_CXXFLAGS=$CXXFLAGS
- safe_LDFLAGS=$LDFLAGS
- CXXFLAGS="$CXXFLAGS -fPIE"
- LDFLAGS="$LDFLAGS -pie"
-
- AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no])
-
- CXXFLAGS=$safe_CXXFLAGS
- LDFLAGS=$safe_LDFLAGS
- AC_LANG_RESTORE
- ])
-
- AC_MSG_CHECKING(if enabling -pie/fPIE support)
-
- AC_ARG_ENABLE(pie,
- AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]),
- [kde_has_pie_support=$enableval],
- [kde_has_pie_support=detect])
-
- if test "$kde_has_pie_support" = "detect"; then
- kde_has_pie_support=$kde_cv_val_pie_support
- fi
-
- AC_MSG_RESULT([$kde_has_pie_support])
-
- KDE_USE_FPIE=""
- KDE_USE_PIE=""
-
- AC_SUBST([KDE_USE_FPIE])
- AC_SUBST([KDE_USE_PIE])
-
- if test "$kde_has_pie_support" = "yes"; then
- KDE_USE_FPIE="-fPIE"
- KDE_USE_PIE="-pie"
- fi
-])
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
-## Free Software Foundation, Inc.
-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-# serial 47 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
- [],
- [m4_define([AC_PROVIDE_IFELSE],
- [m4_ifdef([AC_PROVIDE_$1],
- [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
- AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [AC_LIBTOOL_CXX],
- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
- ])])
-dnl And a similar setup for Fortran 77 support
- AC_PROVIDE_IFELSE([AC_PROG_F77],
- [AC_LIBTOOL_F77],
- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [ifdef([AC_PROG_GCJ],
- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([A][M_PROG_GCJ],
- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([LT_AC_PROG_GCJ],
- [define([LT_AC_PROG_GCJ],
- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
- ;;
- *)
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- AC_PATH_MAGIC
- fi
- ;;
-esac
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
- [AC_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
- [AC_HELP_STRING([--with-pic],
- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [pic_mode="$withval"],
- [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
- [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
- ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X[$]1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
- # Yippee, $echo works!
- :
-else
- # Restart under the correct shell.
- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-[$]*
-EOF
- exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
- echo_test_string="`eval $cmd`" &&
- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
- then
- break
- fi
- done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
-else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$echo" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- echo='print -r'
- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
- else
- # Try using printf.
- echo='printf %s\n'
- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- echo="$CONFIG_SHELL [$]0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$CONFIG_SHELL [$]0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
-
- if test "$prev" != 'sed 50q "[$]0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
- else
- # Oops. We lost completely, so just stick with echo.
- echo=echo
- fi
- fi
- fi
- fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
- [AC_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
- HPUX_IA64_MODE="32"
- ;;
- *ELF-64*)
- HPUX_IA64_MODE="64"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -melf32bsmip"
- ;;
- *N32*)
- LD="${LD-ld} -melf32bmipn32"
- ;;
- *64-bit*)
- LD="${LD-ld} -melf64bmip"
- ;;
- esac
- else
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -32"
- ;;
- *N32*)
- LD="${LD-ld} -n32"
- ;;
- *64-bit*)
- LD="${LD-ld} -64"
- ;;
- esac
- fi
- fi
- rm -rf conftest*
- ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case "`/usr/bin/file conftest.o`" in
- *32-bit*)
- LINUX_64_MODE="32"
- case $host in
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
- ppc64-*linux*)
- LD="${LD-ld} -m elf32ppclinux"
- ;;
- s390x-*linux*)
- LD="${LD-ld} -m elf_s390"
- ;;
- sparc64-*linux*)
- LD="${LD-ld} -m elf32_sparc"
- ;;
- esac
- ;;
- *64-bit*)
- LINUX_64_MODE="64"
- case $host in
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
- ppc*-*linux*|powerpc*-*linux*)
- LD="${LD-ld} -m elf64ppc"
- ;;
- s390*-*linux*)
- LD="${LD-ld} -m elf64_s390"
- ;;
- sparc*-*linux*)
- LD="${LD-ld} -m elf64_sparc"
- ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
- [AC_LANG_PUSH(C)
- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
- AC_LANG_POP])
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
- ;;
- ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
- [$2=no
- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
- $2=yes
- fi
- fi
- $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
- ifelse([$5], , :, [$5])
-else
- ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
- [$2=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $3"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&AS_MESSAGE_LOG_FD
- else
- $2=yes
- fi
- fi
- $rm conftest*
- LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
- ifelse([$4], , :, [$4])
-else
- ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
- i=0
- testring="ABCD"
-
- case $build_os in
- msdosdjgpp*)
- # On DJGPP, this test can blow up pretty badly due to problems in libc
- # (any single argument exceeding 2000 bytes causes a buffer overrun
- # during glob expansion). Even if it were fixed, the result of this
- # check would be larger than it should be.
- lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
-
- gnu*)
- # Under GNU Hurd, this test is not required because there is
- # no limit to the length of command line arguments.
- # Libtool will interpret -1 as no limit whatsoever
- lt_cv_sys_max_cmd_len=-1;
- ;;
-
- cygwin* | mingw*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
- # you end up with a "frozen" computer, even though with patience
- # the test eventually succeeds (with a max line length of 256k).
- # Instead, let's just punt: use the minimum linelength reported by
- # all of the supported platforms: 8192 (on NT/2K/XP).
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- *)
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
- = "XX$testring") >/dev/null 2>&1 &&
- new_result=`expr "X$testring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- testring=$testring$testring
- done
- testring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- ;;
- esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
- AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
- AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# --------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
- [$4]
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-
- exit (status);
-}]
-EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) $1 ;;
- x$lt_dlneed_uscore) $2 ;;
- x$lt_unknown|x*) $3 ;;
- esac
- else :
- # compilation failed
- $3
- fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
- darwin*)
- # if libdl is installed we need to link against it
- AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ])
- ;;
-
- *)
- AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
- [AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
- [AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
- [AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
- [AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
- [AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
- ])
- ])
- ])
- ])
- ])
- ;;
- esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- AC_CACHE_CHECK([whether a program can dlopen itself],
- lt_cv_dlopen_self, [dnl
- _LT_AC_TRY_DLOPEN_SELF(
- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
- ])
-
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
- lt_cv_dlopen_self_static, [dnl
- _LT_AC_TRY_DLOPEN_SELF(
- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
- ])
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
- $rm -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
- # that will create temporary files in the current directory regardless of
- # the output directory. Thus, making CWD read-only will cause this test
- # to fail, enabling locking or at least warning the user not to do parallel
- # builds.
- chmod -w .
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s out/conftest.err; then
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
- fi
- fi
- chmod u+w .
- $rm conftest* out/*
- rmdir out
- cd ..
- rmdir conftest
- $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
- AC_MSG_CHECKING([if we can lock with hard links])
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- AC_MSG_RESULT([$hard_links])
- if test "$hard_links" = no; then
- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
- need_locks=warn
- fi
-else
- need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
- lt_cv_objdir=.libs
-else
- # MS-DOS does not allow filenames that begin with a dot.
- lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
- # Linking always hardcodes the temporary library directory.
- _LT_AC_TAGVAR(hardcode_action, $1)=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- _LT_AC_TAGVAR(hardcode_action, $1)=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
-fi
- ;;
- *)
- AC_MSG_RESULT([no])
- ;;
- esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
- shlibpath_var=LIBPATH
-
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
-aix4* | aix5*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
- # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- else
- # With GCC up to 2.95.x, collect2 would create an import file
- # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
- # development snapshots of GCC prior to 3.0.
- case $host_os in
- aix4 | aix4.[[01]] | aix4.[[01]].*)
- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
- echo ' yes '
- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
- :
- else
- can_build_shared=no
- fi
- ;;
- esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
- # soname into executable. Probably we can add versioning support to
- # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
- # instead of lib<name>.a to let people know that these are not
- # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
- # We preserve .a as extension for shared libraries through AIX4.2
- # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
- shlibpath_var=LIBPATH
- fi
- ;;
-
-amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
- ;;
-
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
-
-bsdi4*)
- version_type=linux
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
-
-cygwin* | mingw* | pw32*)
- version_type=windows
- shrext=".dll"
- need_version=no
- need_lib_prefix=no
-
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
- shlibpath_overrides_runpath=yes
-
- case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
- ;;
- mingw*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- ;;
-
- *)
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
-
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-dgux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-freebsd1*)
- dynamic_linker=no
- ;;
-
-kfreebsd*-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- need_version=no
- need_lib_prefix=no
- ;;
- freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
- freebsd2*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.[01]* | freebsdelf3.[01]*)
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- *) # from 3.2 on
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
- esac
- ;;
-
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
-
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- case "$host_cpu" in
- ia64*)
- shrext='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
- else
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
- shrext='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
- shrext='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
- else
- version_type=irix
- fi ;;
- esac
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
-
-# This must be Linux ELF.
-linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
- # Some platforms are per default 64-bit, so there's no /lib64
- if test -d /lib64 -a ! -h /lib64; then
- libsuff=64
- fi
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-openbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[[89]] | openbsd2.[[89]].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
-
-os2*)
- libname_spec='$name'
- shrext=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
-
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
-
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
- dynamic_linker=no
- ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
- [include additional configurations @<:@automatic@:>@])],
- [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
- if test ! -f "${ofile}"; then
- AC_MSG_WARN([output file `$ofile' does not exist])
- fi
-
- if test -z "$LTCC"; then
- eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
- if test -z "$LTCC"; then
- AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
- else
- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
- fi
- fi
-
- # Extract list of available tagged configurations in $ofile.
- # Note that this assumes the entire list is on one line.
- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for tagname in $tagnames; do
- IFS="$lt_save_ifs"
- # Check whether tagname contains only valid characters
- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
- "") ;;
- *) AC_MSG_ERROR([invalid tag name: $tagname])
- ;;
- esac
-
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
- then
- AC_MSG_ERROR([tag name \"$tagname\" already exists])
- fi
-
- # Update the list of available tags.
- if test -n "$tagname"; then
- echo appending configuration tag \"$tagname\" to $ofile
-
- case $tagname in
- CXX)
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
- AC_LIBTOOL_LANG_CXX_CONFIG
- else
- tagname=""
- fi
- ;;
-
- F77)
- if test -n "$F77" && test "X$F77" != "Xno"; then
- AC_LIBTOOL_LANG_F77_CONFIG
- else
- tagname=""
- fi
- ;;
-
- GCJ)
- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
- AC_LIBTOOL_LANG_GCJ_CONFIG
- else
- tagname=""
- fi
- ;;
-
- RC)
- AC_LIBTOOL_LANG_RC_CONFIG
- ;;
-
- *)
- AC_MSG_ERROR([Unsupported tag name: $tagname])
- ;;
- esac
-
- # Append the new tag name to the list of available tags.
- if test -n "$tagname" ; then
- available_tags="$available_tags $tagname"
- fi
- fi
- done
- IFS="$lt_save_ifs"
-
- # Now substitute the updated list of available tags.
- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
- mv "${ofile}T" "$ofile"
- chmod +x "$ofile"
- else
- rm -f "${ofile}T"
- AC_MSG_ERROR([unable to update list of available tagged configurations.])
- fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
- enable_shared=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_shared=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-#- set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_static=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
- enable_fast_install=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_fast_install=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
- then ac_cv_prog_egrep='grep -E'
- else ac_cv_prog_egrep='egrep'
- fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] | ?:[\\/]*])
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
- ;;
-*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word. This closes a longstanding sh security hole.
- ac_dummy="ifelse([$2], , $PATH, [$2])"
- for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$1; then
- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
- if test -n "$file_magic_test_file"; then
- case $deplibs_check_method in
- "file_magic "*)
- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- $EGREP "$file_magic_regex" > /dev/null; then
- :
- else
- cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such. This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
- fi ;;
- esac
- fi
- break
- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
- ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- AC_MSG_RESULT($MAGIC_CMD)
-else
- AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
- else
- MAGIC_CMD=:
- fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
- [AC_HELP_STRING([--with-gnu-ld],
- [assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test "$withval" = no || with_gnu_ld=yes],
- [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING([for ld used by $CC])
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [[\\/]]* | ?:[[\\/]]*)
- re_direlt='/[[^/]][[^/]]*/\.\./'
- # Canonicalize the pathname of ld
- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- AC_MSG_CHECKING([for GNU ld])
-else
- AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
- ;;
- *)
- test "$with_gnu_ld" != yes && break
- ;;
- esac
- fi
- done
- IFS="$lt_save_ifs"
-else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
- AC_MSG_RESULT($LD)
-else
- AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-*)
- lt_cv_prog_gnu_ld=no
- ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-# -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
- lt_cv_ld_reload_flag,
- [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-# -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-beos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-bsdi4*)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
-
-cygwin*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-mingw* | pw32*)
- # win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='win32_libid'
- ;;
-
-darwin* | rhapsody*)
- # this will be overwritten by pass_all, but leave it in just in case
- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
- lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
- ;;
- *) # Darwin 1.3 on
- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
- ;;
- esac
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-freebsd* | kfreebsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
- fi
- ;;
-
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
- case "$host_cpu" in
- ia64*)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
- ;;
- hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
- ;;
- *)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
- ;;
- esac
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $host_os in
- irix5* | nonstopux*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
- ;;
- *)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
- ;;
- esac
- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-# This must be Linux ELF.
-linux*)
- case $host_cpu in
- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
- lt_cv_deplibs_check_method=pass_all ;;
- # the debian people say, arm and glibc 2.3.1 works for them with pass_all
- arm* )
- lt_cv_deplibs_check_method=pass_all ;;
- *)
- # glibc up to 2.1.1 does not perform some relocations on ARM
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
- esac
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- ;;
-
-netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
- fi
- ;;
-
-newos6*)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
-
-nto-qnx*)
- lt_cv_deplibs_check_method=unknown
- ;;
-
-openbsd*)
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
- else
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
- fi
- ;;
-
-osf3* | osf4* | osf5*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
- lt_cv_file_magic_test_file=/shlib/libc.so
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sco3.2v5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-solaris*)
- lt_cv_deplibs_check_method=pass_all
- lt_cv_file_magic_test_file=/lib/libc.so
- ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- case $host_vendor in
- motorola)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
- ;;
- ncr)
- lt_cv_deplibs_check_method=pass_all
- ;;
- sequent)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
- ;;
- sni)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
- lt_cv_file_magic_test_file=/lib/libc.so
- ;;
- siemens)
- lt_cv_deplibs_check_method=pass_all
- ;;
- esac
- ;;
-
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
- # Let the user override the test.
- lt_cv_path_NM="$NM"
-else
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
- # Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
- # nm: unknown option "B" ignored
- # Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
- lt_cv_path_NM="$tmp_nm -B"
- break
- ;;
- *)
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
- */dev/null*)
- lt_cv_path_NM="$tmp_nm -p"
- break
- ;;
- *)
- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
- continue # so that we can try to find one that supports BSD flags
- ;;
- esac
- esac
- fi
- done
- IFS="$lt_save_ifs"
- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
- # These system don't have libm, or don't need it
- ;;
-*-ncr-sysv4.3*)
- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
- ;;
-*)
- AC_CHECK_LIB(m, cos, LIBM="-lm")
- ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!). If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- case $enable_ltdl_convenience in
- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
- "") enable_ltdl_convenience=yes
- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
- esac
- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
- # For backwards non-gettext consistent compatibility...
- INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
-# DIRECTORY is not provided and an installed libltdl is not found, it is
-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-# quotes!). If your package is not flat and you're not using automake,
-# define top_builddir and top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- AC_CHECK_LIB(ltdl, lt_dlinit,
- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
- [if test x"$enable_ltdl_install" = xno; then
- AC_MSG_WARN([libltdl not installed, but installation disabled])
- else
- enable_ltdl_install=yes
- fi
- ])
- if test x"$enable_ltdl_install" = x"yes"; then
- ac_configure_args="$ac_configure_args --enable-ltdl-install"
- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
- else
- ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
- LIBLTDL="-lltdl"
- LTDLINCL=
- fi
- # For backwards non-gettext consistent compatibility...
- INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# --------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-_LT_AC_SYS_COMPILER
-
-#
-# Check for any special shared library compilation flags.
-#
-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-if test "$GCC" = no; then
- case $host_os in
- sco3.2v5*)
- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
- ;;
- esac
-fi
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
- else
- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
- fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
- [],
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-# Report which librarie types wil actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-
-aix4*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
- darwin* | rhapsody*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cc
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
- unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
- lt_cv_path_LD=$lt_cv_path_LDCXX
-else
- unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
- # Set up default GNU C++ configuration
-
- AC_PROG_LD
-
- # Check if GNU C++ uses GNU ld as the underlying linker, since the
- # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
- # If archive_cmds runs LD, not CC, wlarc should be empty
- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
- # investigate it a little bit more. (MM)
- wlarc='${wl}'
-
- # ancient GNU ld didn't support --whole-archive et. al.
- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
- grep 'no-whole-archive' > /dev/null; then
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- else
- with_gnu_ld=no
- wlarc=
-
- # A generic and very simple default shared library creation
- # command for GNU C++ for the case where it uses the native
- # linker, instead of GNU ld. If possible, this setting should
- # overridden to take advantage of the native linker features on
- # the platform it is being used on.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
- fi
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
- GXX=no
- with_gnu_ld=no
- wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
- aix3*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- aix4* | aix5*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- # KDE requires run time linking. Make it the default.
- aix_use_runtimelinking=yes
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_AC_TAGVAR(archive_cmds, $1)=''
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GXX" = yes; then
- case $host_os in aix4.[012]|aix4.[012].*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
- fi
- esac
- shared_flag='-shared'
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='-qmkshrobj ${wl}-G'
- else
- shared_flag='-qmkshrobj'
- fi
- fi
- fi
-
- # Let the compiler handle the export list.
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
- # Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
- chorus*)
- case $cc_basename in
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
-
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- darwin* | rhapsody*)
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- dgux*)
- case $cc_basename in
- ec++)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- ghcx)
- # Green Hills C++ Compiler
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- freebsd[12]*)
- # C++ shared libraries reported to be fairly broken before switch to ELF
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- freebsd-elf*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- ;;
- freebsd* | kfreebsd*-gnu)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- ;;
- gnu*)
- ;;
- hpux9*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
-
- case $cc_basename in
- CC)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- aCC)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
- ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- ;;
- *)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
- esac
- fi
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- ia64*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
- ;;
- *)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
- ;;
- esac
-
- case $cc_basename in
- CC)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- aCC)
- case "$host_cpu" in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
- ;;
- esac
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
- case "$host_cpu" in
- ia64*|hppa*64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
- ;;
- esac
- fi
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- irix5* | irix6*)
- case $cc_basename in
- CC)
- # SGI C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
- # Archives containing C++ object files must be created using
- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
- ;;
- *)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- fi
- fi
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
- esac
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
- linux*)
- case $cc_basename in
- KCC)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- ;;
- icpc)
- # Intel C++
- with_gnu_ld=yes
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- ;;
- cxx)
- # Compaq C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
- runpath_var=LD_RUN_PATH
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- esac
- ;;
- lynxos*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- m88k*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- mvs*)
- case $cc_basename in
- cxx)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- fi
- # Workaround some broken pre-1.5 toolchains
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
- ;;
- osf3*)
- case $cc_basename in
- KCC)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
- ;;
- RCC)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- cxx)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- osf4* | osf5*)
- case $cc_basename in
- KCC)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Archives containing C++ object files must be created using
- # the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
- ;;
- RCC)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- cxx)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
- $rm $lib.exp'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- psos*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- sco*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case $cc_basename in
- CC)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- sunos4*)
- case $cc_basename in
- CC)
- # Sun C++ 4.x
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- lcc)
- # Lucid
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- solaris*)
- case $cc_basename in
- CC)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
- # The C++ compiler is used as linker so we must use $wl
- # flag to pass the commands to the underlying system
- # linker.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- ;;
- gcx)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
-
- # The C++ compiler must be used to create the archive.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
- ;;
- *)
- # GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
- if $CC --version | grep -v '^2\.7' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
- else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
- # platform.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
- fi
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
- fi
- ;;
- esac
- ;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- ;;
- tandem*)
- case $cc_basename in
- NCC)
- # NonStop-UX NCC 3.20
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- vxworks*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library. It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
- Foo (void) { a = 0; }
-private:
- int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
- subroutine foo
- implicit none
- integer*4 a
- a=0
- return
- end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
- private int a;
- public void bar (void) {
- a = 0;
- }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
-
- # Sentinel used to keep track of whether or not we are before
- # the conftest object file.
- pre_test_object_deps_done=no
-
- # The `*' in the case matches for architectures that use `case' in
- # $output_verbose_cmd can trigger glob expansion during the loop
- # eval without this substitution.
- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-
- for p in `eval $output_verbose_link_cmd`; do
- case $p in
-
- -L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
- # Remove the space.
- if test $p = "-L" \
- || test $p = "-R"; then
- prev=$p
- continue
- else
- prev=
- fi
-
- if test "$pre_test_object_deps_done" = no; then
- case $p in
- -L* | -R*)
- # Internal compiler library paths should come after those
- # provided the user. The postdeps already come after the
- # user supplied libs so there is no need to process them.
- if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
- else
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
- fi
- ;;
- # The "-l" case would never come before the object being
- # linked, so don't bother handling this case.
- esac
- else
- if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
- _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
- else
- _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
- fi
- fi
- ;;
-
- *.$objext|*.$libext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
- if test "$p" = "conftest.$objext"; then
- pre_test_object_deps_done=yes
- continue
- fi
-
- if test "$pre_test_object_deps_done" = no; then
- if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
- _LT_AC_TAGVAR(predep_objects, $1)="$p"
- else
- _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
- fi
- else
- if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
- _LT_AC_TAGVAR(postdep_objects, $1)="$p"
- else
- _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
- fi
- fi
- ;;
-
- *) ;; # Ignore the rest.
-
- esac
- done
-
- # Clean up.
- rm -f a.out a.exe
-else
- echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code=" program t\n end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-aix4*)
- test "$enable_shared" = yes && enable_static=no
- ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars. Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- _LT_AC_TAGVAR(compiler, $1) \
- _LT_AC_TAGVAR(CC, $1) \
- _LT_AC_TAGVAR(LD, $1) \
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
- _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
- _LT_AC_TAGVAR(old_archive_cmds, $1) \
- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
- _LT_AC_TAGVAR(predep_objects, $1) \
- _LT_AC_TAGVAR(postdep_objects, $1) \
- _LT_AC_TAGVAR(predeps, $1) \
- _LT_AC_TAGVAR(postdeps, $1) \
- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
- _LT_AC_TAGVAR(archive_cmds, $1) \
- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
- _LT_AC_TAGVAR(postinstall_cmds, $1) \
- _LT_AC_TAGVAR(postuninstall_cmds, $1) \
- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
- _LT_AC_TAGVAR(allow_undefined_flag, $1) \
- _LT_AC_TAGVAR(no_undefined_flag, $1) \
- _LT_AC_TAGVAR(export_symbols_cmds, $1) \
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
- _LT_AC_TAGVAR(hardcode_automatic, $1) \
- _LT_AC_TAGVAR(module_cmds, $1) \
- _LT_AC_TAGVAR(module_expsym_cmds, $1) \
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
- _LT_AC_TAGVAR(exclude_expsyms, $1) \
- _LT_AC_TAGVAR(include_expsyms, $1); do
-
- case $var in
- _LT_AC_TAGVAR(old_archive_cmds, $1) | \
- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
- _LT_AC_TAGVAR(archive_cmds, $1) | \
- _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
- _LT_AC_TAGVAR(module_cmds, $1) | \
- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
-
- case $lt_echo in
- *'\[$]0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
- ;;
- esac
-
-ifelse([$1], [],
- [cfgfile="${ofile}T"
- trap "$rm \"$cfgfile\"; exit 1" 1 2 15
- $rm -f "$cfgfile"
- AC_MSG_NOTICE([creating $ofile])],
- [cfgfile="$ofile"])
-
- cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
- case $host_os in
- aix3*)
- cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program. For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
-fi
-EOF
- ;;
- esac
-
- # We use sed instead of cat because bash on DJGPP gets confused if
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
- mv -f "$cfgfile" "$ofile" || \
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-])
-else
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
- test -f Makefile && make "$ltmain"
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
- lt_cv_prog_compiler_rtti_exceptions,
- [-fno-rtti -fno-exceptions], [],
- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
- symcode='[[BCDT]]'
- ;;
-cygwin* | mingw* | pw32*)
- symcode='[[ABCDGISTW]]'
- ;;
-hpux*) # Its linker distinguishes data from code symbols
- if test "$host_cpu" = ia64; then
- symcode='[[ABCDEGRST]]'
- fi
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- ;;
-irix* | nonstopux*)
- symcode='[[BCDEGRST]]'
- ;;
-osf*)
- symcode='[[BCDEGQRST]]'
- ;;
-solaris* | sysv5*)
- symcode='[[BDT]]'
- ;;
-sysv4)
- symcode='[[DFNSTU]]'
- ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
- ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='[[ABCDGISTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
- # Write the raw and C identifiers.
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
-
- rm -f conftest*
- cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
- if AC_TRY_EVAL(ac_compile); then
- # Now try to grab the symbols.
- nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
- mv -f "$nlist"T "$nlist"
- else
- rm -f "$nlist"T
- fi
-
- # Make sure that we snagged all the symbols we need.
- if grep ' nm_test_var$' "$nlist" >/dev/null; then
- if grep ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
- # Now generate the symbol file.
- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
- cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
- const char *name;
- lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
- cat <<\EOF >> conftest.$ac_ext
- {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- lt_save_LIBS="$LIBS"
- lt_save_CFLAGS="$CFLAGS"
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- LIBS="$lt_save_LIBS"
- CFLAGS="$lt_save_CFLAGS"
- else
- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
- fi
- else
- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
- fi
- else
- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
- fi
- else
- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
- cat conftest.$ac_ext >&5
- fi
- rm -f conftest* conftst*
-
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
- break
- else
- lt_cv_sys_global_symbol_pipe=
- fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
- lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- AC_MSG_RESULT(failed)
-else
- AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
- # C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
- amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
- mingw* | os2* | pw32*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
- *djgpp*)
- # DJGPP does not support shared libraries at all
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case "$host_cpu" in
- hppa*64*|ia64*)
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- else
- case $host_os in
- aix4* | aix5*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
- chorus*)
- case $cc_basename in
- cxch68)
- # Green Hills C++ Compiler
- # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- ;;
- esac
- ;;
- dgux*)
- case $cc_basename in
- ec++)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- ;;
- ghcx)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- *)
- ;;
- esac
- ;;
- freebsd* | kfreebsd*-gnu)
- # FreeBSD uses GNU C++
- ;;
- hpux9* | hpux10* | hpux11*)
- case $cc_basename in
- CC)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- fi
- ;;
- aCC)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- case "$host_cpu" in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- ;;
- esac
- ;;
- *)
- ;;
- esac
- ;;
- irix5* | irix6* | nonstopux*)
- case $cc_basename in
- CC)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- # CC pic flag -KPIC is the default.
- ;;
- *)
- ;;
- esac
- ;;
- linux*)
- case $cc_basename in
- KCC)
- # KAI C++ Compiler
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- icpc)
- # Intel C++
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- cxx)
- # Compaq C++
- # Make sure the PIC flag is empty. It appears that all Alpha
- # Linux and Compaq Tru64 Unix objects are PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
- ;;
- esac
- ;;
- lynxos*)
- ;;
- m88k*)
- ;;
- mvs*)
- case $cc_basename in
- cxx)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
- ;;
- *)
- ;;
- esac
- ;;
- netbsd*)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
- KCC)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- ;;
- RCC)
- # Rational C++ 2.4.1
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- cxx)
- # Digital/Compaq C++
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # Make sure the PIC flag is empty. It appears that all Alpha
- # Linux and Compaq Tru64 Unix objects are PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
- ;;
- esac
- ;;
- psos*)
- ;;
- sco*)
- case $cc_basename in
- CC)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- *)
- ;;
- esac
- ;;
- solaris*)
- case $cc_basename in
- CC)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- ;;
- gcx)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- ;;
- *)
- ;;
- esac
- ;;
- sunos4*)
- case $cc_basename in
- CC)
- # Sun C++ 4.x
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- lcc)
- # Lucid
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- *)
- ;;
- esac
- ;;
- tandem*)
- case $cc_basename in
- NCC)
- # NonStop-UX NCC 3.20
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- ;;
- *)
- ;;
- esac
- ;;
- unixware*)
- ;;
- vxworks*)
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
- fi
-],
-[
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
-
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
- mingw* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
-
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- enable_shared=no
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
-
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case "$host_cpu" in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- ;;
-
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- else
- # PORTME Check for flag to pass linker flags through the system compiler.
- case $host_os in
- aix*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
-
- mingw* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
-
- hpux9* | hpux10* | hpux11*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case "$host_cpu" in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- ;;
- esac
- # Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- ;;
-
- irix5* | irix6* | nonstopux*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC (with -KPIC) is the default.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- newsos6)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- linux*)
- case $CC in
- icc* | ecc*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- ccc*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All Alpha code is PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- esac
- ;;
-
- osf3* | osf4* | osf5*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All OSF/1 code is PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- sco3.2v5*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
- ;;
-
- solaris*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sunos4*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec ;then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- uts4*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
- fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
- "" | " "*) ;;
- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
- esac],
- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case "$host_os" in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
- ;;
-esac
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
- aix4* | aix5*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- fi
- ;;
- pw32*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
- cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- *)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- esac
-],[
- runpath_var=
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- _LT_AC_TAGVAR(archive_cmds, $1)=
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_AC_TAGVAR(hardcode_automatic, $1)=no
- _LT_AC_TAGVAR(module_cmds, $1)=
- _LT_AC_TAGVAR(module_expsym_cmds, $1)=
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- # include_expsyms should be a list of space-separated symbols to be *always*
- # included in the symbol list
- _LT_AC_TAGVAR(include_expsyms, $1)=
- # exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
- extract_expsyms_cmds=
-
- case $host_os in
- cygwin* | mingw* | pw32*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- if test "$GCC" != yes; then
- with_gnu_ld=no
- fi
- ;;
- openbsd*)
- with_gnu_ld=no
- ;;
- esac
-
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix3* | aix4* | aix5*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
- fi
- ;;
-
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
- # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
- # to version 4, is to share data among multiple programs linked
- # with the same dynamic library. Since this doesn't match the
- # behavior of shared libraries on other platforms, we can't use
- # them.
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- else
- ld_shlibs=no
- fi
- ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- solaris* | sysv5*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- sunos4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
-
- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
- runpath_var=LD_RUN_PATH
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- fi
- else
- # PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
- aix3*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$link_static_flag"; then
- # Neither direct hardcoding nor static linking is supported with a
- # broken collect2.
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- fi
- ;;
-
- aix4* | aix5*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- fi
-
- # KDE requires run time linking. Make it the default.
- aix_use_runtimelinking=yes
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_AC_TAGVAR(archive_cmds, $1)=''
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GCC" = yes; then
- case $host_os in aix4.[012]|aix4.[012].*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
- fi
- esac
- shared_flag='-shared'
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='-qmkshrobj ${wl}-G'
- else
- shared_flag='-qmkshrobj'
- fi
- fi
- fi
-
- # Let the compiler handle the export list.
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
- # Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- # see comment about different semantics on the GNU ld section
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- bsdi4*)
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
-
- cygwin* | mingw* | pw32*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-
- darwin* | rhapsody*)
- if test "$GXX" = yes ; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- dgux*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- freebsd1*)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
- # does not break anything, and helps significantly (at the cost of a little
- # extra space).
- freebsd2.2*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- hpux9*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
-
- hpux10* | hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
- ;;
- esac
- else
- case "$host_cpu" in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- ;;
- esac
- fi
- if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- *)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- esac
- fi
- ;;
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- newsos6)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- openbsd*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
- fi
- ;;
-
- os2*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-
- osf3*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- else
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
- # Both c and cxx compiler support -rpath directly
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- sco3.2v5*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
- solaris*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- sunos4*)
- if test "x$host_vendor" = xsequent; then
- # Use $CC to link under sequent, because it throws in some extra .o
- # files that make .init and .fini sections work.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4)
- case $host_vendor in
- sni)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
- ;;
- siemens)
- ## LD is ld it makes a PLAMLIB
- ## CC just makes a GrossModule.
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- ;;
- motorola)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
- ;;
- esac
- runpath_var='LD_RUN_PATH'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4.3*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- fi
- ;;
-
- sysv4.2uw2*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
-
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
- fi
- runpath_var='LD_RUN_PATH'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv5*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
- ;;
-
- uts4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
- # Assume -lc should be added
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
- if test "$enable_shared" = yes && test "$GCC" = yes; then
- case $_LT_AC_TAGVAR(archive_cmds, $1) in
- *'~'*)
- # FIXME: we may have to deal with multi-command sequences.
- ;;
- '$CC '*)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
- $rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
- then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- else
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- fi
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $rm conftest*
- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
- ;;
- esac
- fi
- ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# # ifdef __CYGWIN32__
-# # define __CYGWIN__ __CYGWIN32__
-# # endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-# __hDllInstance_base = hInst;
-# return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
- AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-############################################################
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
-# a released version of Autoconf we should remove this #
-# macro and use it instead. #
-############################################################
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible. Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
-done
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && break
- cat /dev/null > conftest.in
- lt_ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
- # Check for GNU sed and select it if it is found.
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
- lt_cv_path_SED=$lt_ac_sed
- break
- fi
- while true; do
- cat conftest.in conftest.in >conftest.tmp
- mv conftest.tmp conftest.in
- cp conftest.in conftest.nl
- echo >>conftest.nl
- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
- cmp -s conftest.out conftest.nl || break
- # 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
- lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
- lt_ac_max=$lt_ac_count
- lt_cv_path_SED=$lt_ac_sed
- fi
- done
-done
-])
-SED=$lt_cv_path_SED
-AC_MSG_RESULT([$SED])
-])
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN([PKG_CHECK_MODULES], [
- succeeded=no
-
- if test -z "$PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- fi
-
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- AC_MSG_CHECKING(for $2)
-
- if $PKG_CONFIG --exists "$2" ; then
- AC_MSG_RESULT(yes)
- succeeded=yes
-
- AC_MSG_CHECKING($1_CFLAGS)
- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
- AC_MSG_RESULT($$1_CFLAGS)
-
- AC_MSG_CHECKING($1_LIBS)
- $1_LIBS=`$PKG_CONFIG --libs "$2"`
- AC_MSG_RESULT($$1_LIBS)
- else
- $1_CFLAGS=""
- $1_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- ifelse([$4], ,echo $$1_PKG_ERRORS,)
- fi
-
- AC_SUBST($1_CFLAGS)
- AC_SUBST($1_LIBS)
- else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
- fi
- fi
-
- if test $succeeded = yes; then
- ifelse([$3], , :, [$3])
- else
- ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
- fi
-])
-
-
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index 986ff00..0000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,881 +0,0 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too. Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 13
-
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
- fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# Check how to create a tarball. -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-# tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-# $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
-
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
- rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([acinclude.m4])
diff --git a/admin b/admin
deleted file mode 160000
-Subproject 3013c1e653e37c03ef987eb4efd1ebb68a64ad3
diff --git a/af/Makefile.am b/af/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/af/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/af/messages/Makefile.am b/af/messages/Makefile.am
deleted file mode 100644
index 9b00560..0000000
--- a/af/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = af
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/af/messages/k3b.po b/af/messages/k3b.po
index e1d296b..1f40f5f 100644
--- a/af/messages/k3b.po
+++ b/af/messages/k3b.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-01-08 12:15+0200\n"
"Last-Translator: Frikkie Thirion <kde.afrikaans@gmail.com>\n"
"Language-Team: Afrikaans <translate-discuss-af@lists.sourceforge.net>\n"
@@ -5967,11 +5967,11 @@ msgstr "Eienskappe"
msgid "Open the properties dialog"
msgstr "Maak die eienskappe dialoog oop"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7046,19 +7046,23 @@ msgstr "Kon nie die veranderlikes stel nie (%1)."
msgid "Alsa device:"
msgstr "Aksa toestel:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Laag III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "'Advance Oudio Coding' (AAC)"
@@ -9101,17 +9105,12 @@ msgstr "Vervang alle spasies met: "
msgid "&2-pass encoding"
msgstr "2-maal enkodering"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Aktiveer 2-maal enkodering"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9131,17 +9130,17 @@ msgstr ""
"konstante bis tempo. Die kwaliteit sal waarskynlik laer wees.\n"
"<p>2-maal enkodering neem dubbeld so lank soos 1-maal enkodering."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Oudomatiese Video Afkapping"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Spoor die swart rante van die video outomaties op"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9161,22 +9160,17 @@ msgstr ""
"<p>Hieride metode is baie betroubaar, maar probleme kan ondervind word as "
"die video snit baie kort of donker is."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Hermonste oudio na 44.1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Verander die monster tempo van die oudio stroom na 44.1 kGps"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9190,7 +9184,7 @@ msgstr ""
"<p>As hierdie opsie gekies is, sal K3b die monster tempo van die oudio "
"stroom na 44.1 kHz omskakel."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Skeduleer 'n lae prioriteit vir die video transkodering proses"
@@ -9860,6 +9854,9 @@ msgstr ""
"tipe medium wil skryf, hoef jy net die media in die dryf in te sit. K3b sal "
"dit self optel en dit as die skryf medium spesifiseer.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Laag III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Stoor Alle"
diff --git a/ar/Makefile.am b/ar/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/ar/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/ar/messages/Makefile.am b/ar/messages/Makefile.am
deleted file mode 100644
index f01035c..0000000
--- a/ar/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = ar
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/ar/messages/k3b.po b/ar/messages/k3b.po
index 61764bb..84c5b74 100644
--- a/ar/messages/k3b.po
+++ b/ar/messages/k3b.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-05-14 11:42+0400\n"
"Last-Translator: Laith Juwaidah <juwaidah1990@gmail.com>\n"
"Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -5678,11 +5678,11 @@ msgstr "&خصائص..."
msgid "Open the properties dialog"
msgstr "إفتح حوار الخصائص"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6743,19 +6743,23 @@ msgstr "لم اتمكن من تعيين ضوابط (%1)"
msgid "Alsa device:"
msgstr "إعادة مسح الأجهزة"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr ""
@@ -8609,17 +8613,12 @@ msgstr "بدّل كل الف&راغات بِــ:"
msgid "&2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8631,17 +8630,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8654,22 +8653,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr ""
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8679,7 +8673,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9364,10 +9358,6 @@ msgstr ""
#~ "( على سبيل المثال : /dev/cdrom ):"
#, fuzzy
-#~ msgid "Alt+K"
-#~ msgstr "Alt+2"
-
-#, fuzzy
#~ msgid "Please insert an appendable medium"
#~ msgstr "وسيطة %1 يمكن متابعتها"
diff --git a/bg/Makefile.am b/bg/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/bg/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/bg/messages/Makefile.am b/bg/messages/Makefile.am
deleted file mode 100644
index 869f213..0000000
--- a/bg/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = bg
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/bg/messages/k3b.po b/bg/messages/k3b.po
index d6b738b..b471ba5 100644
--- a/bg/messages/k3b.po
+++ b/bg/messages/k3b.po
@@ -16,7 +16,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2008-02-14 08:43+0000\n"
"Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -5985,11 +5985,11 @@ msgstr "&Информация"
msgid "Open the properties dialog"
msgstr "Отваряне на прозорец с информацията"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7061,19 +7061,23 @@ msgstr "Не могат да бъдат настроени параметрит
msgid "Alsa device:"
msgstr "Alsa устройство:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Advanced Audio Coding (AAC)"
@@ -9111,17 +9115,12 @@ msgstr "Замяна на всички и&нтервали с:"
msgid "&2-pass encoding"
msgstr "&2-етапно кодиране"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Включване на 2-етапно кодиране"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9140,17 +9139,17 @@ msgstr ""
"скорост и по-ниско качество.\n"
"<p>2-етапното кодиране изисква два пъти повече време."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Автоматично &видео отрязване"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Автоматично откриване на черните ленти на видеото"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9171,22 +9170,17 @@ msgstr ""
"<p>Въпреки, че този метод е много надежден, може да възникнат проблеми ако "
"материалът е много къс или тъмен."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Предискретизиране в &44.1 кХц"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Промяна на дискретизацията на аудио потока в 44.1 кХц"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9200,7 +9194,7 @@ msgstr ""
"<p>Ако е включена тази опция, K3b ще промени дискретизацията на аудио потока "
"в 44100 Хц."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Понижаване &приоритета на видео транскодирането"
@@ -9862,6 +9856,9 @@ msgstr ""
"направите запис върху точно определен вид диск,\n"
"просто го поставете и изчакайте програмата да го намери.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Запис на всички"
diff --git a/br/Makefile.am b/br/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/br/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/br/messages/Makefile.am b/br/messages/Makefile.am
deleted file mode 100644
index db05612..0000000
--- a/br/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = br
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/br/messages/k3b.po b/br/messages/k3b.po
index 05ca083..ea7e800 100644
--- a/br/messages/k3b.po
+++ b/br/messages/k3b.po
@@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kdeextragear-1/k3b.po\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2004-09-21 19:12+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
"Language-Team: br <LL@li.org>\n"
@@ -5429,11 +5429,11 @@ msgstr "&Perzhioù"
msgid "Open the properties dialog"
msgstr ""
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6404,19 +6404,23 @@ msgstr "N'hell ket bet lakaet ar rannbennadoù (%1)."
msgid "Alsa device:"
msgstr "Trobarzhell alsa :"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 gwelead III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "Kefluniadur barek video/klevet"
@@ -8255,17 +8259,12 @@ msgstr "Erlec'hiañ gant :"
msgid "&2-pass encoding"
msgstr "Kodadur buan"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Kodadur buan"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8277,17 +8276,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8300,22 +8299,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr ""
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8325,7 +8319,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -8867,6 +8861,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 gwelead III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Enrollañ an holl re"
@@ -9081,10 +9078,6 @@ msgstr ""
#~ msgid "Double Layer DVD"
#~ msgstr "DVD±R daoudroc'had"
-#, fuzzy
-#~ msgid "Alt+M"
-#~ msgstr "Alt+2"
-
#~ msgid "DVD-RW and DVD+RW"
#~ msgstr "DVD-RW ha DVD+RW"
@@ -9100,9 +9093,6 @@ msgstr ""
#~ msgid "K3b Defaults"
#~ msgstr "Lakaat an hini dre ziouer"
-#~ msgid "Alt+V"
-#~ msgstr "Alt+V"
-
#~ msgid "%A/%T/%a - %t"
#~ msgstr "%A/%T/%a - %t"
diff --git a/bs/Makefile.am b/bs/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/bs/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/bs/messages/Makefile.am b/bs/messages/Makefile.am
deleted file mode 100644
index 7db03d3..0000000
--- a/bs/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = bs
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/bs/messages/k3b.po b/bs/messages/k3b.po
index 70a08bd..24af13c 100644
--- a/bs/messages/k3b.po
+++ b/bs/messages/k3b.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2004-12-12 14:33-0800\n"
"Last-Translator: Vladimir Grubor <vlado@mobih.ba>\n"
"Language-Team: bosanski <lokal@linux.org.ba>\n"
@@ -5817,11 +5817,11 @@ msgstr "&Projekat"
msgid "Open the properties dialog"
msgstr "Otvori dijalog za kopiranje CD-ova"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6865,19 +6865,23 @@ msgstr "%1 ne može startati."
msgid "Alsa device:"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr ""
@@ -8755,17 +8759,12 @@ msgstr "Zamijeni sve prostore sa _"
msgid "&2-pass encoding"
msgstr "Data/mode1"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Data/mode1"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8777,17 +8776,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Video CD - Skidanje"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8800,22 +8799,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr ""
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8825,7 +8819,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
diff --git a/ca/Makefile.am b/ca/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/ca/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/ca/messages/Makefile.am b/ca/messages/Makefile.am
deleted file mode 100644
index 8f8e4c6..0000000
--- a/ca/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = ca
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/ca/messages/k3b.po b/ca/messages/k3b.po
index 1868400..cce0a66 100644
--- a/ca/messages/k3b.po
+++ b/ca/messages/k3b.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-12-16 12:55+0100\n"
"Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -6048,11 +6048,11 @@ msgstr "&Propietats"
msgid "Open the properties dialog"
msgstr "Obre el diàleg de propietats"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7131,19 +7131,23 @@ msgstr "No s'han pogut establir els paràmetres (%1)."
msgid "Alsa device:"
msgstr "Dispositiu ALSA:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Codificació Avançada d'Àudio (AAC)"
@@ -9209,17 +9213,12 @@ msgstr "Substitueix tots els es&pais per:"
msgid "&2-pass encoding"
msgstr "Codificació en &2 passades"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Habilita la codificació en 2 passades"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9239,17 +9238,17 @@ msgstr ""
"taxa de bits constant i de menor qualitat.\n"
"<p>La codificació en dues passades triga el doble que la normal."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Retallat automàtic del &vídeo"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Detecta automàticament les vores negres del vídeo"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9270,22 +9269,17 @@ msgstr ""
"<p>Encara que aquest mètode és molt segur, pot donar problemes si el "
"material d'origen és excepcionalment curt o fosc."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Torna a mostregar l'àudio a &44,1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Canvia la freqüència de mostreig del flux d'àudio a 44,1 KHz"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9300,7 +9294,7 @@ msgstr ""
"<p>Si aquesta opció està marcada el K3b canviarà la freqüència de mostreig "
"del flux d'àudio a 44100 Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Bai&xa prioritat per al procés de recodificació de vídeo"
@@ -9979,6 +9973,9 @@ msgstr ""
"suport només cal que l'inseriu i espereu a que el K3b el detecti. Aleshores "
"apareixerà com el vostre suport de gravació.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Desa-ho tot"
diff --git a/cmake b/cmake
deleted file mode 160000
-Subproject 15a7e4670a8f580545c95e14101f852c9d94799
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 01ee35e..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,237 +0,0 @@
-/* config.h.in. Generated from configure.in by autoheader. */
-
-/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
-#undef HAVE_CARBON_CARBON_H
-
-/* Define if you have the CoreAudio API */
-#undef HAVE_COREAUDIO
-
-/* Define to 1 if you have the <crt_externs.h> header file. */
-#undef HAVE_CRT_EXTERNS_H
-
-/* Defines if your system has the crypt function */
-#undef HAVE_CRYPT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if you have libjpeg */
-#undef HAVE_LIBJPEG
-
-/* Define if you have libpng */
-#undef HAVE_LIBPNG
-
-/* Define if you have a working libpthread (will enable threaded code) */
-#undef HAVE_LIBPTHREAD
-
-/* Define if you have libz */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if your system needs _NSGetEnviron to set up the environment */
-#undef HAVE_NSGETENVIRON
-
-/* Define if you have res_init */
-#undef HAVE_RES_INIT
-
-/* Define if you have the res_init prototype */
-#undef HAVE_RES_INIT_PROTO
-
-/* Define if you have a STL implementation by SGI */
-#undef HAVE_SGI_STL
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define if you have strlcat */
-#undef HAVE_STRLCAT
-
-/* Define if you have the strlcat prototype */
-#undef HAVE_STRLCAT_PROTO
-
-/* Define if you have strlcpy */
-#undef HAVE_STRLCPY
-
-/* Define if you have the strlcpy prototype */
-#undef HAVE_STRLCPY_PROTO
-
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#undef HAVE_SYS_BITYPES_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#undef HAVE_VSNPRINTF
-
-/* Suffix for lib directories */
-#undef KDELIBSUFF
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* The size of `char *', as computed by sizeof. */
-#undef SIZEOF_CHAR_P
-
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
-/* The size of `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
-
-/* The size of `unsigned long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Defined if compiling without arts */
-#undef WITHOUT_ARTS
-
-/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-
-
-
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero.
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-
-
-
-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-# include <sys/time.h>
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#endif
-
-
-
-#if !defined(HAVE_RES_INIT_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-int res_init(void);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-#if !defined(HAVE_STRLCAT_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-unsigned long strlcat(char*, const char*, unsigned long);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-#if !defined(HAVE_STRLCPY_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-unsigned long strlcpy(char*, const char*, unsigned long);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-
-
-
-#if defined(__SVR4) && !defined(__svr4__)
-#define __svr4__ 1
-#endif
-
-
-/* type to use in place of socklen_t if not defined */
-#undef kde_socklen_t
-
-/* type to use in place of socklen_t if not defined (deprecated, use
- kde_socklen_t) */
-#undef ksize_t
diff --git a/configure.files b/configure.files
deleted file mode 100644
index 97d9bce..0000000
--- a/configure.files
+++ /dev/null
@@ -1,3 +0,0 @@
-./admin/configure.in.min
-configure.in.in
-configure.in.bot
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 96b9344..0000000
--- a/configure.in
+++ /dev/null
@@ -1,293 +0,0 @@
-dnl =======================================================
-dnl FILE: ./admin/configure.in.min
-dnl =======================================================
-
-dnl This file is part of the KDE libraries/packages
-dnl Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
-
-dnl This file is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Library General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2 of the License, or (at your option) any later version.
-
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Library General Public License for more details.
-
-dnl You should have received a copy of the GNU Library General Public License
-dnl along with this library; see the file COPYING.LIB. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-dnl Boston, MA 02110-1301, USA.
-
-# Original Author was Kalle@kde.org
-# I lifted it in some mater. (Stephan Kulow)
-# I used much code from Janos Farkas
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(acinclude.m4) dnl a source file from your sub dir
-
-dnl This is so we can use kde-common
-AC_CONFIG_AUX_DIR(admin)
-
-dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
-unset CDPATH
-
-dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_SYSTEM
-dnl Perform program name transformation
-AC_ARG_PROGRAM
-
-dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(k3b-i18n-1.0.5, "3.5.9") dnl searches for some needed programs
-
-KDE_SET_PREFIX
-
-dnl generate the config header
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-
-dnl Checks for programs.
-AC_CHECK_COMPILERS
-AC_ENABLE_SHARED(yes)
-AC_ENABLE_STATIC(no)
-KDE_PROG_LIBTOOL
-
-dnl for NLS support. Call them in this order!
-dnl WITH_NLS is for the po files
-AM_KDE_WITH_NLS
-
-KDE_USE_QT(3.2)
-AC_PATH_KDE
-dnl =======================================================
-dnl FILE: configure.in.in
-dnl =======================================================
-
-#MIN_CONFIG(3.2)
-KDE_CREATE_SUBDIRSLIST
-AM_CONDITIONAL(af_SUBDIR_included, test "x$af_SUBDIR_included" = xyes)
-AM_CONDITIONAL(ar_SUBDIR_included, test "x$ar_SUBDIR_included" = xyes)
-AM_CONDITIONAL(bg_SUBDIR_included, test "x$bg_SUBDIR_included" = xyes)
-AM_CONDITIONAL(br_SUBDIR_included, test "x$br_SUBDIR_included" = xyes)
-AM_CONDITIONAL(bs_SUBDIR_included, test "x$bs_SUBDIR_included" = xyes)
-AM_CONDITIONAL(ca_SUBDIR_included, test "x$ca_SUBDIR_included" = xyes)
-AM_CONDITIONAL(cs_SUBDIR_included, test "x$cs_SUBDIR_included" = xyes)
-AM_CONDITIONAL(cy_SUBDIR_included, test "x$cy_SUBDIR_included" = xyes)
-AM_CONDITIONAL(da_SUBDIR_included, test "x$da_SUBDIR_included" = xyes)
-AM_CONDITIONAL(de_SUBDIR_included, test "x$de_SUBDIR_included" = xyes)
-AM_CONDITIONAL(el_SUBDIR_included, test "x$el_SUBDIR_included" = xyes)
-AM_CONDITIONAL(en_GB_SUBDIR_included, test "x$en_GB_SUBDIR_included" = xyes)
-AM_CONDITIONAL(es_SUBDIR_included, test "x$es_SUBDIR_included" = xyes)
-AM_CONDITIONAL(et_SUBDIR_included, test "x$et_SUBDIR_included" = xyes)
-AM_CONDITIONAL(eu_SUBDIR_included, test "x$eu_SUBDIR_included" = xyes)
-AM_CONDITIONAL(fa_SUBDIR_included, test "x$fa_SUBDIR_included" = xyes)
-AM_CONDITIONAL(fi_SUBDIR_included, test "x$fi_SUBDIR_included" = xyes)
-AM_CONDITIONAL(fr_SUBDIR_included, test "x$fr_SUBDIR_included" = xyes)
-AM_CONDITIONAL(ga_SUBDIR_included, test "x$ga_SUBDIR_included" = xyes)
-AM_CONDITIONAL(gl_SUBDIR_included, test "x$gl_SUBDIR_included" = xyes)
-AM_CONDITIONAL(he_SUBDIR_included, test "x$he_SUBDIR_included" = xyes)
-AM_CONDITIONAL(hi_SUBDIR_included, test "x$hi_SUBDIR_included" = xyes)
-AM_CONDITIONAL(hu_SUBDIR_included, test "x$hu_SUBDIR_included" = xyes)
-AM_CONDITIONAL(is_SUBDIR_included, test "x$is_SUBDIR_included" = xyes)
-AM_CONDITIONAL(it_SUBDIR_included, test "x$it_SUBDIR_included" = xyes)
-AM_CONDITIONAL(ja_SUBDIR_included, test "x$ja_SUBDIR_included" = xyes)
-AM_CONDITIONAL(ka_SUBDIR_included, test "x$ka_SUBDIR_included" = xyes)
-AM_CONDITIONAL(km_SUBDIR_included, test "x$km_SUBDIR_included" = xyes)
-AM_CONDITIONAL(lt_SUBDIR_included, test "x$lt_SUBDIR_included" = xyes)
-AM_CONDITIONAL(mk_SUBDIR_included, test "x$mk_SUBDIR_included" = xyes)
-AM_CONDITIONAL(ms_SUBDIR_included, test "x$ms_SUBDIR_included" = xyes)
-AM_CONDITIONAL(nb_SUBDIR_included, test "x$nb_SUBDIR_included" = xyes)
-AM_CONDITIONAL(nds_SUBDIR_included, test "x$nds_SUBDIR_included" = xyes)
-AM_CONDITIONAL(ne_SUBDIR_included, test "x$ne_SUBDIR_included" = xyes)
-AM_CONDITIONAL(nl_SUBDIR_included, test "x$nl_SUBDIR_included" = xyes)
-AM_CONDITIONAL(nn_SUBDIR_included, test "x$nn_SUBDIR_included" = xyes)
-AM_CONDITIONAL(pa_SUBDIR_included, test "x$pa_SUBDIR_included" = xyes)
-AM_CONDITIONAL(pl_SUBDIR_included, test "x$pl_SUBDIR_included" = xyes)
-AM_CONDITIONAL(pt_SUBDIR_included, test "x$pt_SUBDIR_included" = xyes)
-AM_CONDITIONAL(pt_BR_SUBDIR_included, test "x$pt_BR_SUBDIR_included" = xyes)
-AM_CONDITIONAL(ru_SUBDIR_included, test "x$ru_SUBDIR_included" = xyes)
-AM_CONDITIONAL(rw_SUBDIR_included, test "x$rw_SUBDIR_included" = xyes)
-AM_CONDITIONAL(se_SUBDIR_included, test "x$se_SUBDIR_included" = xyes)
-AM_CONDITIONAL(sk_SUBDIR_included, test "x$sk_SUBDIR_included" = xyes)
-AM_CONDITIONAL(sr_SUBDIR_included, test "x$sr_SUBDIR_included" = xyes)
-AM_CONDITIONAL(sr_Latn_SUBDIR_included, test "x$sr_Latn_SUBDIR_included" = xyes)
-AM_CONDITIONAL(sv_SUBDIR_included, test "x$sv_SUBDIR_included" = xyes)
-AM_CONDITIONAL(ta_SUBDIR_included, test "x$ta_SUBDIR_included" = xyes)
-AM_CONDITIONAL(tr_SUBDIR_included, test "x$tr_SUBDIR_included" = xyes)
-AM_CONDITIONAL(uk_SUBDIR_included, test "x$uk_SUBDIR_included" = xyes)
-AM_CONDITIONAL(uz_SUBDIR_included, test "x$uz_SUBDIR_included" = xyes)
-AM_CONDITIONAL(uz_cyrillic_SUBDIR_included, test "x$uz_cyrillic_SUBDIR_included" = xyes)
-AM_CONDITIONAL(zh_CN_SUBDIR_included, test "x$zh_CN_SUBDIR_included" = xyes)
-AM_CONDITIONAL(zh_TW_SUBDIR_included, test "x$zh_TW_SUBDIR_included" = xyes)
-AC_CONFIG_FILES([ Makefile ])
-AC_CONFIG_FILES([ af/Makefile ])
-AC_CONFIG_FILES([ af/messages/Makefile ])
-AC_CONFIG_FILES([ ar/Makefile ])
-AC_CONFIG_FILES([ ar/messages/Makefile ])
-AC_CONFIG_FILES([ bg/Makefile ])
-AC_CONFIG_FILES([ bg/messages/Makefile ])
-AC_CONFIG_FILES([ br/Makefile ])
-AC_CONFIG_FILES([ br/messages/Makefile ])
-AC_CONFIG_FILES([ bs/Makefile ])
-AC_CONFIG_FILES([ bs/messages/Makefile ])
-AC_CONFIG_FILES([ ca/Makefile ])
-AC_CONFIG_FILES([ ca/messages/Makefile ])
-AC_CONFIG_FILES([ cs/Makefile ])
-AC_CONFIG_FILES([ cs/messages/Makefile ])
-AC_CONFIG_FILES([ cy/Makefile ])
-AC_CONFIG_FILES([ cy/messages/Makefile ])
-AC_CONFIG_FILES([ da/Makefile ])
-AC_CONFIG_FILES([ da/doc/Makefile ])
-AC_CONFIG_FILES([ da/messages/Makefile ])
-AC_CONFIG_FILES([ de/Makefile ])
-AC_CONFIG_FILES([ de/doc/Makefile ])
-AC_CONFIG_FILES([ de/messages/Makefile ])
-AC_CONFIG_FILES([ el/Makefile ])
-AC_CONFIG_FILES([ el/messages/Makefile ])
-AC_CONFIG_FILES([ en_GB/Makefile ])
-AC_CONFIG_FILES([ en_GB/messages/Makefile ])
-AC_CONFIG_FILES([ es/Makefile ])
-AC_CONFIG_FILES([ es/doc/Makefile ])
-AC_CONFIG_FILES([ es/messages/Makefile ])
-AC_CONFIG_FILES([ et/Makefile ])
-AC_CONFIG_FILES([ et/doc/Makefile ])
-AC_CONFIG_FILES([ et/messages/Makefile ])
-AC_CONFIG_FILES([ eu/Makefile ])
-AC_CONFIG_FILES([ eu/messages/Makefile ])
-AC_CONFIG_FILES([ fa/Makefile ])
-AC_CONFIG_FILES([ fa/messages/Makefile ])
-AC_CONFIG_FILES([ fi/Makefile ])
-AC_CONFIG_FILES([ fi/messages/Makefile ])
-AC_CONFIG_FILES([ fr/Makefile ])
-AC_CONFIG_FILES([ fr/doc/Makefile ])
-AC_CONFIG_FILES([ fr/messages/Makefile ])
-AC_CONFIG_FILES([ ga/Makefile ])
-AC_CONFIG_FILES([ ga/messages/Makefile ])
-AC_CONFIG_FILES([ gl/Makefile ])
-AC_CONFIG_FILES([ gl/messages/Makefile ])
-AC_CONFIG_FILES([ he/Makefile ])
-AC_CONFIG_FILES([ he/messages/Makefile ])
-AC_CONFIG_FILES([ hi/Makefile ])
-AC_CONFIG_FILES([ hi/messages/Makefile ])
-AC_CONFIG_FILES([ hu/Makefile ])
-AC_CONFIG_FILES([ hu/messages/Makefile ])
-AC_CONFIG_FILES([ is/Makefile ])
-AC_CONFIG_FILES([ is/messages/Makefile ])
-AC_CONFIG_FILES([ it/Makefile ])
-AC_CONFIG_FILES([ it/doc/Makefile ])
-AC_CONFIG_FILES([ it/messages/Makefile ])
-AC_CONFIG_FILES([ ja/Makefile ])
-AC_CONFIG_FILES([ ja/messages/Makefile ])
-AC_CONFIG_FILES([ ka/Makefile ])
-AC_CONFIG_FILES([ ka/messages/Makefile ])
-AC_CONFIG_FILES([ km/Makefile ])
-AC_CONFIG_FILES([ km/messages/Makefile ])
-AC_CONFIG_FILES([ lt/Makefile ])
-AC_CONFIG_FILES([ lt/messages/Makefile ])
-AC_CONFIG_FILES([ mk/Makefile ])
-AC_CONFIG_FILES([ mk/messages/Makefile ])
-AC_CONFIG_FILES([ ms/Makefile ])
-AC_CONFIG_FILES([ ms/messages/Makefile ])
-AC_CONFIG_FILES([ nb/Makefile ])
-AC_CONFIG_FILES([ nb/messages/Makefile ])
-AC_CONFIG_FILES([ nds/Makefile ])
-AC_CONFIG_FILES([ nds/messages/Makefile ])
-AC_CONFIG_FILES([ ne/Makefile ])
-AC_CONFIG_FILES([ ne/messages/Makefile ])
-AC_CONFIG_FILES([ nl/Makefile ])
-AC_CONFIG_FILES([ nl/doc/Makefile ])
-AC_CONFIG_FILES([ nl/messages/Makefile ])
-AC_CONFIG_FILES([ nn/Makefile ])
-AC_CONFIG_FILES([ nn/messages/Makefile ])
-AC_CONFIG_FILES([ pa/Makefile ])
-AC_CONFIG_FILES([ pa/messages/Makefile ])
-AC_CONFIG_FILES([ pl/Makefile ])
-AC_CONFIG_FILES([ pl/doc/Makefile ])
-AC_CONFIG_FILES([ pl/messages/Makefile ])
-AC_CONFIG_FILES([ pt/Makefile ])
-AC_CONFIG_FILES([ pt/doc/Makefile ])
-AC_CONFIG_FILES([ pt/messages/Makefile ])
-AC_CONFIG_FILES([ pt_BR/Makefile ])
-AC_CONFIG_FILES([ pt_BR/doc/Makefile ])
-AC_CONFIG_FILES([ pt_BR/messages/Makefile ])
-AC_CONFIG_FILES([ ru/Makefile ])
-AC_CONFIG_FILES([ ru/doc/Makefile ])
-AC_CONFIG_FILES([ ru/messages/Makefile ])
-AC_CONFIG_FILES([ rw/Makefile ])
-AC_CONFIG_FILES([ rw/messages/Makefile ])
-AC_CONFIG_FILES([ se/Makefile ])
-AC_CONFIG_FILES([ se/messages/Makefile ])
-AC_CONFIG_FILES([ sk/Makefile ])
-AC_CONFIG_FILES([ sk/messages/Makefile ])
-AC_CONFIG_FILES([ sr/Makefile ])
-AC_CONFIG_FILES([ sr/messages/Makefile ])
-AC_CONFIG_FILES([ sr@Latn/Makefile ])
-AC_CONFIG_FILES([ sr@Latn/messages/Makefile ])
-AC_CONFIG_FILES([ sv/Makefile ])
-AC_CONFIG_FILES([ sv/doc/Makefile ])
-AC_CONFIG_FILES([ sv/messages/Makefile ])
-AC_CONFIG_FILES([ ta/Makefile ])
-AC_CONFIG_FILES([ ta/messages/Makefile ])
-AC_CONFIG_FILES([ tr/Makefile ])
-AC_CONFIG_FILES([ tr/messages/Makefile ])
-AC_CONFIG_FILES([ uk/Makefile ])
-AC_CONFIG_FILES([ uk/doc/Makefile ])
-AC_CONFIG_FILES([ uk/messages/Makefile ])
-AC_CONFIG_FILES([ uz/Makefile ])
-AC_CONFIG_FILES([ uz/messages/Makefile ])
-AC_CONFIG_FILES([ uz@cyrillic/Makefile ])
-AC_CONFIG_FILES([ uz@cyrillic/messages/Makefile ])
-AC_CONFIG_FILES([ zh_CN/Makefile ])
-AC_CONFIG_FILES([ zh_CN/messages/Makefile ])
-AC_CONFIG_FILES([ zh_TW/Makefile ])
-AC_CONFIG_FILES([ zh_TW/messages/Makefile ])
-AC_OUTPUT
-dnl Put here things to be done at the very end - telling users
-dnl about additional packages to install. Better yet is giving
-dnl each project / subdr its own configure.in.bot.
-
-# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
-if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
- # And if so, warn when they don't match
- if test "$kde_libs_prefix" != "$given_prefix"; then
- # And if kde doesn't know about the prefix yet
- echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
- if test $? -ne 0; then
- echo ""
- echo "Warning: you chose to install this package in $given_prefix,"
- echo "but KDE was found in $kde_libs_prefix."
- echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
- echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
- echo "Then restart KDE."
- echo ""
- fi
- fi
-fi
-
-if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
- echo ""
- echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
- echo "was not included. Therefore, GCC symbol visibility support remains disabled."
- echo ""
- echo "For better performance, consider including the Qt visibility supporting patch"
- echo "located at:"
- echo ""
- echo "http://bugs.kde.org/show_bug.cgi?id=109386"
- echo ""
- echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
- echo "everything will continue to work just fine without it."
- echo ""
-fi
-
-if test "$all_tests" = "bad"; then
- if test ! "$cache_file" = "/dev/null"; then
- echo ""
- echo "Please remove the file $cache_file after changing your setup"
- echo "so that configure will find the changes next time."
- echo ""
- fi
-else
- echo ""
- echo "Good - your configure finished. Start make now"
- echo ""
-fi
diff --git a/configure.in.bot b/configure.in.bot
deleted file mode 100644
index 3b7eaa7..0000000
--- a/configure.in.bot
+++ /dev/null
@@ -1,4 +0,0 @@
-dnl Put here things to be done at the very end - telling users
-dnl about additional packages to install. Better yet is giving
-dnl each project / subdr its own configure.in.bot.
-
diff --git a/configure.in.in b/configure.in.in
deleted file mode 100644
index 4b4eeec..0000000
--- a/configure.in.in
+++ /dev/null
@@ -1 +0,0 @@
-#MIN_CONFIG(3.2)
diff --git a/cs/Makefile.am b/cs/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/cs/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/cs/messages/Makefile.am b/cs/messages/Makefile.am
deleted file mode 100644
index af45f6a..0000000
--- a/cs/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = cs
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/cs/messages/k3b.po b/cs/messages/k3b.po
index 70bac56..2929baa 100644
--- a/cs/messages/k3b.po
+++ b/cs/messages/k3b.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2019-12-16 00:52+0000\n"
"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
@@ -5633,11 +5633,11 @@ msgstr "&Vlastnosti"
msgid "Open the properties dialog"
msgstr "Otevřít dialog vlastností"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6645,19 +6645,23 @@ msgstr "Nelze nastavit parametry (%1)."
msgid "Alsa device:"
msgstr "ALSA zařízení:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "AAC (Advanced Audio Coding)"
@@ -8537,17 +8541,12 @@ msgstr "Zaměnit všechna &prázdná místa za:"
msgid "&2-pass encoding"
msgstr "&2-průchodové kódování"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Povolit 2-průchodové kódování"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8559,17 +8558,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Automatický ořez &videa"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Automaticky detekovat černé okraje videa"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8582,22 +8581,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Resamplovat na &44,1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8607,7 +8601,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9157,6 +9151,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Uložit vše"
diff --git a/cy/Makefile.am b/cy/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/cy/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/cy/messages/Makefile.am b/cy/messages/Makefile.am
deleted file mode 100644
index 93f71da..0000000
--- a/cy/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = cy
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/cy/messages/k3b.po b/cy/messages/k3b.po
index 3df6f64..319c348 100644
--- a/cy/messages/k3b.po
+++ b/cy/messages/k3b.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ../cy/messages//kdeextragear-1/k3b.po\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2004-09-20 15:44+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
"Language-Team: cy <LL@li.org>\n"
@@ -5438,11 +5438,11 @@ msgstr "&Priodweddau"
msgid "Open the properties dialog"
msgstr ""
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6424,19 +6424,23 @@ msgstr "Methwyd agor y ffeil %1"
msgid "Alsa device:"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr ""
@@ -8273,17 +8277,12 @@ msgstr "Amnewid efo:"
msgid "&2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8295,17 +8294,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8318,22 +8317,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr ""
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8343,7 +8337,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -8977,49 +8971,10 @@ msgstr ""
#~ msgid "K3b"
#~ msgstr "K3b"
-#, fuzzy
-#~ msgid "Alt+O"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+N"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+K"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+A"
-#~ msgstr "Alt+C"
-
-#~ msgid "Alt+C"
-#~ msgstr "Alt+C"
-
#~ msgid "Form1"
#~ msgstr "Ffurf1"
#, fuzzy
-#~ msgid "Alt+Y"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+D"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+J"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+U"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+B"
-#~ msgstr "Alt+2"
-
-#, fuzzy
#~ msgid "Preparing..."
#~ msgstr "Yn chwilio..."
@@ -9050,10 +9005,6 @@ msgstr ""
#~ msgstr "Datblygwr"
#, fuzzy
-#~ msgid "Alt+M"
-#~ msgstr "Alt+2"
-
-#, fuzzy
#~ msgid "Follow symbolic links for source files"
#~ msgstr "Dilyn cysylltau symbolaidd"
@@ -9061,10 +9012,6 @@ msgstr ""
#~ msgid "K3b Defaults"
#~ msgstr "Gosod yn Ragosodyn"
-#, fuzzy
-#~ msgid "Alt+V"
-#~ msgstr "Alt+2"
-
#~ msgid "New"
#~ msgstr "Newydd"
diff --git a/da/CMakeLists.txt b/da/CMakeLists.txt
deleted file mode 100644
index ba78952..0000000
--- a/da/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/da/Makefile.am b/da/Makefile.am
deleted file mode 100644
index ff7ab78..0000000
--- a/da/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages doc
diff --git a/da/doc/CMakeLists.txt b/da/doc/CMakeLists.txt
deleted file mode 100644
index 820cfa9..0000000
--- a/da/doc/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
-
-tde_create_handbook(
- DESTINATION k3b
- LANG da
-)
diff --git a/da/doc/Makefile.am b/da/doc/Makefile.am
deleted file mode 100644
index 21bad70..0000000
--- a/da/doc/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = da
-KDE_DOCS = k3b
diff --git a/da/doc/index.docbook b/da/doc/index.docbook
index de12b93..d6d6d99 100644
--- a/da/doc/index.docbook
+++ b/da/doc/index.docbook
@@ -312,15 +312,3 @@ or the ChangeLog file, or ... -->
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/da/messages/Makefile.am b/da/messages/Makefile.am
deleted file mode 100644
index 8452929..0000000
--- a/da/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = da
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/da/messages/k3b.po b/da/messages/k3b.po
index 8ae87a0..3932531 100644
--- a/da/messages/k3b.po
+++ b/da/messages/k3b.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-07-26 09:27-0700\n"
"Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -5979,11 +5979,11 @@ msgstr "&Egenskaber"
msgid "Open the properties dialog"
msgstr "åbn egenskabsdialogen"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7053,19 +7053,23 @@ msgstr "Kunne ikke sætte parametre (%1)."
msgid "Alsa device:"
msgstr "ALSA-enhed:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media version1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media version 2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Lager III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Avanceret lydkodning (AAC)"
@@ -9101,17 +9105,12 @@ msgstr "Erstat alle &mellemrum med:"
msgid "&2-pass encoding"
msgstr "Kodning med &2 gennemgange"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Aktivér kodning med 2 gennemgange"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9130,17 +9129,17 @@ msgstr ""
"bithastighed og lavere kvalitet.\n"
"<p>Kodning med 2 gennemgange resulterer i en fordobling af kodningstiden."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Automatisk beskæring af &video"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Detektér automatisk sorte kanter i video"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9161,22 +9160,17 @@ msgstr ""
"<p>Selvom metoden er meget tilforladelig kan der opstå problemer hvis "
"kildematerialet er usædvanligt kort eller mørkt."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Resample lyd til &44,1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Ændr samplingsfrekvens for lydstrømmen til 44,1 KHz"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9190,7 +9184,7 @@ msgstr ""
"<p>Hvis dette markeres, ændrer K3b lydstrømmens samplingsfrekvens til 44100 "
"Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Lav s&kemalægningsprioritet for videokodningsprocessen"
@@ -9864,6 +9858,9 @@ msgstr ""
"medium, så indsæt det og vent på at K3b detekterer det. Det vises derefter "
"som brændemedium.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Lager III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Gem alle"
@@ -10044,39 +10041,9 @@ msgstr ""
#~ msgid "base_K3bMiscOptionTab"
#~ msgstr "base_K3bMiscOptionTab"
-#~ msgid "Alt+O"
-#~ msgstr "Alt+O"
-
-#~ msgid "Alt+N"
-#~ msgstr "Alt+N"
-
-#~ msgid "Alt+K"
-#~ msgstr "Alt+K"
-
-#~ msgid "Alt+A"
-#~ msgstr "Alt+A"
-
-#~ msgid "Alt+C"
-#~ msgstr "Alt+C"
-
#~ msgid "Form1"
#~ msgstr "Form1"
-#~ msgid "Alt+Y"
-#~ msgstr "Alt+Y"
-
-#~ msgid "Alt+D"
-#~ msgstr "Alt+D"
-
-#~ msgid "Alt+J"
-#~ msgstr "Alt+J"
-
-#~ msgid "Alt+U"
-#~ msgstr "Alt+U"
-
-#~ msgid "Alt+B"
-#~ msgstr "Alt+B"
-
#~ msgid "Load user default settings"
#~ msgstr "Indlæs brugerens standardindstillinger"
@@ -10380,9 +10347,6 @@ msgstr ""
#~ msgid "Double Layer DVD"
#~ msgstr "Dobbeltlags dvd"
-#~ msgid "Alt+M"
-#~ msgstr "Alt+M"
-
#~ msgid "DVD-RW and DVD+RW"
#~ msgstr "Dvd-rw og dvd+rw"
@@ -10466,9 +10430,6 @@ msgstr ""
#~ "%1</b>."
#~ msgstr "<p>Vent mens K3b henter information om mediet i <b>%1</b>."
-#~ msgid "Alt+V"
-#~ msgstr "Alt+V"
-
#~ msgid "%A/%T/%a - %t"
#~ msgstr "%A/%T/%a - %t"
diff --git a/de/CMakeLists.txt b/de/CMakeLists.txt
deleted file mode 100644
index ba78952..0000000
--- a/de/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/de/Makefile.am b/de/Makefile.am
deleted file mode 100644
index ff7ab78..0000000
--- a/de/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages doc
diff --git a/de/doc/CMakeLists.txt b/de/doc/CMakeLists.txt
deleted file mode 100644
index 899d10e..0000000
--- a/de/doc/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
-
-tde_create_handbook(
- DESTINATION k3b
- LANG de
-)
diff --git a/de/doc/Makefile.am b/de/doc/Makefile.am
deleted file mode 100644
index 6ffcbf0..0000000
--- a/de/doc/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = de
-KDE_DOCS = k3b
diff --git a/de/doc/index.docbook b/de/doc/index.docbook
index edaf161..13b7e0d 100644
--- a/de/doc/index.docbook
+++ b/de/doc/index.docbook
@@ -316,15 +316,3 @@ or the ChangeLog file, or ... -->
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/de/messages/Makefile.am b/de/messages/Makefile.am
deleted file mode 100644
index b15dd61..0000000
--- a/de/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = de
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/de/messages/k3b.po b/de/messages/k3b.po
index d5dc519..d04b64c 100644
--- a/de/messages/k3b.po
+++ b/de/messages/k3b.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2019-12-26 00:36+0000\n"
"Last-Translator: Chris <xchrisx@uber.space>\n"
"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
@@ -6104,11 +6104,11 @@ msgstr "&Eigenschaften"
msgid "Open the properties dialog"
msgstr "Öffnet den Eigenschaften-Dialog"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr "Der Verzeichnismodus wird für entfernte Orte nicht unterstützt."
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr "KOffice Speicher"
@@ -7188,19 +7188,23 @@ msgstr "Die Parameter lassen sich nicht einstellen (%1)."
msgid "Alsa device:"
msgstr "Alsa-Gerät:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Advanced Audio Coding (AAC)"
@@ -9261,17 +9265,12 @@ msgstr "Alle &Leerzeichen ersetzen durch:"
msgid "&2-pass encoding"
msgstr "&2-Schritt-Kodierung"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "&2-Schritt-Kodierung"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9291,17 +9290,17 @@ msgstr ""
"konstanter Bitrate und niedrigerer Qualität erzeugen.\n"
"<p>Die 2-Schritt-Kodierung benötigt die doppelte Zeit zum Kodieren."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Automatischer Video-&Zuschnitt"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Automatische Erkennung der schwarzen Ränder eines Videos"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9318,22 +9317,17 @@ msgstr ""
"seitlich) des Videos gemeint, mit deren Hilfe das Bild an die möglichen "
"unterstützten Seitenverhältnisse des Video-DVD-Standards angepasst wird."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Abtastrate auf &44,1 kHz ändern"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Ändert die Abtastrate der Audio-Spur auf 44,1 KHz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9347,7 +9341,7 @@ msgstr ""
"<p>Wenn diese Einstellung aktiviert ist, wird K3b die Abtastrate der Audio-"
"Spur auf 44,1KHz ändern."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Niedrige &Priorität für Video-Umwandlung"
@@ -10022,6 +10016,9 @@ msgstr ""
"warten, bis K3b es erkennt. Es wird dann automatisch als Ihr Brennmedium "
"erscheinen</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Alles speichern"
diff --git a/el/Makefile.am b/el/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/el/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/el/messages/Makefile.am b/el/messages/Makefile.am
deleted file mode 100644
index da7e49a..0000000
--- a/el/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = el
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/el/messages/k3b.po b/el/messages/k3b.po
index 0345b32..ada3201 100644
--- a/el/messages/k3b.po
+++ b/el/messages/k3b.po
@@ -6,19 +6,22 @@
# Bouklis Panos <panos@echidna-band.com>, 2005.
# Toussis Manolis <manolis@koppermind.homelinux.org>, 2005, 2006, 2007.
# translation of k3b.po to Greek
+# blu.256 <mavridisf@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2008-01-29 16:04+0200\n"
-"Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
-"Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
+"PO-Revision-Date: 2020-12-30 17:15+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"applications/k3b/el/>\n"
"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.4\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
@@ -3698,17 +3701,17 @@ msgstr ""
"cdrdao."
#: projects/k3baudioburndialog.cpp:301
-#, fuzzy
msgid ""
"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
"uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/"
"normalize/) to normalize audio tracks. In order to use this functionality, "
"please install it first. (sudo apt-get install normalize-audio)"
msgstr ""
-"<p><b>Το εξωτερικό πρόγραμμα <em>normalize</em> δεν είναι εγκατεστημένο.</"
-"b><p>Το K3b χρησιμοποιεί το <em>normalize</em> (http://www1.cs.columbia.edu/"
-"~cvaill/normalize/) για την κανονικοποίηση των κομματιών ήχου. Εγκαταστήστε "
-"το για να σας είναι διαθέσιμη αυτήν η λειτουργία."
+"<p><b>Το εξωτερικό πρόγραμμα <em>normalize-audio</em> δεν είναι "
+"εγκατεστημένο.</b><p>Το K3b χρησιμοποιεί το <em>normalize-audio</em> (http://"
+"www1.cs.columbia.edu/~cvaill/normalize/) για την κανονικοποίηση των "
+"κομματιών ήχου. Εγκαταστήστε το για να σας είναι διαθέσιμη αυτήν η "
+"λειτουργία. (sudo apt-get install normalize-audio)"
#: projects/k3baudioburndialog.cpp:308 projects/k3baudioburndialog.cpp:327
#: projects/k3bmixedburndialog.cpp:318 projects/k3bmixedburndialog.cpp:337
@@ -4999,17 +5002,17 @@ msgstr ""
"αναπαραγωγής CD ήχου που θα προσπαθήσουν να αναπαράγουν το κομμάτι δεδομένων."
#: projects/k3bmixedburndialog.cpp:311
-#, fuzzy
msgid ""
"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
"uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/"
"normalize/) to normalize audio tracks. In order to use this functionality, "
"please install it first (sudo apt-get install normalize-audio."
msgstr ""
-"<p><b>Το εξωτερικό πρόγραμμα <em>normalize</em> δεν είναι εγκατεστημένο.</"
-"b><p>Το K3b χρησιμοποιεί το <em>normalize</em> (http://www1.cs.columbia.edu/"
-"~cvaill/normalize/) για την κανονικοποίηση των κομματιών ήχου. Εγκαταστήστε "
-"το για να σας είναι διαθέσιμη αυτήν η λειτουργία."
+"<p><b>Το εξωτερικό πρόγραμμα <em>normalize-audio</em> δεν είναι "
+"εγκατεστημένο.</b><p>Το K3b χρησιμοποιεί το <em>normalize-audio</em> (http://"
+"www1.cs.columbia.edu/~cvaill/normalize/) για την κανονικοποίηση των "
+"κομματιών ήχου. Εγκαταστήστε το για να σας είναι διαθέσιμη αυτήν η "
+"λειτουργία (sudo apt-get install normalize-audio)."
#: projects/k3bmixeddirtreeview.cpp:45
msgid "Audio Tracks"
@@ -6094,13 +6097,14 @@ msgstr "&Ιδιότητες"
msgid "Open the properties dialog"
msgstr "Άνοιγμα του διαλόγου ιδιοτήτων"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
-msgstr ""
+msgstr "Η προβολή καταλόγου δεν υποστηρίζεται για απομακρυσμένες τοποθεσίες."
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
+#, fuzzy
msgid "KOffice Storage"
-msgstr ""
+msgstr "Αποθετήριο KOffice"
#: rip/k3baudiocdlistview.cpp:36
msgid "Artist"
@@ -7183,19 +7187,23 @@ msgstr "Αδυναμία ορισμού παραμέτρων (%1)."
msgid "Alsa device:"
msgstr "Συσκευή της Alsa:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Προχωρημένη κωδικοποίηση ήχου (AAC)"
@@ -9267,17 +9275,12 @@ msgstr "Αντικατάσταση όλων των &κενών με:"
msgid "&2-pass encoding"
msgstr "Κωδικοποίηση &2 περασμάτων"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Ενεργοποίηση κωδικοποίησης 2 περασμάτων"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9297,17 +9300,17 @@ msgstr ""
"βίντεο με σταθερό ρυθμό bit και χαμηλότερη ποιότητα.\n"
"<p>Η κωδικοποίηση 2 περασμάτων απαιτεί το διπλάσιο χρόνο."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Αυτόματη κοπή &βίντεο"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Αυτόματη ανίχνευση των μαύρων περιθωρίων της εικόνας"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9328,22 +9331,17 @@ msgstr ""
"<p>Παρόλο που αυτή η μέθοδος είναι πολύ αξιόπιστη ίσως υπάρξουν προβλήματα "
"με υλικό υπερβολικά σύντομο σε διάρκεια ή σκοτεινό."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Αναδειγματοληψία στα &44.1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Τροποποίηση του ρυθμού δειγματοληψίας ήχου στα 44.1 KHz"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9358,7 +9356,7 @@ msgstr ""
"<p>Αν ενεργοποιήσετε αυτή την επιλογή το K3b θα τροποποιήσει το ρυθμό "
"δειγματοληψίας της ροής ήχου στα 44100 Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Χαμηλή &προτεραιότητα για τη διεργασία κωδικοποίησης βίντεο"
@@ -9972,7 +9970,6 @@ msgstr ""
"εσάς.</p>\n"
#: tips:17
-#, fuzzy
msgid ""
"<p>...that K3b has two types of settings. On the one hand K3b has settings "
"like most\n"
@@ -9990,15 +9987,15 @@ msgid ""
msgstr ""
"<p>...ότι το K3b έχει δύο τύπους ρυθμίσεων. Από τη μια το K3b έχει ρυθμίσεις "
"όμοιες με τις \n"
-"περισσότερες εφαρμογές του TDE στις οποίες είναι προσβάσιμο από το διάλογο "
-"ρύθμισης στο μενού ρυθμίσεων\n"
+"περισσότερες εφαρμογές του TDE οι οποίες είναι προσβάσιμες από το διάλογο "
+"ρύθμισης στο μενού ρυθμίσεων.\n"
"Από την άλλη κάθε διάλογος ενεργειών του K3b έχει τρία κουμπιά για τη "
"φόρτωση και την αποθήκευση\n"
-"των προκαθορισμένων για αυτή την ενέργεια. Με αυτόν τον τρόπο μπορεί "
-"κάποιος για παράδειγμα να ορίσει τα προκαθορισμένα για την αντιγραφή CD: \n"
+"των προκαθορισμένων για αυτή την ενέργεια. Με αυτόν τον τρόπο μπορεί κάποιος "
+"για παράδειγμα να ορίσει τα προκαθορισμένα για την αντιγραφή CD: \n"
"Αυτά τα προκαθορισμένα θα φορτώνονται κάθε φορά που ανοίγει ο διάλογος "
"αντιγραφής CD. Το κουμπί <em>Προκαθορισμένα K3b</em>\n"
-"Θα επαναφέρει τις <em>εργοστασιακές ρυθμίσεις</em> σε περίπτωση που δεν "
+"θα επαναφέρει τις <em>εργοστασιακές ρυθμίσεις</em> σε περίπτωση που δεν "
"ξέρετε αν οι ρυθμίσεις\n"
"που επιλέξατε είναι σωστές.</p>\n"
@@ -10042,6 +10039,9 @@ msgstr ""
"μέσο, απλά εισάγετέ το και περιμένετε για την ανίχνευσή του από το K3b. "
"Αμέσως μετά θα εμφανιστεί σαν το μέσο εγγραφής σας.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Αποθήκευση όλων"
diff --git a/en_GB/Makefile.am b/en_GB/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/en_GB/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/en_GB/messages/Makefile.am b/en_GB/messages/Makefile.am
deleted file mode 100644
index ce472fa..0000000
--- a/en_GB/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = en_GB
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/en_GB/messages/k3b.po b/en_GB/messages/k3b.po
index 7c732be..d06c02e 100644
--- a/en_GB/messages/k3b.po
+++ b/en_GB/messages/k3b.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2005-12-09 23:26+0000\n"
"Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
"Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -5976,11 +5976,11 @@ msgstr "&Properties"
msgid "Open the properties dialog"
msgstr "Open the properties dialogue"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7050,19 +7050,23 @@ msgstr "Could not set parameters (%1)."
msgid "Alsa device:"
msgstr "Rescan the devices"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "Advanced Audio/Video Settings"
@@ -9014,17 +9018,12 @@ msgstr "Replace all blanks with:"
msgid "&2-pass encoding"
msgstr "fast encoding"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "fast encoding"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9036,17 +9035,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Video CD Ripping"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Cut off the black borders of the movie"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9059,22 +9058,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, fuzzy, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Resample to 44.1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9084,7 +9078,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9720,6 +9714,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Save All"
diff --git a/es/CMakeLists.txt b/es/CMakeLists.txt
deleted file mode 100644
index ba78952..0000000
--- a/es/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/es/Makefile.am b/es/Makefile.am
deleted file mode 100644
index ff7ab78..0000000
--- a/es/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages doc
diff --git a/es/doc/CMakeLists.txt b/es/doc/CMakeLists.txt
deleted file mode 100644
index a140986..0000000
--- a/es/doc/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
-
-tde_create_handbook(
- DESTINATION k3b
- LANG es
-)
diff --git a/es/doc/Makefile.am b/es/doc/Makefile.am
deleted file mode 100644
index ef61b59..0000000
--- a/es/doc/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = es
-KDE_DOCS = k3b
diff --git a/es/doc/index.docbook b/es/doc/index.docbook
index 57b3213..885561a 100644
--- a/es/doc/index.docbook
+++ b/es/doc/index.docbook
@@ -348,15 +348,3 @@ or the ChangeLog file, or ... -->
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/es/messages/Makefile.am b/es/messages/Makefile.am
deleted file mode 100644
index d3df28d..0000000
--- a/es/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = es
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/es/messages/k3b.po b/es/messages/k3b.po
index 0a607f1..c894a5c 100644
--- a/es/messages/k3b.po
+++ b/es/messages/k3b.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2008-01-28 22:50+0100\n"
"Last-Translator: Carlos Davila <carluti@users.sourceforge.net>\n"
"Language-Team: Español <kde-l10n-es@kde.org>\n"
@@ -6058,11 +6058,11 @@ msgstr "&Propiedades"
msgid "Open the properties dialog"
msgstr "Abrir el diálogo de propiedades"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7141,19 +7141,23 @@ msgstr "No se pudieron establecer los parámetros (%1)."
msgid "Alsa device:"
msgstr "Dispositivo ALSA:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Codificación avanzada de audio (AAC)"
@@ -9216,17 +9220,12 @@ msgstr "Reemplazar todos los &espacios con:"
msgid "&2-pass encoding"
msgstr "codificación en &2 pasadas"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Habilitar codificación en 2 pases"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9245,17 +9244,17 @@ msgstr ""
"bits constante y una calidad menor.\n"
"<p>La codificación en 2 pases utiliza el doble de tiempo de codificación."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Recorte automático de &vídeo"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Detectar automáticamente los bordes negros del vídeo"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9276,22 +9275,17 @@ msgstr ""
"<p>Aunque este método es muy seguro puede haber problemas si el material de "
"origen es excepcionalmente corto u oscuro."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Volver a muestrear el audio a &44,1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Cambiar la tasa de muestreo del flujo de audio a 44.1 KHz"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9306,7 +9300,7 @@ msgstr ""
"<p>Si se marca esta opción K3b cambiará la tasa de muestreo del flujo de "
"audio a 44100 Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9985,6 +9979,9 @@ msgstr ""
"medio simplemente insértelo y espere a que K3b lo detecte. Aparecerá "
"entonces como su medio de grabación.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Guardar todo"
diff --git a/et/CMakeLists.txt b/et/CMakeLists.txt
deleted file mode 100644
index ba78952..0000000
--- a/et/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/et/Makefile.am b/et/Makefile.am
deleted file mode 100644
index ff7ab78..0000000
--- a/et/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages doc
diff --git a/et/doc/CMakeLists.txt b/et/doc/CMakeLists.txt
deleted file mode 100644
index 6571f00..0000000
--- a/et/doc/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
-
-tde_create_handbook(
- DESTINATION k3b
- LANG et
-)
diff --git a/et/doc/Makefile.am b/et/doc/Makefile.am
deleted file mode 100644
index 1fa8856..0000000
--- a/et/doc/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = et
-KDE_DOCS = k3b
diff --git a/et/doc/index.docbook b/et/doc/index.docbook
index 56ebf35..304e064 100644
--- a/et/doc/index.docbook
+++ b/et/doc/index.docbook
@@ -316,15 +316,3 @@ or the ChangeLog file, or ... -->
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/et/messages/Makefile.am b/et/messages/Makefile.am
deleted file mode 100644
index 21009b2..0000000
--- a/et/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = et
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/et/messages/k3b.po b/et/messages/k3b.po
index be46410..4c40a27 100644
--- a/et/messages/k3b.po
+++ b/et/messages/k3b.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2008-03-16 16:53+0200\n"
"Last-Translator: Marek Laane <bald@starman.ee>\n"
"Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -5944,11 +5944,11 @@ msgstr "&Omadused"
msgid "Open the properties dialog"
msgstr "Avab omaduste dialoogi"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7015,19 +7015,23 @@ msgstr "Parameetrite (%1) määramine ebaõnnestus."
msgid "Alsa device:"
msgstr "ALSA seade:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Advanced Audio Coding (AAC)"
@@ -9055,17 +9059,12 @@ msgstr "&Kõik tühikud asendatakse järgnevaga:"
msgid "&2-pass encoding"
msgstr "Ka&hekäiguline kodeerimine"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Kahekäigulise kodeerimise lubamine"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9083,17 +9082,17 @@ msgstr ""
"madalama kvaliteediga.\n"
"<p>Kahekäiguline kodeerimine tähendab kaks korda kauem kestvat kodeerimist."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Automaatne &video kärpimine"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Video mustade äärte automaatne tuvastamine"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9114,22 +9113,17 @@ msgstr ""
"<p>Kuigi see meetod on väga usaldusväärne, võib tekkida probleeme juhul, kui "
"algmaterjal on erakordselt lühike või tume."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Audio ümberdiskreetimine &44,1 kHz peale"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Audiovoo ümberdiskreetimine 44,1 KHz peale"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9142,7 +9136,7 @@ msgstr ""
"Hz. Audio CD-d on aga kodeeritud sagedusega 44100 Hz.\n"
"<p>Sisselülitamisel muudab K3b audiovoo diskreetimissageduseks 44100 Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Video tran&skodeerimisele antakse madal prioriteet"
@@ -9808,6 +9802,9 @@ msgstr ""
"Kui soovid kirjutada teatud andmekandja, lihtsalt sisesta see ja oota, kuni "
"K3b selle tuvastab. Siis näidatakse seda kirjutatava andmekandjana.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Salvesta kõik"
diff --git a/eu/Makefile.am b/eu/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/eu/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/eu/messages/Makefile.am b/eu/messages/Makefile.am
deleted file mode 100644
index 2bc91b0..0000000
--- a/eu/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = eu
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/eu/messages/k3b.po b/eu/messages/k3b.po
index 04f2c7b..504de32 100644
--- a/eu/messages/k3b.po
+++ b/eu/messages/k3b.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2005-04-06 17:02+0200\n"
"Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>\n"
"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -6087,11 +6087,11 @@ msgstr "Fitxategiaren propietateak"
msgid "Open the properties dialog"
msgstr "Ireki CDak kopiatzeko elkarrizketa-koadroa"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7129,19 +7129,23 @@ msgstr "Ezin izan da %1 abiarazi."
msgid "Alsa device:"
msgstr "Berreskaneatu gailuak"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "Audioaren/Bideoaren konfigurazio aurreratua"
@@ -9109,17 +9113,12 @@ msgstr "Ordeztu zuriune guztiak honekin:"
msgid "&2-pass encoding"
msgstr "Datuen kodeketa:"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Datuen kodeketa:"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9131,17 +9130,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Bideo CDak erauztea"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Moztu filmaren ertz beltzak"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9154,22 +9153,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, fuzzy, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Berriz lagindu 44.1 kHz-etan"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9179,7 +9173,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
diff --git a/fa/Makefile.am b/fa/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/fa/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/fa/messages/Makefile.am b/fa/messages/Makefile.am
deleted file mode 100644
index 7155ae2..0000000
--- a/fa/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = fa
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/fa/messages/k3b.po b/fa/messages/k3b.po
index 1586d9a..43e983e 100644
--- a/fa/messages/k3b.po
+++ b/fa/messages/k3b.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-01-16 10:04+0330\n"
"Last-Translator: MaryamSadat Razavi <razavi@itland.ir>\n"
"Language-Team: Persian <kde-i18n-fa@kde.org>\n"
@@ -5929,11 +5929,11 @@ msgstr "&ویژگیها"
msgid "Open the properties dialog"
msgstr "باز کردن محاورۀ ویژگیها"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6981,19 +6981,23 @@ msgstr "پارامترها را نتوانست تنظیم کند )%1(."
msgid "Alsa device:"
msgstr "دستگاه Alsa:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "نسخۀ ۱ رسانۀ ویندوز"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "نسخۀ ۲ رسانۀ ویندوز"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "لایۀ III MPEG 1"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "کدگذاری صوتی پیشرفته )AAC("
@@ -9027,17 +9031,12 @@ msgstr "جایگزینی همۀ &فاصله‌ها با:"
msgid "&2-pass encoding"
msgstr "کدبندی &۲ گذری‌"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "دگرساز+۲"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "فعال‌سازی کدبندی ۲ گذری"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9056,17 +9055,17 @@ msgstr ""
"ثابت و کیفیت پایین‌تر ایجاد می‌کند.\n"
"<p>کدبندی ۲ گذری باعث می‌شود که زمان کدبندی دوبرابر شود."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "در حال تبدیل &ویدئو به طور خودکار‌"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "آشکارسازی خودکار لبه‌های سیاه ویدئو"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9087,22 +9086,17 @@ msgstr ""
"<p>گرچه این روش بسیار مطمئن است، اما اگر مادۀ متن استثناءً کوتاه یا تاریک "
"باشد ممکن است مسائلی پیش آید."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "نمونه‌برداری مجدد به &۱/۴۴ کیلو هرتز"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "دگرساز+۴"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "تغییر میزان نمونۀ جریان صوتی به ۱/۴۴ کیلو هرتز"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9117,7 +9111,7 @@ msgstr ""
"<p>اگر این گزینه علامت زده شود، K3b میزان نمونه‌برداری جریان صوتی را تا ۴۴۱۰۰ "
"هرتز تغییر می‌دهد."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "اولویت پایین &زمان‌بندی برای فرایند ترارمز ویدئویی‌"
@@ -9785,6 +9779,9 @@ msgstr ""
"بسوزانید، کافی است آن را درج کنید و صبر کنید تا K3b آن را آشکار کند. سپس به "
"عنوان رسانۀ سوزاندن شما ظاهر می‌شود.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "لایۀ III MPEG 1"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "ذخیرۀ همه"
diff --git a/fi/Makefile.am b/fi/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/fi/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/fi/messages/Makefile.am b/fi/messages/Makefile.am
deleted file mode 100644
index b5f8c61..0000000
--- a/fi/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = fi
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/fi/messages/k3b.po b/fi/messages/k3b.po
index 12a17f3..08a9177 100644
--- a/fi/messages/k3b.po
+++ b/fi/messages/k3b.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2008-02-11 16:25+0200\n"
"Last-Translator: Mikael Lammentausta <mikael.lammentausta@gmail.com>\n"
"Language-Team: <fi@li.org>\n"
@@ -5701,11 +5701,11 @@ msgstr "&Ominaisuudet"
msgid "Open the properties dialog"
msgstr "Avaa ominaisuudet-ikkunan"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6750,19 +6750,23 @@ msgstr "Parametrien (%1) asetus epäonnistui."
msgid "Alsa device:"
msgstr "Alsa-laite:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr ""
@@ -8657,17 +8661,12 @@ msgstr "Korvaa &kaikki välilyönnit merkillä:"
msgid "&2-pass encoding"
msgstr "&2-vaiheinen pakkaus"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "ota käyttöön kaksivaiheinen pakkaus"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8679,17 +8678,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Havaitse kuvan mustat reunat automaattisesti"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8702,22 +8701,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Muunna näytteenottotaajuudelle &44,1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8727,7 +8721,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9322,6 +9316,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Tallenna kaikki"
diff --git a/fr/CMakeLists.txt b/fr/CMakeLists.txt
deleted file mode 100644
index ba78952..0000000
--- a/fr/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/fr/Makefile.am b/fr/Makefile.am
deleted file mode 100644
index ff7ab78..0000000
--- a/fr/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages doc
diff --git a/fr/doc/CMakeLists.txt b/fr/doc/CMakeLists.txt
deleted file mode 100644
index 2653a7b..0000000
--- a/fr/doc/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
-
-tde_create_handbook(
- DESTINATION k3b
- LANG fr
-)
diff --git a/fr/doc/Makefile.am b/fr/doc/Makefile.am
deleted file mode 100644
index ce7bfd7..0000000
--- a/fr/doc/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = fr
-KDE_DOCS = k3b
diff --git a/fr/doc/index.docbook b/fr/doc/index.docbook
index c1d9d6e..afb1a91 100644
--- a/fr/doc/index.docbook
+++ b/fr/doc/index.docbook
@@ -282,15 +282,3 @@ or the ChangeLog file, or ... -->
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/fr/messages/Makefile.am b/fr/messages/Makefile.am
deleted file mode 100644
index 1e563b7..0000000
--- a/fr/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = fr
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/fr/messages/k3b.po b/fr/messages/k3b.po
index 2e4b1ac..8777af1 100644
--- a/fr/messages/k3b.po
+++ b/fr/messages/k3b.po
@@ -17,7 +17,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-01-27 14:38+0100\n"
"Last-Translator: Yannick Torrès <yannick.torres@keliglia.com>\n"
"Language-Team: Français <fr@li.org>\n"
@@ -6121,11 +6121,11 @@ msgstr "&Propriétés"
msgid "Open the properties dialog"
msgstr "Ouvrir la fenêtre des propriétés"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7216,19 +7216,23 @@ msgstr "Impossible de définir les paramètres (%1)."
msgid "Alsa device:"
msgstr "Périphérique Alsa :"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 niveau III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Codage audio avancé (AAC)"
@@ -9297,17 +9301,12 @@ msgstr "Rem&placer tous les espaces par :"
msgid "&2-pass encoding"
msgstr "&2 - encodage rapide"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Activer l'encodage en 2 passes"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9326,17 +9325,17 @@ msgstr ""
"constant et donc, de moins bonne qualité.\n"
"<p>L'encodage en 2 passes prend deux fois plus de temps."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Coupure automatique de la &vidéo"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Détecter automatiquement les bordures noires de la vidéo"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9357,22 +9356,17 @@ msgstr ""
"<p>De plus, cette méthode n'est pas très fiable et il peut y avoir des "
"problèmes si la vidéo source est très courte ou assez sombre."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Rééchantillonner l'audio à &44,1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Modifier l'échantillonage du flux audio en 44.1 KHz"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9387,7 +9381,7 @@ msgstr ""
"<p>Si cette option est activée, K3b modifiera l'échantillonage du flux audio "
"en 44100 Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Priorité &basse pour le processus d'encodage de la vidéo"
@@ -10067,6 +10061,9 @@ msgstr ""
"attendez que K3b le détecte. Il apparaîtra comme étant vote média de gravure."
"</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 niveau III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Tout enregistrer"
diff --git a/ga/Makefile.am b/ga/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/ga/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/ga/messages/Makefile.am b/ga/messages/Makefile.am
deleted file mode 100644
index 6c2ce5e..0000000
--- a/ga/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = ga
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/ga/messages/k3b.po b/ga/messages/k3b.po
index 5233378..19b8b50 100644
--- a/ga/messages/k3b.po
+++ b/ga/messages/k3b.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kdeextragear-1/k3b.po\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2004-12-03 14:52-0500\n"
"Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
"Language-Team: ga <LL@li.org>\n"
@@ -5415,11 +5415,11 @@ msgstr "&Airíonna"
msgid "Open the properties dialog"
msgstr ""
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6409,19 +6409,23 @@ msgstr "Níorbh fhéidir paraiméadair a shocrú (%1)."
msgid "Alsa device:"
msgstr "Gléas alsa:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media leagan 1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media leagan 2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Sraith III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr ""
@@ -8271,17 +8275,12 @@ msgstr ""
msgid "&2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8293,17 +8292,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8316,22 +8315,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr ""
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8341,7 +8335,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -8884,6 +8878,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Sraith III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Sábháil Uile"
@@ -8989,39 +8986,9 @@ msgstr ""
#~ msgid "(c) 1999 - 2006, Sebastian Trüg"
#~ msgstr "© 1999 - 2006, Sebastian Trüg"
-#~ msgid "Alt+O"
-#~ msgstr "Alt+O"
-
-#~ msgid "Alt+N"
-#~ msgstr "Alt+R"
-
-#~ msgid "Alt+K"
-#~ msgstr "Alt+S"
-
-#~ msgid "Alt+A"
-#~ msgstr "Alt+R"
-
-#~ msgid "Alt+C"
-#~ msgstr "Alt+C"
-
#~ msgid "Form1"
#~ msgstr "Foirm1"
-#~ msgid "Alt+Y"
-#~ msgstr "Alt+A"
-
-#~ msgid "Alt+D"
-#~ msgstr "Alt+D"
-
-#~ msgid "Alt+J"
-#~ msgstr "Alt+D"
-
-#~ msgid "Alt+U"
-#~ msgstr "Alt+M"
-
-#~ msgid "Alt+B"
-#~ msgstr "Alt+D"
-
#~ msgid "Load user default settings"
#~ msgstr "Luchtaigh réamhshocruithe an úsáideora"
@@ -9106,9 +9073,6 @@ msgstr ""
#~ msgid "writable DVD"
#~ msgstr "DVD inscríofa"
-#~ msgid "Alt+M"
-#~ msgstr "Alt+T"
-
#~ msgid "DVD-RW and DVD+RW"
#~ msgstr "DVD-RW agus DVD+RW"
@@ -9124,9 +9088,6 @@ msgstr ""
#~ msgid "K3b Defaults"
#~ msgstr "Réamhshocruithe K3b"
-#~ msgid "Alt+V"
-#~ msgstr "Alt+F"
-
#~ msgid "%A/%T/%a - %t"
#~ msgstr "%A/%T/%a - %t"
@@ -9387,9 +9348,6 @@ msgstr ""
#~ msgid "Empty %1 Media"
#~ msgstr "Meán Folamh %1"
-#~ msgid "Alt+Q"
-#~ msgstr "Alt+C"
-
#~ msgid "Mode"
#~ msgstr "Mód"
diff --git a/gl/Makefile.am b/gl/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/gl/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/gl/messages/Makefile.am b/gl/messages/Makefile.am
deleted file mode 100644
index 73c415d..0000000
--- a/gl/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = gl
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/gl/messages/k3b.po b/gl/messages/k3b.po
index 9c2a3f1..d2d0157 100644
--- a/gl/messages/k3b.po
+++ b/gl/messages/k3b.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2006-09-12 14:38+0200\n"
"Last-Translator: Xabi G. Feal <xabigf@gmx.net>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -6111,11 +6111,11 @@ msgstr "Propiedades do ficheiro"
msgid "Open the properties dialog"
msgstr "Abri-la fiestra de copia do CD"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7168,19 +7168,23 @@ msgstr "Non se puido comezar %1."
msgid "Alsa device:"
msgstr "Rescanea-los dispositivos"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "Opcións avantaxadas de Son/Vídeo"
@@ -9143,17 +9147,12 @@ msgstr "Remprazar tódolos espacios con:"
msgid "&2-pass encoding"
msgstr "Codificación dos datos:"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Codificación dos datos:"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9165,17 +9164,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Extracción do video CD"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Corta-los bordos negros da película"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9188,22 +9187,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, fuzzy, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Recomprimir a 44.1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9213,7 +9207,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
diff --git a/he/Makefile.am b/he/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/he/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/he/messages/Makefile.am b/he/messages/Makefile.am
deleted file mode 100644
index d03e342..0000000
--- a/he/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = he
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/he/messages/k3b.po b/he/messages/k3b.po
index 36e455d..d6a2d0a 100644
--- a/he/messages/k3b.po
+++ b/he/messages/k3b.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2005-09-01 22:40+0300\n"
"Last-Translator: Assaf Gillat\n"
"Language-Team: HEBREW <kde-il@yahoogroups.com>\n"
@@ -5727,11 +5727,11 @@ msgstr "&מאפיינים"
msgid "Open the properties dialog"
msgstr "פתח את תיבת הדו-שיח של המאפיינים"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6798,19 +6798,23 @@ msgstr "לא הייתה אפשרות להתחיל %1."
msgid "Alsa device:"
msgstr "סרוק את ההתקנים מחדש"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "קובץ מדיה של חלונות v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "קובץ מדיה של חלונות v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "הגדרות שמע/וידאו מתקדמות"
@@ -8721,17 +8725,12 @@ msgstr "החלף את כל הרווחים ב:"
msgid "&2-pass encoding"
msgstr "קידוד מהיר"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "קידוד מהיר"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8743,17 +8742,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "קריעת תקליטור וידאו"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "קצץ את הגבולות השחורים של הסרט."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8766,22 +8765,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, fuzzy, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "דגום ל- 44.1 קילו־הרץ"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8791,7 +8785,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9354,6 +9348,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "שמור הכל"
diff --git a/hi/Makefile.am b/hi/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/hi/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/hi/messages/Makefile.am b/hi/messages/Makefile.am
deleted file mode 100644
index 25098cd..0000000
--- a/hi/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = hi
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/hi/messages/k3b.po b/hi/messages/k3b.po
index d9746f5..c67d16a 100644
--- a/hi/messages/k3b.po
+++ b/hi/messages/k3b.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2005-01-20 18:49+0530\n"
"Last-Translator: Ravishankar Shrivastava <raviratlami@gmail.com>\n"
"Language-Team: indlinux-hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -5735,11 +5735,11 @@ msgstr "परियोजना (&P)"
msgid "Open the properties dialog"
msgstr "सीडी नक़ल संवाद खोलें"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6762,19 +6762,23 @@ msgstr "%1 चालू नहीं कर सका."
msgid "Alsa device:"
msgstr "उपकरणों को फिर से स्केन करें."
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "विंडोज़ मीडिया v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "विंडोज़ मीडिया v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "एमपीईजी 1 लेयर 3"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "उन्नत ऑडियो/वीडियो विन्यास"
@@ -8622,17 +8626,12 @@ msgstr "सभी खाली जगहों को इससे बदले
msgid "&2-pass encoding"
msgstr "एनकोडिंग प्रारंभ करें."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "एनकोडिंग प्रारंभ करें."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8644,17 +8643,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "वीडियो सीडी रिप किया जा रहा है"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "मूवी के काले किनारों को काटें"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8667,22 +8666,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, fuzzy, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "44.1 कि.हर्त्ज में री-सेंपल करें"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8692,7 +8686,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9234,6 +9228,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "एमपीईजी 1 लेयर 3"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "वीडियो ऐसे सहेजें"
diff --git a/hu/Makefile.am b/hu/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/hu/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/hu/messages/Makefile.am b/hu/messages/Makefile.am
deleted file mode 100644
index a60c4c4..0000000
--- a/hu/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = hu
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/hu/messages/k3b.po b/hu/messages/k3b.po
index a0430df..ea3179f 100644
--- a/hu/messages/k3b.po
+++ b/hu/messages/k3b.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-10-11 22:26+0200\n"
"Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
"Language-Team: \n"
@@ -6041,11 +6041,11 @@ msgstr "&Tulajdonságok"
msgid "Open the properties dialog"
msgstr "A tulajdonságok párbeszédablakának megnyitása"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7108,19 +7108,23 @@ msgstr "Nem sikerült beállítani a paramétereket (%1)."
msgid "Alsa device:"
msgstr "ALSA-eszköz:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Advanced Audio Coding (AAC)"
@@ -9183,17 +9187,12 @@ msgstr "A nevekben levő szóközök &helyettesítése ezzel:"
msgid "&2-pass encoding"
msgstr "Ké&tmenetes kódolás"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+T"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Két menetben való kódolás bekapcsolása"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9212,17 +9211,17 @@ msgstr ""
"készít, ami alacsonyabb minőséget eredményez.\n"
"<p>A kétmenetes kódolás kétszer annyi időt vesz igénybe mint az egymenetes."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Automatikus videoanyag-&vágás"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "A film fekete keretének automatikus észlelése"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9243,22 +9242,17 @@ msgstr ""
"<p>Ez a módszer eléggé megbízható, viszont problémát okozhat, ha a "
"forrásanyag rendkívül rövid vagy sötét."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "A hang újramintavételezése &44,1 kHz-re"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "A hangfolyam mintavételezési rátájának módosítása 44,1 kHz-re"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9272,7 +9266,7 @@ msgstr ""
"<p>Ha ez az opció be van jelölve, akkor a K3b 44100 Hz-esre módosítja a "
"hangfolyam mintavételi rátáját."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9954,6 +9948,9 @@ msgstr ""
"a K3b észreveszi azt - ezt követően az adathordozó meg fog jelenni írási "
"adathordozóként.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Az összes elmentése"
diff --git a/is/Makefile.am b/is/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/is/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/is/messages/Makefile.am b/is/messages/Makefile.am
deleted file mode 100644
index 97adbde..0000000
--- a/is/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = is
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/is/messages/k3b.po b/is/messages/k3b.po
index 342d801..2f28fab 100644
--- a/is/messages/k3b.po
+++ b/is/messages/k3b.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-03-20 13:28+0100\n"
"Last-Translator: Arnar Leósson <leosson@frisurf.no>\n"
"Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -5814,11 +5814,11 @@ msgstr "S&tillingar"
msgid "Open the properties dialog"
msgstr "Opna stillingargluggann"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6892,19 +6892,23 @@ msgstr "Gat ekki ræst %1."
msgid "Alsa device:"
msgstr "Endurskanna tæki"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "Nánari hljóð/vídeó stillingar"
@@ -8848,17 +8852,12 @@ msgstr "Skipta öllum eyðum út með:"
msgid "&2-pass encoding"
msgstr "hröð kóðun"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "hröð kóðun"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8870,17 +8869,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Afritun af vídeódisk"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Klippa burt svörtu ramma myndarinnar"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8893,22 +8892,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, fuzzy, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Endursafna í 44.1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8918,7 +8912,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9519,6 +9513,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Vista allt"
diff --git a/it/CMakeLists.txt b/it/CMakeLists.txt
deleted file mode 100644
index ba78952..0000000
--- a/it/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/it/Makefile.am b/it/Makefile.am
deleted file mode 100644
index ff7ab78..0000000
--- a/it/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages doc
diff --git a/it/doc/CMakeLists.txt b/it/doc/CMakeLists.txt
deleted file mode 100644
index 4b01c1b..0000000
--- a/it/doc/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
-
-tde_create_handbook(
- DESTINATION k3b
- LANG it
-)
diff --git a/it/doc/Makefile.am b/it/doc/Makefile.am
deleted file mode 100644
index 3e66a35..0000000
--- a/it/doc/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = it
-KDE_DOCS = k3b
diff --git a/it/doc/index.docbook b/it/doc/index.docbook
index 6a9392b..f14b79e 100644
--- a/it/doc/index.docbook
+++ b/it/doc/index.docbook
@@ -334,15 +334,3 @@ or the ChangeLog file, or ... -->
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/it/messages/Makefile.am b/it/messages/Makefile.am
deleted file mode 100644
index 0d5c097..0000000
--- a/it/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = it
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/it/messages/k3b.po b/it/messages/k3b.po
index f32cbb6..1a16cca 100644
--- a/it/messages/k3b.po
+++ b/it/messages/k3b.po
@@ -2,12 +2,13 @@
# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# Giovanni Venturi <jumpyj@tiscali.it>, 2002, 2003, 2004, 2005, 2006, 2007, 2008.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2019-05-27 23:15+0000\n"
-"Last-Translator: stefano <ifx@lazytux.it>\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
+"PO-Revision-Date: 2021-10-07 07:30+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/k3b/it/>\n"
"Language: it\n"
@@ -15,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.6.1\n"
+"X-Generator: Weblate 4.8.1\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
@@ -1499,7 +1500,7 @@ msgid ""
"_n: and %n session\n"
" and %n sessions"
msgstr ""
-" and %n sessione\n"
+"and %n sessione\n"
" and %n sessioni"
#: k3bmedium.cpp:374
@@ -1602,7 +1603,7 @@ msgid ""
"_n: 1 folder\n"
"%n folders"
msgstr ""
-" una cartella\n"
+"una cartella\n"
"%n cartelle"
#: k3bstatusbarmanager.cpp:196
@@ -4977,7 +4978,7 @@ msgid ""
"_n: 1 file (%1)\n"
"%n files (%1)"
msgstr ""
-"un file (%1)\n"
+"un file (%1)\n"
"%n file (%1)"
#: projects/k3bmovixburndialog.cpp:58 projects/k3bmovixdvdburndialog.cpp:60
@@ -6042,11 +6043,11 @@ msgstr "&Proprietà"
msgid "Open the properties dialog"
msgstr "Apri la finestra delle proprietà"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr "il modo cartella non è supportato per indirizzi esterni."
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr "KOffice archivio"
@@ -7117,19 +7118,23 @@ msgstr "Impossibile impostare i parametri (%1)."
msgid "Alsa device:"
msgstr "Dispositivo ALSA:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr "WavPack"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr "Monkey's Audio (APE)"
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Codifica Avanzata Audio (AAC)"
@@ -8089,7 +8094,7 @@ msgstr ""
"avranno esattamente gli stessi permessi dei file di origine. (Altrimenti "
"tutti i file avranno identici permessi e apparterranno all'amministratore: "
"'root').\n"
-"<p>Ciò è utilizzato principalmente per le copie di sicurezza.\n"
+"<p>Ciò è utilizzato principalmente per le copie di sicurezza."
"<p><b>Attenzione:</b> i permessi possono non aver molto senso su altri file "
"system. Per esempio, in presenza di un file su CD o DVD il cui utente "
"proprietario non esiste."
@@ -9190,17 +9195,12 @@ msgstr "Sostituisci tutti &gli spazi con:"
msgid "&2-pass encoding"
msgstr "codifica in &due passi"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Abilità la codifica in due passi"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9219,17 +9219,17 @@ msgstr ""
"costante e una qualità inferiore.\n"
"<p>La codifica a due passaggi impiegherà un tempo di codifica doppio."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Ritaglio automatico del &video"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Rileva automaticamente i bordi neri del video"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9250,22 +9250,17 @@ msgstr ""
"<p>Sebbene questo metodo è molto affidabile, possono presentarsi problemi se "
"il materiale originario è eccezionalmente breve o scuro."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Ricampiona l'audio a &44.1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Cambia il tasso di campionamento del flusso audio a 44.1 KHz"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9280,7 +9275,7 @@ msgstr ""
"<p>Se questa opzione è selezionata, K3b cambierà il tasso di campionamento "
"del flusso audio a 44100 Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9962,6 +9957,9 @@ msgstr ""
"basta inserirlo e aspettare che K3b lo rilevi. Apparirà quindi come supporto "
"da scrivere.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Salva tutto"
diff --git a/it/messages/k3bsetup.po b/it/messages/k3bsetup.po
index c43f047..836b8df 100644
--- a/it/messages/k3bsetup.po
+++ b/it/messages/k3bsetup.po
@@ -2,24 +2,21 @@
# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# Giovanni Venturi <jumpyj@tiscali.it>, 2002, 2003, 2004, 2005, 2006, 2007.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: k3bsetup\n"
"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2007-01-06 01:38+0100\n"
-"Last-Translator: Giovanni Venturi <jumpyj@tiscali.it>\n"
-"Language-Team: Italian <kde-i18n-it@kde.org>\n"
+"PO-Revision-Date: 2021-08-07 02:14+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/k3b-setup/it/>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"<kde-i18n-it@mail.kde.org>\n"
-"org>\n"
-"org>\n"
-"org>\n"
-"org>\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.7.2\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
@@ -150,7 +147,7 @@ msgstr ""
#: base_k3bsetup2.ui:69
#, no-c-format
msgid "burning"
-msgstr "burning"
+msgstr "scrittura in corso"
#: base_k3bsetup2.ui:104
#, no-c-format
@@ -175,7 +172,7 @@ msgstr "Dispositivo"
#: base_k3bsetup2.ui:152
#, no-c-format
msgid "Devicenode"
-msgstr "Devicenode"
+msgstr "Nodo del deispositivo"
#: base_k3bsetup2.ui:163 base_k3bsetup2.ui:294
#, no-c-format
diff --git a/it/messages/libk3b.po b/it/messages/libk3b.po
index 8f4ec48..de88ef3 100644
--- a/it/messages/libk3b.po
+++ b/it/messages/libk3b.po
@@ -2,12 +2,13 @@
# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# Giovanni Venturi <jumpyj@tiscali.it>, 2002, 2003, 2004, 2005, 2006, 2007.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: libk3b\n"
"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2019-05-27 23:15+0000\n"
-"Last-Translator: stefano <ifx@lazytux.it>\n"
+"PO-Revision-Date: 2020-11-10 05:59+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/k3b-lib/it/>\n"
"Language: it\n"
@@ -15,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.6.1\n"
+"X-Generator: Weblate 4.3.2\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
@@ -224,7 +225,7 @@ msgid ""
"_n: - %n Copy\n"
" - %n Copies"
msgstr ""
-" - %n Copia\n"
+"- %n Copia\n"
" - %n Copie"
#: jobs/k3bblankingjob.cpp:133
@@ -1518,7 +1519,7 @@ msgid ""
"_n: - %n copy\n"
" - %n copies"
msgstr ""
-" - %n copia\n"
+"- %n copia\n"
" - %n copie"
#: projects/audiocd/k3baudionormalizejob.cpp:58
diff --git a/ja/Makefile.am b/ja/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/ja/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/ja/messages/Makefile.am b/ja/messages/Makefile.am
deleted file mode 100644
index f18f0ca..0000000
--- a/ja/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = ja
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/ja/messages/k3b.po b/ja/messages/k3b.po
index 8a8a1b9..4486fc7 100644
--- a/ja/messages/k3b.po
+++ b/ja/messages/k3b.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-01-30 23:00+0900\n"
"Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
"Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -5780,11 +5780,11 @@ msgstr "プロパティ(&P)"
msgid "Open the properties dialog"
msgstr "CD をコピーするダイアログを開く"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6838,19 +6838,23 @@ msgstr "パラメータ (%1) を指定できません。"
msgid "Alsa device:"
msgstr "ALSA デバイス:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "AAC (Advanced Audio Coding)"
@@ -8882,17 +8886,12 @@ msgstr "すべての空白を以下で置き換える(&B):"
msgid "&2-pass encoding"
msgstr "&2 パスエンコード"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "2 パスエンコードを有効にする"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8911,17 +8910,17 @@ msgstr ""
"す。品質は劣ります。\n"
"<p>2 パスエンコードを使うとエンコードに二倍の時間がかかります。"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "自動クリッピング(&V)"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "動画の上下の黒い帯を自動的に検出して除去"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8941,22 +8940,17 @@ msgstr ""
"<p>この方法はほぼ確実に動作しますが、元の映像が異常に短い場合や暗い場合に問題"
"が発生する可能性があります。"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "オーディオを &44.1 kHz にリサンプルする"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "オーディオストリームのサンプルレートを 44.1 KHz に変更"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8971,7 +8965,7 @@ msgstr ""
"<p>このオプションを有効にすると、K3b はオーディオストリームのサンプリングレー"
"トを 44100 Hz に変更します。"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "ビデオトランスコードプロセスのスケジュール優先度を低くする(&C)"
@@ -9596,6 +9590,9 @@ msgstr ""
"するのを待ってください。そうすると、それが書き込みメディアとして現れます。</"
"p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
# ACCELERATOR added by translator
#, fuzzy
#~ msgid "Save As"
diff --git a/ka/Makefile.am b/ka/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/ka/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/ka/messages/Makefile.am b/ka/messages/Makefile.am
deleted file mode 100644
index 8d1a798..0000000
--- a/ka/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = ka
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/ka/messages/k3b.po b/ka/messages/k3b.po
index 07e95b4..6d3cafb 100644
--- a/ka/messages/k3b.po
+++ b/ka/messages/k3b.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2006-08-13 14:52+0400\n"
"Last-Translator: George Machitidze <giomac@gmail.com>\n"
"Language-Team: Georgian <guiasher@mes.gov.ge>\n"
@@ -6467,11 +6467,11 @@ msgstr "თ&ვისებები"
msgid "Open the properties dialog"
msgstr "თვისებების დიალოგის გახსნა"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7629,22 +7629,25 @@ msgstr "მინიჭება."
msgid "Alsa device:"
msgstr "მოწყობილობების თავიდან სკანირება"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
#, fuzzy
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
#, fuzzy
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-#, fuzzy
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr ""
@@ -9606,17 +9609,12 @@ msgstr "ყველა &სიცარიელის ჩანცვლებ
msgid "&2-pass encoding"
msgstr "&2-ფაზა კოდირება"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, fuzzy, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "&2-ფაზა კოდირება"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9628,17 +9626,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "ავტომატური ვიდეო"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "ფილმში შავი ჩარჩოების მოჭრა"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9651,22 +9649,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, fuzzy, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "აუდიო -სკენ"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
-#, fuzzy, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9676,7 +9669,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, fuzzy, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "დაბალი პრიორიტეტი -თვის"
@@ -10249,6 +10242,10 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
+#, fuzzy
#~ msgid "Save As"
#~ msgstr "ყველას შენახვა"
@@ -10406,50 +10403,10 @@ msgstr ""
#~ msgstr "(c) 1999 - 2006, Sebastian Trüg და K3b გუნდი"
#, fuzzy
-#~ msgid "Alt+O"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+N"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+K"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+A"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+C"
-#~ msgstr "Alt+2"
-
-#, fuzzy
#~ msgid "Form1"
#~ msgstr "ფორმატი"
#, fuzzy
-#~ msgid "Alt+Y"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+D"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+J"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+U"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+B"
-#~ msgstr "Alt+2"
-
-#, fuzzy
#~ msgid "Load user default settings"
#~ msgstr "მომხმარებლის ნაგულისხმევი პარამეტრების ჩატვირთვა"
@@ -10786,10 +10743,6 @@ msgstr ""
#~ msgstr "ორფენიანი DVD±R"
#, fuzzy
-#~ msgid "Alt+M"
-#~ msgstr "Alt+2"
-
-#, fuzzy
#~ msgid "DVD-RW and DVD+RW"
#~ msgstr "DVD- RW და DVD+RW"
@@ -10873,7 +10826,3 @@ msgstr ""
#~ "%1</b>."
#~ msgstr ""
#~ "<p>გთხოვთ მოითმინოთ სანამ K3b იღებს ინფორმაციას მედიის შესახებ <b>%1</b>."
-
-#, fuzzy
-#~ msgid "Alt+V"
-#~ msgstr "Alt+2"
diff --git a/km/Makefile.am b/km/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/km/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/km/messages/Makefile.am b/km/messages/Makefile.am
deleted file mode 100644
index 0e3229c..0000000
--- a/km/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = km
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/km/messages/k3b.po b/km/messages/k3b.po
index e3447c3..8db02a6 100644
--- a/km/messages/k3b.po
+++ b/km/messages/k3b.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-10-08 15:31+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <en@li.org>\n"
@@ -5784,11 +5784,11 @@ msgstr "លក្ខណៈ​សម្បត្តិ"
msgid "Open the properties dialog"
msgstr "បើក​ប្រអប់លក្ខណៈ​សម្បត្តិ​"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6821,19 +6821,23 @@ msgstr "មិន​អាច​កំណត់​ប៉ារ៉ាមែត្
msgid "Alsa device:"
msgstr "ឧបករណ៍ Alsa ៖"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "បង្អួច​មេឌៀ​កំណែ​ ១​"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "បង្អួចមេឌៀ​កំណែ ២​"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 ស្រទាប់ III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Advanced Audio Coding (AAC)"
@@ -8829,17 +8833,12 @@ msgstr "ជំនួស​អ្វីដែល​ទទេ​ទាំងអស
msgid "&2-pass encoding"
msgstr "ការ​អ៊ិនកូដ​ឆ្លង​ ២​"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "ជំនួស(Alt)+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "អនុញ្ញាត​ការ​អ៊ិនកូដ​ឆ្លង ២​"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8857,17 +8856,17 @@ msgstr ""
"ទាប​ជាង ។\n"
"<p>ការ​អ៊ិនកូដ​ ២ ដំណាក់កាល​មាន​លទ្ធផល​នៅ​ក្នុង​ការ​អ៊ិនកូដ​ទ្វេរ​ដង ។"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "ច្រឹប​វីដេអូ​ដោយ​ស្វ័យ​ប្រវត្តិ"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "រកឃើញ​ស៊ុម​ពណ៌​ខ្មៅ​របស់​វីដេអូ​ដោយ​ស្វ័យ​ប្រវត្តិ​"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8887,22 +8886,17 @@ msgstr ""
"<p>ទោះ​បី​ជា វិធីសាស្ត្រ​នេះ​ពិត​ជា​​អាច​ទុក​ចិត្ត​បាន អាច​បណ្ដាល​ឲ្យ​មានបញ្ហា​ ប្រសិន​បើ​សម្ភារៈ​ប្រភព​ខ្លី​ ឬ​"
"ងងឹត ។"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "អូឌីយ៉ូ​គំរូទៅ ៤៤.១ KHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "ជំនួស(Alt)+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "ផ្លាស់ប្ដូរ​អត្រា​គំរូ​របស់​ស្ទ្រីម​អូឌីយ៉ូ​ទៅ​ជា ៤៤.១ គីឡូហឺត"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8915,7 +8909,7 @@ msgstr ""
"បានអ៊ិនកូដ​ជា​មួយ​នឹង​អត្រា​គំរូ​ ៤៤១០០ ហឺត ។\n"
"<p>ប្រសិន​បើ​ជម្រើស​នេះ​បាន​ធីក K3b នឹង​ផ្លាស់ប្ដូរ​អត្រា​គំរូ​របស់​ស្ទ្រីម​អូឌីយ៉ូ ៤៤១០០ ហឺត ។"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "អាទិភាពការ​កំណត់​​ាង​ពេលវេលា​ទ​សម្រាប់​ដំណើរការ​បម្លែង​វីឌេអូាប"
@@ -9559,6 +9553,9 @@ msgstr ""
"ពិត​ប្រាកដ បញ្ចូល​វា​តាមធម្មតា ហើយ​រង់ចាំ​ K3b ឲ្យ​រក​វា ។ បន្ទាប់មក​វា​នឹង​បង្ហាញ​ជា​ឧបករណ៍​ដុត​របស់​អ្នក ។"
"</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 ស្រទាប់ III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "រក្សាទុក​ទាំងអស់​"
diff --git a/lt/Makefile.am b/lt/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/lt/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/lt/messages/Makefile.am b/lt/messages/Makefile.am
deleted file mode 100644
index 833d56d..0000000
--- a/lt/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = lt
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/lt/messages/k3b.po b/lt/messages/k3b.po
index 94df689..09b3f32 100644
--- a/lt/messages/k3b.po
+++ b/lt/messages/k3b.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-04-17 09:16+0300\n"
"Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
"Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -5724,11 +5724,11 @@ msgstr "&Savybės"
msgid "Open the properties dialog"
msgstr "Atverti parinkčių langą"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6799,19 +6799,23 @@ msgstr "Nepavyko nustatyti parametrų (%1)."
msgid "Alsa device:"
msgstr "Aptikti įrenginius"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "Sudėtingesnės audio/video parinktys"
@@ -8735,17 +8739,12 @@ msgstr "Visus tuščius simbolius pakeisti į:"
msgid "&2-pass encoding"
msgstr "greitas kodavimas"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "greitas kodavimas"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8757,17 +8756,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Automatiškai atpažinti video tipą."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Nukarpykite juodus vaizdo kraštus"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8780,22 +8779,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, fuzzy, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Pertvarkyti į 44.1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8805,7 +8799,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9377,6 +9371,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Įrašyti viską"
diff --git a/mk/Makefile.am b/mk/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/mk/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/mk/messages/Makefile.am b/mk/messages/Makefile.am
deleted file mode 100644
index 643a94e..0000000
--- a/mk/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = mk
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/mk/messages/k3b.po b/mk/messages/k3b.po
index 965f613..8b64d30 100644
--- a/mk/messages/k3b.po
+++ b/mk/messages/k3b.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2005-05-18 13:40+0200\n"
"Last-Translator: Bozidar Proevski <bobibobi@freemail.com.mk>\n"
"Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -5458,11 +5458,11 @@ msgstr ""
msgid "Open the properties dialog"
msgstr "Го отвора диалогот за копирање на CD"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6459,19 +6459,23 @@ msgstr ""
msgid "Alsa device:"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr ""
@@ -8308,17 +8312,12 @@ msgstr ""
msgid "&2-pass encoding"
msgstr "Податочен режим:"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Податочен режим:"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8330,17 +8329,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Рипување на видео CD"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8353,22 +8352,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr ""
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8378,7 +8372,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
diff --git a/ms/Makefile.am b/ms/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/ms/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/ms/messages/Makefile.am b/ms/messages/Makefile.am
deleted file mode 100644
index fc19612..0000000
--- a/ms/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = ms
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/ms/messages/k3b.po b/ms/messages/k3b.po
index 6bf900d..59b9e83 100644
--- a/ms/messages/k3b.po
+++ b/ms/messages/k3b.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2008-05-26 21:21+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
"Language-Team: Malay <kedidiemas@yahoogroups.com>\n"
@@ -5864,11 +5864,11 @@ msgstr "Ciri-ciri Dokumen"
msgid "Open the properties dialog"
msgstr "Test Dialog Tanya"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6923,22 +6923,25 @@ msgstr "Tak dapat membuka fail %s."
msgid "Alsa device:"
msgstr "Peranti alsa:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
#, fuzzy
msgid "Windows Media v1"
msgstr "Audio Windows Media"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
#, fuzzy
msgid "Windows Media v2"
msgstr "Audio Windows Media"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-#, fuzzy
-msgid "MPEG 1 Layer III"
-msgstr "Audio MPEG Lapisan 2"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "Pelihat audio/video ATI"
@@ -8810,17 +8813,12 @@ msgstr "Ganti teks dinyatakan dengan teks berlainan"
msgid "&2-pass encoding"
msgstr "Pilih Pengenkodan:"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Hidupkan p&etikan pintar"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8832,17 +8830,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Bunyi dan Video"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8855,22 +8853,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr ""
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8880,7 +8873,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9423,6 +9416,10 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "Audio MPEG Lapisan 2"
+
+#, fuzzy
#~ msgid "Save As"
#~ msgstr "Simpan Semua"
diff --git a/nb/Makefile.am b/nb/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/nb/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/nb/messages/Makefile.am b/nb/messages/Makefile.am
deleted file mode 100644
index 61136e8..0000000
--- a/nb/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = nb
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/nb/messages/k3b.po b/nb/messages/k3b.po
index a47de55..6906105 100644
--- a/nb/messages/k3b.po
+++ b/nb/messages/k3b.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-02-11 11:02+0100\n"
"Last-Translator: Alexander Nicolaysen Sørnes <alex@thehandofagony.com>\n"
"Language-Team: <nb@li.org>\n"
@@ -5825,11 +5825,11 @@ msgstr "Egenskaper"
msgid "Open the properties dialog"
msgstr "Åpner dialogen for egenskaper"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6903,19 +6903,23 @@ msgstr "Fikk ikke startet %1."
msgid "Alsa device:"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "Avanserte Lyd/Video innstillinger"
@@ -8858,17 +8862,12 @@ msgstr "Bytt ut alle mellomrom med:"
msgid "&2-pass encoding"
msgstr "Rask koding"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Rask koding"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8880,17 +8879,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Video CD ripping"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Kutt av sorte kanter av filmen"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8903,22 +8902,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, fuzzy, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Gjør om til 44,1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8928,7 +8922,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9553,6 +9547,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Lagre alle"
diff --git a/nds/Makefile.am b/nds/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/nds/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/nds/messages/Makefile.am b/nds/messages/Makefile.am
deleted file mode 100644
index 45ab185..0000000
--- a/nds/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = nds
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/nds/messages/k3b.po b/nds/messages/k3b.po
index c30315d..ecfe1c4 100644
--- a/nds/messages/k3b.po
+++ b/nds/messages/k3b.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-08-18 22:33+0200\n"
"Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
"Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -5976,11 +5976,11 @@ msgstr "Egenscha&ppen"
msgid "Open the properties dialog"
msgstr "Egenschappen-Dialoog wiesen"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7050,19 +7050,23 @@ msgstr "Parameters (%1) laat sik nich fastleggen."
msgid "Alsa device:"
msgstr "Alsa-Reedschap:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media Verschoon 1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media Verschoon 2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Verwiedert Audiokoderen (\"AAC\")"
@@ -9095,17 +9099,12 @@ msgstr "All &Freetekens utwesseln mit:"
msgid "&2-pass encoding"
msgstr "Koderen in &2 Schreed"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Koderen in 2 Schreed anmaken"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9124,17 +9123,17 @@ msgstr ""
"Gööd bi rut.\n"
"<p>Dat Koderen in twee Schreed duert dubbelt so lang."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Video automaatsch &tosnieden"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Automaatsch de swatten Randbalkens vun dat Video finnen"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9155,22 +9154,17 @@ msgstr ""
"<p>Op disse Metood is normalerwies redig Verlaat, man dat kann to Problemen "
"kamen, wenn dat Bornvideo bannig kort oder düüster is."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Audio-Aftastrate to &44.1 kHz ümwanneln"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "De Aftastrate vun den Audiostroom to 44,1 kHz ümwanneln"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9184,7 +9178,7 @@ msgstr ""
"bruukt warrt.\n"
"<p>Is dit anmaakt, ännert K3b de Aftastrate vun den Audiostroom op 44,1kHz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Siet &Prioriteet för't Ümkoderen vun't Video"
@@ -9852,6 +9846,9 @@ msgstr ""
"wullt, legg ehr eenfach rin un tööv, dat K3b ehr findt. Se warrt denn as "
"Dien Brennmedium opduken.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "All sekern"
diff --git a/ne/Makefile.am b/ne/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/ne/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/ne/messages/Makefile.am b/ne/messages/Makefile.am
deleted file mode 100644
index 48f7773..0000000
--- a/ne/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = ne
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/ne/messages/k3b.po b/ne/messages/k3b.po
index b6cc48c..467147f 100644
--- a/ne/messages/k3b.po
+++ b/ne/messages/k3b.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-04-03 16:29+0300\n"
"Last-Translator: shyam krishna bal <shyamkrishna_bal@yahoo.com>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -5913,11 +5913,11 @@ msgstr "गुण"
msgid "Open the properties dialog"
msgstr "गुण संवाद खोल्नुहोस्"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6986,19 +6986,23 @@ msgstr "परिमिति (%1) सेट गर्न सकेन ।"
msgid "Alsa device:"
msgstr "यन्त्रहरू पुन: स्क्यान गर्नुहोस्"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "विन्डोज मिडिया v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "विन्डोज मिडिया v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 तह III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "उन्नत अडियो/भिडियो सेटिङ"
@@ -8943,17 +8947,12 @@ msgstr "यससँग सबै खाली ठाउँ बदल्नु
msgid "&2-pass encoding"
msgstr "द्रुत सङ्केतन"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "द्रुत सङ्केतन"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8965,17 +8964,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "भिडियो सीडी रिपिङ"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "चलचित्रको कालो किनारा काट्नुहोस्"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8988,22 +8987,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, fuzzy, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "44.1 kHz मा पुन: नमूना गर्नुहोस्"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9013,7 +9007,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9639,6 +9633,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 तह III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "सबै बचत गर्नुहोस्"
diff --git a/nl/CMakeLists.txt b/nl/CMakeLists.txt
deleted file mode 100644
index ba78952..0000000
--- a/nl/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/nl/Makefile.am b/nl/Makefile.am
deleted file mode 100644
index ff7ab78..0000000
--- a/nl/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages doc
diff --git a/nl/doc/CMakeLists.txt b/nl/doc/CMakeLists.txt
deleted file mode 100644
index 3e1a39a..0000000
--- a/nl/doc/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
-
-tde_create_handbook(
- DESTINATION k3b
- LANG nl
-)
diff --git a/nl/doc/Makefile.am b/nl/doc/Makefile.am
deleted file mode 100644
index 191ef3c..0000000
--- a/nl/doc/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = nl
-KDE_DOCS = k3b
diff --git a/nl/doc/index.docbook b/nl/doc/index.docbook
index 618aa22..f5a7006 100644
--- a/nl/doc/index.docbook
+++ b/nl/doc/index.docbook
@@ -328,15 +328,3 @@ or the ChangeLog file, or ... -->
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/nl/messages/Makefile.am b/nl/messages/Makefile.am
deleted file mode 100644
index 69faf0b..0000000
--- a/nl/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = nl
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/nl/messages/k3b.po b/nl/messages/k3b.po
index c74d980..0a706d4 100644
--- a/nl/messages/k3b.po
+++ b/nl/messages/k3b.po
@@ -16,19 +16,21 @@
# Tom Albers <toma@kovoks.nl>, 2004.
# Bram Schoenmakers <bramschoenmakers@kde.nl>, 2004, 2006, 2007.
# Rinse de Vries <RinseDeVries@home.nl>, 2005, 2006.
+# Heimen Stoffels <vistausss@outlook.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2007-09-01 13:48+0200\n"
-"Last-Translator: Bram Schoenmakers <bramschoenmakers@kde.nl>\n"
-"Language-Team: Nederlands <kde-i18n-nl@kde.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
+"PO-Revision-Date: 2020-10-09 08:27+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"applications/k3b/nl/>\n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
@@ -3674,17 +3676,16 @@ msgstr ""
"geschreven wordt met cdrdao."
#: projects/k3baudioburndialog.cpp:301
-#, fuzzy
msgid ""
"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
"uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/"
"normalize/) to normalize audio tracks. In order to use this functionality, "
"please install it first. (sudo apt-get install normalize-audio)"
msgstr ""
-"<p><b>Het externe programma <em>normalize</em> is niet geïnstalleerd.</b> "
-"<p>K3b gebruikt <em>normalize</em> (http://www1.cs.columbia.edu/~cvaill/"
-"normalize/) voor het normaliseren van audiotracks. Om deze functionaliteit "
-"te kunnen gebruiken, installeer dit programma eerst."
+"<p><b>Het externe programma <em>normalize-audio</em> is niet geïnstalleerd.</"
+"b> <p>K3b gebruikt <em>normalize</em> (http://www1.cs.columbia.edu/~cvaill/"
+"normalize/) voor het normaliseren van audionummers. Installeer dit programma "
+"om deze functie te kunnen gebruiken. (sudo apt-get install normalize-audio)"
#: projects/k3baudioburndialog.cpp:308 projects/k3baudioburndialog.cpp:327
#: projects/k3bmixedburndialog.cpp:318 projects/k3bmixedburndialog.cpp:337
@@ -4967,17 +4968,16 @@ msgstr ""
"gegevenstrack proberen af te spelen."
#: projects/k3bmixedburndialog.cpp:311
-#, fuzzy
msgid ""
"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
"uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/"
"normalize/) to normalize audio tracks. In order to use this functionality, "
"please install it first (sudo apt-get install normalize-audio."
msgstr ""
-"<p><b>Het externe programma <em>normalize</em> is niet geïnstalleerd.</b> "
-"<p>K3b gebruikt <em>normalize</em> (http://www1.cs.columbia.edu/~cvaill/"
-"normalize/) voor het normaliseren van audiotracks. Om deze functionaliteit "
-"te kunnen gebruiken, installeer dit programma eerst."
+"<p><b>Het externe programma <em>normalize-audio</em> is niet geïnstalleerd.</"
+"b> <p>K3b gebruikt <em>normalize</em> (http://www1.cs.columbia.edu/~cvaill/"
+"normalize/) voor het normaliseren van audionummers. Installeer dit programma "
+"om deze functie te kunnen gebruiken. (sudo apt-get install normalize-audio)"
#: projects/k3bmixeddirtreeview.cpp:45
msgid "Audio Tracks"
@@ -6058,13 +6058,13 @@ msgstr "Eigenscha&ppen"
msgid "Open the properties dialog"
msgstr "Open de eigenschappendialoog"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
-msgstr ""
+msgstr "De mapmodus ondersteunt geen externe locaties."
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
-msgstr ""
+msgstr "KOffice-opslag"
#: rip/k3baudiocdlistview.cpp:36
msgid "Artist"
@@ -7144,19 +7144,23 @@ msgstr "Kon de parameters niet instellen (%1)."
msgid "Alsa device:"
msgstr "ALSA-apparaat:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Advanced Audio Coding (AAC)"
@@ -8257,7 +8261,7 @@ msgid "Preemph&asis"
msgstr "Preemph&asis"
#: projects/base_k3baudiotrackwidget.ui:207
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"<p>Preemphasis is mainly used in audio processing. Higher frequencies in "
"audio Q_SIGNALS usually have lower amplitudes. This can lead to bad signal "
@@ -8266,9 +8270,9 @@ msgid ""
"transmission (preemphasis); the receiver will then weaken them accordingly "
"for playback."
msgstr ""
-"Preemphasis wordt hoofdzakelijk gebruikt in geluidsverwerking. Hogere "
-"frequenties in geluidssignalen hebben meestal lagere versterkingen. Dit kan "
-"leiden tot slechte signaalkwaliteit ruisgevoelige uitzendingen, omdat de "
+"Preemphasis wordt hoofdzakelijk gebruikt bij geluidsverwerking. Hogere "
+"frequenties in geluidssignalen hebben meestal lagere versterkingen, wat kan "
+"leiden tot slechte signaalkwaliteit op ruisgevoelige uitzendingen, omdat de "
"hoge frequenties dan te zwak kunnen worden. Om dit effect te voorkomen "
"worden de hoge frequenties voor de uitzending versterkt (preemphasis); de "
"ontvanger zal ze voor het afspelen dan weer verzwakken."
@@ -9213,17 +9217,12 @@ msgstr "Alle &spaties vervangen door:"
msgid "&2-pass encoding"
msgstr "&2-pass codering"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "2-pass codering activeren"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9243,17 +9242,17 @@ msgstr ""
"constante bitsnelheid en een lagere kwaliteit maken.\n"
"<p>2-pass codering duurt 2 x zo lang."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Automatische &videoclipping"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Zwarte randen van de video automatisch detecteren"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9273,22 +9272,17 @@ msgstr ""
"<p>Alhoewel deze methode erg betrouwbaar is kunnen er mogelijk problemen "
"ontstaan als de video uitzonderlijk kort of donker is."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Geluid opnieuw samplen naar &44.1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Sample rate van audiostream veranderen in 44,1 Khz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9302,7 +9296,7 @@ msgstr ""
"<p>Als deze optie is ingeschakeld zal K3b de sample rate van de audiostream "
"veranderen in 44100 Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Lage s&cheduling-prioriteit voor het videohercodeerproces"
@@ -9974,6 +9968,9 @@ msgstr ""
"plaats deze in het station en wacht totdat K3b het heeft gevonden. Deze zal "
"dan als te branden schijf verschijnen.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Alles opslaan"
diff --git a/nl/messages/libk3b.po b/nl/messages/libk3b.po
index 83e1080..5a29376 100644
--- a/nl/messages/libk3b.po
+++ b/nl/messages/libk3b.po
@@ -5,19 +5,21 @@
# Rinse de Vries <rinsedevries@kde.nl>, 2004, 2005, 2006, 2007, 2008.
# Rinse de Vries <RinseDeVries@home.nl>, 2006.
# Bram Schoenmakers <bramschoenmakers@kde.nl>, 2006.
+# Heimen Stoffels <vistausss@outlook.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: libk3b\n"
"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2008-01-12 23:29+0100\n"
-"Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
-"Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
+"PO-Revision-Date: 2020-10-07 17:31+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"applications/k3b-lib/nl/>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
@@ -1519,14 +1521,12 @@ msgstr ""
" - %n kopieën"
#: projects/audiocd/k3baudionormalizejob.cpp:58
-#, fuzzy
msgid "Could not find normalize-audio executable."
-msgstr "Er is geen normaliseerprogramma gevonden."
+msgstr "normalise-audio is niet aangetroffen."
#: projects/audiocd/k3baudionormalizejob.cpp:86
-#, fuzzy
msgid "Could not start normalize-audio."
-msgstr "Normaliseren kon niet worden gestart."
+msgstr "normalise-audio kan niet worden gestart."
#: projects/audiocd/k3baudionormalizejob.cpp:126
msgid "Track %1 is already normalized."
diff --git a/nl/messages/libk3bdevice.po b/nl/messages/libk3bdevice.po
index 123ee17..be41e5e 100644
--- a/nl/messages/libk3bdevice.po
+++ b/nl/messages/libk3bdevice.po
@@ -4,31 +4,33 @@
#
# R.F. Pels <ruurd@tiscali.nl>, 2004.
# Rinse de Vries <rinsedevries@kde.nl>, 2004, 2005, 2006.
+# Heimen Stoffels <vistausss@outlook.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: libk3bdevice\n"
"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2006-10-09 00:09+0200\n"
-"Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
-"Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
+"PO-Revision-Date: 2020-10-07 17:31+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"applications/k3b-device/nl/>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.2.2\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
-msgstr ""
+msgstr "Heimen Stoffels"
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
-msgstr ""
+msgstr "vistausss@outlook.com"
#: k3bdeviceglobals.cpp:30 k3bdeviceglobals.cpp:153
msgid "CD-R"
@@ -144,7 +146,7 @@ msgstr "Layer Jump"
#: k3bdeviceglobals.cpp:98
msgid "Random Recording"
-msgstr "Random-opname"
+msgstr "Willekeurige opname"
#: k3bdeviceglobals.cpp:100
msgid "Sequential Recording"
diff --git a/nn/Makefile.am b/nn/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/nn/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/nn/messages/Makefile.am b/nn/messages/Makefile.am
deleted file mode 100644
index bc984b5..0000000
--- a/nn/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = nn
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/nn/messages/k3b.po b/nn/messages/k3b.po
index adcd8b3..3f4ef7d 100644
--- a/nn/messages/k3b.po
+++ b/nn/messages/k3b.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-08-14 18:48+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -5866,11 +5866,11 @@ msgstr "&Eigenskapar"
msgid "Open the properties dialog"
msgstr "Opna dialogen for eigenskapar"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6938,19 +6938,23 @@ msgstr "Klarte ikkje setje parameter (%1)."
msgid "Alsa device:"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "Avanserte lyd og videoinnstillingar"
@@ -8894,17 +8898,12 @@ msgstr "Byt ut alle mellomrom med:"
msgid "&2-pass encoding"
msgstr "rask koding"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "rask koding"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8916,17 +8915,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Ripping av Video-CD"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Skjer av dei svarte kantane til filmen"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8939,22 +8938,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, fuzzy, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Gjer om til 44,1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8964,7 +8958,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9600,6 +9594,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Lagre alle"
diff --git a/pa/Makefile.am b/pa/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/pa/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/pa/messages/Makefile.am b/pa/messages/Makefile.am
deleted file mode 100644
index 944337a..0000000
--- a/pa/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = pa
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/pa/messages/k3b.po b/pa/messages/k3b.po
index 1470702..ee12da7 100644
--- a/pa/messages/k3b.po
+++ b/pa/messages/k3b.po
@@ -12,7 +12,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-03-04 17:26+0530\n"
"Last-Translator: A S Alam <aalam@users.sf.net>\n"
"Language-Team: Punjabi <punjabi-l10n@users.sf.net>\n"
@@ -5520,11 +5520,11 @@ msgstr "ਵਿਸ਼ੇਸ਼ਤਾ(&P)"
msgid "Open the properties dialog"
msgstr "ਵਿਸ਼ੇਸ਼ਤਾ ਵਾਰਤਾਲਾਪ ਖੋਲ੍ਹੋ"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6511,19 +6511,23 @@ msgstr "ਮੁੱਲ (%1) ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕ
msgid "Alsa device:"
msgstr "ਅਲੀਸਾ ਜੰਤਰ:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "ਐਡਵਾਂਸ ਆਡੀਓ ਕੋਡਿੰਗ(AAC)"
@@ -8381,17 +8385,12 @@ msgstr "ਸਭ ਖਾਲੀ ਥਾਵਾਂ ਨੂੰ ਬਦਲੋ(&B):"
msgid "&2-pass encoding"
msgstr "&2-ਪਾਸ ਇਕੋਡਿੰਗ"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "2-ਪਾਸ ਇੰਕੋਡਿੰਗ ਯੋਗ"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8403,17 +8402,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "ਆਟੋਮੈਟਿਕ ਵੀਡਿਓ ਕਲਿੱਪਿੰਗ(&V)"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "ਵੀਡਿਓ ਦਾ ਕਾਲਾ ਬਾਡਰ ਆਟੋਮੈਟਿਕ ਖੋਜੋ"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8426,22 +8425,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "&44.1 kHz 'ਤੇ ਮੁੜ-ਸੈਂਪਲਿੰਗ ਆਡੀਓ"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8451,7 +8445,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9000,6 +8994,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "ਸਭ ਸੰਭਾਲੋ"
diff --git a/pl/CMakeLists.txt b/pl/CMakeLists.txt
deleted file mode 100644
index ba78952..0000000
--- a/pl/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/pl/Makefile.am b/pl/Makefile.am
deleted file mode 100644
index ff7ab78..0000000
--- a/pl/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages doc
diff --git a/pl/doc/CMakeLists.txt b/pl/doc/CMakeLists.txt
deleted file mode 100644
index 8a05c4e..0000000
--- a/pl/doc/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
-
-tde_create_handbook(
- DESTINATION k3b
- LANG pl
-)
diff --git a/pl/doc/Makefile.am b/pl/doc/Makefile.am
deleted file mode 100644
index 991a6a0..0000000
--- a/pl/doc/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = pl
-KDE_DOCS = k3b
diff --git a/pl/doc/index.docbook b/pl/doc/index.docbook
index c44b338..9e11d4e 100644
--- a/pl/doc/index.docbook
+++ b/pl/doc/index.docbook
@@ -302,15 +302,3 @@ or the ChangeLog file, or ... -->
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/pl/messages/Makefile.am b/pl/messages/Makefile.am
deleted file mode 100644
index 498aaef..0000000
--- a/pl/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = pl
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/pl/messages/k3b.po b/pl/messages/k3b.po
index 80066f3..68d95a6 100644
--- a/pl/messages/k3b.po
+++ b/pl/messages/k3b.po
@@ -10,20 +10,22 @@
# Robert Gomulka <rgom@o2.pl>, 2005.
# Krzysztof Lichota <krzysiek@lichota.net>, 2007.
# Marta Rybczyńska <kde-i18n@rybczynska.net>, 2008.
+# Marek W <coronzon88@gmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2015-03-11 13:55+0100\n"
-"Last-Translator: mcbx\n"
-"Language-Team: Polish <pl@li.org>\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
+"PO-Revision-Date: 2021-10-18 22:31+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/k3b/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n"
-"%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.8.1\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
@@ -343,7 +345,7 @@ msgstr "Zapisywanie pliku pod nową nazwą..."
#: projects/k3bmovixdvdburndialog.cpp:196
#: projects/k3bvideodvdburndialog.cpp:184
msgid "Do you want to overwrite %1?"
-msgstr "Czy chcesz zastąpić %1"
+msgstr "Czy chcesz zastąpić %1?"
#: k3b.cpp:944 k3bdebuggingoutputdialog.cpp:142 misc/k3bcdcopydialog.cpp:299
#: misc/k3bcdcopydialog.cpp:307 projects/k3bdataburndialog.cpp:185
@@ -433,7 +435,7 @@ msgstr "Czy na pewno chcesz wyczyścić aktualny projekt?"
#: k3b.cpp:1533
msgid "Clear Project"
-msgstr "Wyczyść projekt."
+msgstr "Wyczyść projekt"
#: k3b.cpp:1575
msgid "Audio CD Rip"
@@ -1665,7 +1667,7 @@ msgstr "Video DVD (%1)"
#: k3bsystemproblemdialog.cpp:87 k3bsystemproblemdialog.cpp:92
msgid "System Configuration Problems"
-msgstr "Problemy w konfiguracji systemu."
+msgstr "Problemy w konfiguracji systemu"
#: k3bsystemproblemdialog.cpp:93
#, c-format
@@ -1759,7 +1761,7 @@ msgstr ""
#: k3bsystemproblemdialog.cpp:276 k3bsystemproblemdialog.cpp:323
msgid "Install the dvd+rw-tools package."
-msgstr "Zainstaluj pakiet narzędziowy dla dvd+rw"
+msgstr "Zainstaluj pakiet narzędziowy dvd+rw-tools."
#: k3bsystemproblemdialog.cpp:283
msgid ""
@@ -1796,7 +1798,7 @@ msgstr ""
#: k3bsystemproblemdialog.cpp:322
msgid "K3b uses dvd+rw-format to format DVD-RWs and DVD+RWs."
-msgstr "K3b wykorzystuje format dvd+rw-do formatowania płyt DVD-RW i DVD+RW."
+msgstr "K3b wykorzystuje dvd+rw-format do formatowania płyt DVD-RW i DVD+RW."
#: k3bsystemproblemdialog.cpp:336
msgid ""
@@ -2039,7 +2041,7 @@ msgstr "Może to być wykonane za pomocą narzędzia K3bSetup."
#: k3bsystemproblemdialog.cpp:614
msgid "Unable to start K3bSetup2."
-msgstr "Nie można uruchomić K3bSetup2"
+msgstr "Nie można uruchomić K3bSetup2."
#: k3btempdirselectionwidget.cpp:57
msgid "Free space in temporary directory:"
@@ -3670,17 +3672,17 @@ msgstr ""
"tylko podczas nagrywania płyty w trybie DAO za pomocą programu cdrdao."
#: projects/k3baudioburndialog.cpp:301
-#, fuzzy
msgid ""
"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
"uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/"
"normalize/) to normalize audio tracks. In order to use this functionality, "
"please install it first. (sudo apt-get install normalize-audio)"
msgstr ""
-"<p><b>Zewnętrzny program <em>normalize</em> nie jest zainstalowany.</"
-"b><p>K3b używa programu <em>normalize</em> (http://www1.cs.columbia.edu/"
-"~cvaill/normalize/) do normalizacji ścieżek audio. Aby używać tej funkcji, "
-"proszę go najpierw zainstalować."
+"<p><b>Zewnętrzny program <em>normalize-audio</em> nie jest zainstalowany.</"
+"b><p>K3b używa programu <em>normalize-audio</em> (http://www1.cs.columbia."
+"edu/~cvaill/normalize/) do normalizacji ścieżek audio. Aby używać tej "
+"funkcji, proszę go najpierw zainstalować. (sudo apt-get install normalize-"
+"audio)"
#: projects/k3baudioburndialog.cpp:308 projects/k3baudioburndialog.cpp:327
#: projects/k3bmixedburndialog.cpp:318 projects/k3bmixedburndialog.cpp:337
@@ -4175,7 +4177,7 @@ msgid ""
msgstr ""
"Przeciągnij pliki i katalogi, aby dodać je do projektu.\n"
"Aby usunąć lub zmienić nazwę pliku użyj menu kontekstowego.\n"
-"Następnie naciśnij przycisk \"Nagraj\", aby nagrać CD"
+"Następnie naciśnij przycisk \"Nagraj\", aby nagrać CD."
#: projects/base_k3bbootimageview.ui:77 projects/k3bdatafileview.cpp:72
#: projects/k3bmovixlistview.cpp:176 rip/k3baudiocdlistview.cpp:39
@@ -4383,12 +4385,12 @@ msgstr "Rozpocznij płytę wielosesyjną"
#: projects/k3bdatamultisessioncombobox.cpp:79
msgid "Continue Multisession "
-msgstr "Kontynuuj płytę wielosesyjną"
+msgstr "Kontynuuj płytę wielosesyjną "
# KLFIXME
#: projects/k3bdatamultisessioncombobox.cpp:80
msgid "Finish Multisession "
-msgstr "Zakończ płytę wielosesyjną"
+msgstr "Zakończ płytę wielosesyjną "
#: projects/k3bdatapropertiesdialog.cpp:45
msgid "File Properties"
@@ -4962,17 +4964,16 @@ msgstr ""
"może spróbować odtwarzać ścieżkę z danymi."
#: projects/k3bmixedburndialog.cpp:311
-#, fuzzy
msgid ""
"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
"uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/"
"normalize/) to normalize audio tracks. In order to use this functionality, "
"please install it first (sudo apt-get install normalize-audio."
msgstr ""
-"<p><b>Zewnętrzny program <em>normalize</em> nie jest zainstalowany.</"
-"b><p>K3b używa programu <em>normalize</em> (http://www1.cs.columbia.edu/"
-"~cvaill/normalize/) do normalizacji ścieżek audio. Aby używać tej funkcji, "
-"proszę go najpierw zainstalować."
+"<p><b>Zewnętrzny program <em>normalize-audio</em> nie jest zainstalowany.</"
+"b><p>K3b używa programu <em>normalize-audio</em> (http://www1.cs.columbia."
+"edu/~cvaill/normalize/) do normalizacji ścieżek audio. Aby używać tej "
+"funkcji, proszę go najpierw zainstalować."
#: projects/k3bmixeddirtreeview.cpp:45
msgid "Audio Tracks"
@@ -5183,7 +5184,7 @@ msgstr "Zawsze dodawaj pusty katalog `/SEGMENT'"
#: projects/k3bvcdburndialog.cpp:133
msgid "This controls whether APS constraints are strict or relaxed. "
-msgstr "Określa, czy ograniczenia APS mają być ścisłe, czy luźne."
+msgstr "Określa, czy ograniczenia APS mają być ścisłe, czy luźne. "
#: projects/k3bvcdburndialog.cpp:135
msgid ""
@@ -5284,7 +5285,7 @@ msgstr ""
"opublikowana została specyfikacja ulepszonego standardu <b>Video CD 2.0</b> ."
"<p>Ta specyfikacja dodała następujące cechy do tych dostępnych w "
"specyfikacji Video CD 1.1:<ul><li>Dodana została możliwość korzystania z "
-"segmentów odtwarzania MPEG (segment play items - <b>\"SPI\"</b>), "
+"segmentów odtwarzania MPEG (segment play items - <b>\"SPI\"</b>), "
"składających się ze zdjęć, filmów i/lub strumieni zawierających wyłącznie "
"dźwięk.</li><li>Segmenty z uwagami::.</li><li>Dodana została interaktywna "
"kontrola odtwarzania (playback control - <b>\"PBC\"</b>).</li><li>Dodana "
@@ -5330,8 +5331,8 @@ msgstr ""
"ogłoszono specyfikację standardu Super Video CD.<p>W połowie roku 2000 "
"podzbiór specyfikacji <b>Super Video CD</b> został opublikowany jako "
"<b>IEC-62107</b>.<p>Najbardziej zauważalną zmianą w stosunku do Video CD 2.0 "
-"jest przejście z kodowania wideo MPEG-1 ze stałą szybkością transmisji "
-"(CBR)na kodowanie MPEG-2 ze zmienną szybkością transmisji (VBR). <p>Nowymi "
+"jest przejście z kodowania wideo MPEG-1 ze stałą szybkością transmisji (CBR) "
+"na kodowanie MPEG-2 ze zmienną szybkością transmisji (VBR). <p>Nowymi "
"cechami w stosunku do specyfikacji Video CD 2.0 są:<ul><li>Użycie do "
"strumienia wideo kodowania MPEG-2 zamiast MPEG-1.</li><li>Umożliwienie "
"użycia kodowania ze zmienną szybkością transmisji dla strumieni audio MPEG-1."
@@ -5758,7 +5759,7 @@ msgstr "%1 bitów/s"
#: projects/k3bvcdtrackdialog.cpp:202
msgid "May also look like | << on the remote control. "
-msgstr "Na pilocie może również wyglądać jak |<<."
+msgstr "Na pilocie może również wyglądać jak |<<. "
#: projects/k3bvcdtrackdialog.cpp:204
msgid "May also look like >> | on the remote control."
@@ -6060,13 +6061,13 @@ msgstr "&Właściwości"
msgid "Open the properties dialog"
msgstr "Otwiera okno właściwości"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
-msgstr ""
+msgstr "Tryb katalogów nie wspiera położeń zdalnych."
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
-msgstr ""
+msgstr "Magazyn KOffice"
#: rip/k3baudiocdlistview.cpp:36
msgid "Artist"
@@ -6146,7 +6147,7 @@ msgstr "Proszę wybrać ścieżki do zgrania z płyty."
#: rip/k3baudiocdview.cpp:319 rip/k3bvideocdview.cpp:409
msgid "No Tracks Selected"
-msgstr "Nie wybrano żadnej ścieżki."
+msgstr "Nie wybrano żadnej ścieżki"
#: rip/k3baudiocdview.cpp:338
#, c-format
@@ -6163,7 +6164,7 @@ msgstr "Wykonawca:"
#: rip/k3baudiocdview.cpp:357 rip/k3baudiocdview.cpp:407
msgid "Extra info:"
-msgstr "Dodatkowe informacje"
+msgstr "Dodatkowe informacje:"
#: rip/k3baudiocdview.cpp:376
msgid "Album Cddb"
@@ -6201,7 +6202,7 @@ msgstr "Błąd CDDB"
#: rip/k3baudiocdview.cpp:482
msgid "Please set the category before saving."
-msgstr "Proszę ustawić kategorię przed zapisem"
+msgstr "Proszę ustawić kategorię przed zapisem."
#: rip/k3baudiocdview.cpp:487
msgid "Please set CD artist and title before saving."
@@ -6621,7 +6622,7 @@ msgstr "Pliki zgrane pomyślnie."
#: rip/k3bvideocdrip.cpp:272
msgid "%1 returned an unknown error (code %2)."
-msgstr "%1 zwrócił nieznany błąd! (kod błędu %2)"
+msgstr "%1 zwrócił nieznany błąd! (kod błędu %2)."
#: rip/k3bvideocdrip.cpp:273
msgid "Please send me an email with the last output..."
@@ -7151,19 +7152,23 @@ msgstr "Nie można ustawić parametrów (%1)."
msgid "Alsa device:"
msgstr "Urządzenie Alsa:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 warstwa III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr "WavPack"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr "Monkey's Audio (APE)"
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Advanced Audio Coding (AAC)"
@@ -7845,7 +7850,7 @@ msgstr "&Ukryj okno główne programu podczas nagrywania"
#, no-c-format
msgid "Hide the main window while displaying the progress window"
msgstr ""
-"Ukrywa okno główne programu, gdy wyświetlany jest postęp procesu nagrywania."
+"Ukrywa okno główne programu gdy wyświetlany jest postęp procesu nagrywania"
#: option/base_k3bmiscoptiontab.ui:159
#, no-c-format
@@ -8092,10 +8097,10 @@ msgid ""
"<p>The UDF (<em><b>U</b>niversal <b>D</b>isk <b>F</b>ormat</em>) is mainly "
"used for DVDs."
msgstr ""
-"<p>Jeśli ta opcja jest włączona, K3b utworzy struktury systemu plików Udf "
+"<p>Jeśli ta opcja jest włączona, K3b utworzy struktury systemu plików UDF "
"oprócz struktur systemu plików ISO9660.\n"
-"<p>Udf (<em><b>U</b>niversal <b>D</b>isk <b>F</b>ormat</em> - \n"
-"Uniwersalny Format Płyty) jest używany głównie dla płyt DVD."
+"<p>UDF (<em><b>U</b>niversal <b>D</b>isk <b>F</b>ormat</em> - Uniwersalny "
+"Format Płyty) jest używany głównie dla płyt DVD."
#: projects/base_k3badvanceddataimagesettings.ui:124
#, no-c-format
@@ -8124,9 +8129,9 @@ msgid ""
msgstr ""
"<p>Jeśli ta opcja jest zaznaczona, wszystkie pliki w tworzonym systemie "
"plików będą miały dokładnie takie same uprawnienia jak pliki oryginalne. (W "
-"przeciwnym wypadku wszystkie pliki będą miały jednakowe uprawnienia i ich "
+"przeciwnym wypadku wszystkie pliki będą miały jednakowe uprawnienia i ich "
"właścicielem będzie administrator).\n"
-"<p>Ta opcja jest użyteczna głownie do tworzenia kopii zapasowych.\n"
+"<p>Ta opcja jest użyteczna głownie do tworzenia kopii zapasowych. "
"<p><b>Uwaga:</b>Te uprawnienia mogą nie mieć zbyt wielkiego sensu na innych "
"komputerach. Na przykład, jeśli użytkownik, który jest właścicielem pliku na "
"płycie, na tym komputerze nie istnieje."
@@ -8233,10 +8238,10 @@ msgstr ""
"<p>CD-Text to rozszerzenie standardu CD audio wprowadzone przez Sony.\n"
"<p>CD-Text jest użyteczny tylko na odtwarzaczach CD, które obsługują to "
"rozszerzenie (przeważnie są to odtwarzacze samochodowe) i w programach, "
-"takich jak K3b, oczywiście. <p>Ponieważ płyta CD z CD-Text będzie działać w "
-"każdym odtwarzaczu CD, nawet jeśli nie obsługuje on CD-Text, nie zaszkodzi "
-"włączyć tę opcję (należy tylko pamiętać wpisać odpowiednie informacje o "
-"płycie)."
+"takich jak K3b, oczywiście.\n"
+"<p>Ponieważ płyta CD z CD-Text będzie działać w każdym odtwarzaczu CD, nawet "
+"jeśli nie obsługuje on CD-Text, nie zaszkodzi włączyć tę opcję (należy tylko "
+"pamiętać wpisać odpowiednie informacje o płycie)."
#: projects/base_k3baudiocdtextwidget.ui:65
#, no-c-format
@@ -8274,7 +8279,7 @@ msgid "Preemph&asis"
msgstr "Preem&faza"
#: projects/base_k3baudiotrackwidget.ui:207
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"<p>Preemphasis is mainly used in audio processing. Higher frequencies in "
"audio Q_SIGNALS usually have lower amplitudes. This can lead to bad signal "
@@ -8283,8 +8288,8 @@ msgid ""
"transmission (preemphasis); the receiver will then weaken them accordingly "
"for playback."
msgstr ""
-"<p>Preemfaza jest stosowana głównie przy przetwarzaniu dźwięku.Wyższe "
-"częstotliwości w sygnale dźwiękowym mają zwykle niższe amplitudy.Może to "
+"<p>Preemfaza jest stosowana głównie przy przetwarzaniu dźwięku. Wyższe "
+"częstotliwości w sygnale dźwiękowym mają zwykle niższe amplitudy. Może to "
"prowadzić do złej jakości sygnału, jeśli występują zakłócenia w czasie "
"transmisji, ponieważ wyższe częstotliwości mogą zostać osłabione. Aby "
"uniknąć tego efektu, wyższe częstotliwości są wzmacniane przed transmisją "
@@ -8373,7 +8378,7 @@ msgstr "Dyskie&tka"
#: projects/base_k3bbootimageview.ui:126
#, no-c-format
msgid "Emulate a 1440/2880 kb floppy"
-msgstr "Emuluj dyskietkę 1440/2880 KB "
+msgstr "Emuluj dyskietkę 1440/2880 KB"
#: projects/base_k3bbootimageview.ui:137
#, no-c-format
@@ -8741,7 +8746,7 @@ msgstr ""
#: projects/base_k3bmovixoptionswidget.ui:99
#, no-c-format
msgid "MPlayer options you want to be sure MPlayer will not use"
-msgstr "Opcje, które chcesz, żeby MPlayer na pewno nie używał."
+msgstr "Opcje, które chcesz, żeby MPlayer na pewno nie używał"
#: projects/base_k3bmovixoptionswidget.ui:102
#, no-c-format
@@ -9026,9 +9031,10 @@ msgid ""
msgstr ""
"<p>Jeśli ta opcja jest włączona, pliki na liście odtwarzania będą zawierały "
"ścieżki względem położenia pliku listy.\n"
-"<p>Przykład: Jeśli lista odtwarzania znajduje się w katalogu\n"
-"<em>/home/ja/muzyka</em>, a pliki audio znajdują się w \n"
-"katalogu <em>/home/ja/muzyka/fajne</em>; to pliki na liście\n"
+"<p>Przykład: Jeśli lista odtwarzania znajduje się w katalogu <em>/home/ja/"
+"muzyka</em>, a pliki \n"
+"audio znajdują się w katalogu <em>/home/ja/muzyka/fajne</em>; to pliki na "
+"liście\n"
"odtwarzania będą zapisane tak: <em>fajne/utwór1.ogg</em>."
#: rip/base_k3baudiorippingoptionwidget.ui:136
@@ -9053,8 +9059,8 @@ msgstr ""
"<p>Jeśli ta opcja jest zaznaczona, K3b utworzy tylko jeden plik audio,\n"
"niezależnie od tego, ile utworów zostało zgranych. Ten plik będzie\n"
"zawierał wszystkie utwory, jeden po drugim.\n"
-"<p>Ta opcja może być przydatna przy zgrywaniu albumu \"na żywo\"\n"
-"lub audycji radiowych.\n"
+"<p>Ta opcja może być przydatna przy zgrywaniu albumu \"na żywo\" lub audycji "
+"radiowych.\n"
"<p><b>Uwaga:</b> Plik będzie miał nazwę taką jak pierwszy utwór."
#: rip/base_k3baudiorippingoptionwidget.ui:182
@@ -9229,17 +9235,12 @@ msgstr "Zastąp wszystkie &spacje przez:"
msgid "&2-pass encoding"
msgstr "Kodowanie &dwuprzebiegowe"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Włącza kodowanie dwuprzebiegowe"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9258,17 +9259,17 @@ msgstr ""
"szybkości transmisji i gorszej jakości.\n"
"<p>Kodowanie dwuprzebiegowe zajmuje 2 razy więcej czasu."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Automatyczne przycinanie &obrazu"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Automatycznie wykrywa czarne obramowanie obrazu"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9289,22 +9290,17 @@ msgstr ""
"<p>Chociaż ta metoda jest całkiem niezawodna, mogą pojawić się problemy, "
"jeśli źródłowy film jest bardzo krótki albo bardzo ciemny."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Prze&koduj dźwięk na 44.1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Zmienia częstotliwość próbkowania strumienia dźwiękowego na 44.1 KHz"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9319,7 +9315,7 @@ msgstr ""
"<p>Jeśli ta opcja jest włączona, K3b zmieni częstotliwość próbkowania "
"strumienia dźwiękowego na 44100 Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "&Niski priorytet dla procesu kodowania wideo"
@@ -9534,7 +9530,7 @@ msgid ""
msgstr ""
"<p>Szybkość transmisji ma oczywiście największy wpływ na jakość. Im wyższa "
"szybkość transmisji, tym lepsza jakość. Ale dla danej szybkości transmisji "
-"można wybrać różne algorytmy określania najlepszych współczynników i "
+"można wybrać różne algorytmy określania najlepszych współczynników i "
"kodowania Huffmana (kształtowanie szumu).\n"
"<p>Jakość wzrasta od 0 do 9, w tym samym szybkość kodowania spada.\n"
"<p>9 oznacza najwolniejszy i najlepszy algorytm.\n"
@@ -9851,7 +9847,7 @@ msgstr ""
"jakość dźwięku nie jest bardzo ważna. Po rozkompresowaniu ma rozdzielczość "
"odpowiadającą mniej więcej 16-bitowemu dźwiękowi PCM. Do popularnych wersji "
"ADPCM należą G.726, MS ADPCM, i IMA ADPCM. Znaczenie tego kodowania jest "
-"różne dla różnych plików. W plikach .wav oznacza MS ADPCM, we wszystkich "
+"różne dla różnych plików. W plikach .wav oznacza MS ADPCM, we wszystkich "
"innych G.726 ADPCM. <br> <b>IMA ADPCM</b> to specyficzny rodzaj kompresji "
"ADPCM, odrobinę prostszy i o trochę niższej jakości niż odmiana ADPCM firmy "
"Microsoft. IMA ADPCM jest również nazywane DVI ADPCM.<br> <b>GSM</b> to "
@@ -9927,7 +9923,6 @@ msgstr ""
"co oznaczają. K3b jest w stanie sam wybrać najlepsze ustawienia.</p>\n"
#: tips:17
-#, fuzzy
msgid ""
"<p>...that K3b has two types of settings. On the one hand K3b has settings "
"like most\n"
@@ -9943,17 +9938,20 @@ msgid ""
"settings you chose\n"
"are appropriate.</p>\n"
msgstr ""
-"<p>... że K3b ma dwa rodzaje ustawień. Z jednej strony K3b ma, tak jak\n"
-"większość programów TDE, ustawienia dostępne poprzez okienko konfiguracji\n"
-"otwierane przez menu \"Ustawienia\". Z drugiej strony każde okienko służące\n"
-"do wykonania czynności ma przyciski do wczytania i zapisania domyślnych\n"
-"ustawień dla tej czynności. W ten sposób można na przykład zapisać\n"
-"domyślne ustawienia dla kopiowania płyt CD.\n"
-"Te domyślne ustawienia zostaną wczytane za każdym razem, gdy\n"
-"otwierane jest okienko kopiowania płyt CD. Naciśnięcie przycisku\n"
-"<em>Domyślne ustawienia K3b</em> powoduje przywrócenie\n"
-"<em>ustawień fabrycznych</em> w przypadku, jeśli nie wiesz, czy wybrane\n"
-"ustawienia są odpowiednie.</p>\n"
+"<p>... że K3b ma dwa rodzaje ustawień. Z jednej strony K3b ma, tak jak "
+"większość \n"
+"programów TDE, ustawienia dostępne poprzez okienko konfiguracji otwierane \n"
+"przez menu \"Ustawienia\". Z drugiej strony każde okienko służące do "
+"wykonania \n"
+"czynności ma przyciski do wczytania i zapisania domyślnych ustawień dla "
+"tej \n"
+"czynności. W ten sposób można na przykład zapisać domyślne ustawienia dla \n"
+"kopiowania płyt CD. Te domyślne ustawienia zostaną wczytane za każdym razem, "
+"gdy\n"
+"otwierane jest okienko kopiowania płyt CD. Naciśnięcie przycisku "
+"<em>Domyślne \n"
+"ustawienia K3b</em> powoduje przywrócenie <em>ustawień fabrycznych</em> w \n"
+"przypadku, jeśli nie wiesz, czy wybrane ustawienia są odpowiednie.</p>\n"
#: tips:29
msgid ""
@@ -9995,6 +9993,9 @@ msgstr ""
"jeśli chcesz nagrać określony typ płyty, po prostu włóż ją i poczekaj aż K3b "
"ją wykryje. Pojawi się wówczas jako płyta do nagrania.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 warstwa III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Zapisz wszystkie"
diff --git a/pt/CMakeLists.txt b/pt/CMakeLists.txt
deleted file mode 100644
index ba78952..0000000
--- a/pt/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/pt/Makefile.am b/pt/Makefile.am
deleted file mode 100644
index ff7ab78..0000000
--- a/pt/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages doc
diff --git a/pt/doc/CMakeLists.txt b/pt/doc/CMakeLists.txt
deleted file mode 100644
index 91d4ee2..0000000
--- a/pt/doc/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
-
-tde_create_handbook(
- DESTINATION k3b
- LANG pt
-)
diff --git a/pt/doc/Makefile.am b/pt/doc/Makefile.am
deleted file mode 100644
index eafc775..0000000
--- a/pt/doc/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = pt
-KDE_DOCS = k3b
diff --git a/pt/doc/index.docbook b/pt/doc/index.docbook
index f295c69..ef251fc 100644
--- a/pt/doc/index.docbook
+++ b/pt/doc/index.docbook
@@ -317,15 +317,3 @@ or the ChangeLog file, or ... -->
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/pt/messages/Makefile.am b/pt/messages/Makefile.am
deleted file mode 100644
index fd3494d..0000000
--- a/pt/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = pt
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/pt/messages/k3b.po b/pt/messages/k3b.po
index e300418..3581feb 100644
--- a/pt/messages/k3b.po
+++ b/pt/messages/k3b.po
@@ -1,8 +1,9 @@
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2020-01-05 17:07+0000\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
+"PO-Revision-Date: 2021-11-26 20:00+0000\n"
"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/k3b/pt/>\n"
@@ -11,8 +12,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.10\n"
-"X-POFile-IgnoreConsistency: Alt+Y\n"
+"X-Generator: Weblate 4.9.1\n"
"X-POFile-SpellExtra: Extriar videodvd Plus Id usr\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
@@ -6045,11 +6045,11 @@ msgstr "&Propriedades"
msgid "Open the properties dialog"
msgstr "Abre a janela de propriedades"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr "O modo diretório não é suportado para locais remotos."
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr "Armazenamento KOffice"
@@ -7129,19 +7129,23 @@ msgstr "Não foi possível iniciar o '%1'."
msgid "Alsa device:"
msgstr "Dispositivo ALSA:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr "WavPack"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr "Monkey's Audio (APE)"
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Codificação Avançada de Áudio (AAC)"
@@ -9206,17 +9210,12 @@ msgstr "Substituir todos os caracteres em &branco por:"
msgid "&2-pass encoding"
msgstr "Codificação em &2 passos"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Activar a codificação em 2 passos"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9235,17 +9234,17 @@ msgstr ""
"com uma taxa constante e uma qualidade menor.\n"
"<p>A codificação em 2 passos resulta num tempo de codificação duplicado."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Recorte Automático do &Vídeo"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Detectar automaticamente os contornos pretos do vídeo"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9266,22 +9265,17 @@ msgstr ""
"<p>Ainda que este método seja bastante fiável, poderão ocorrer problemas se "
"o material de origem for excepcionalmente curto ou escuro."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Amostrar o Áudio de Novo a &44,1 kHZ"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Mudar a taxa de amostragem da sequência de áudio para 44,1 kHz"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9296,7 +9290,7 @@ msgstr ""
"<p>Se esta opção estiver assinalada, o K3b irá mudar a taxa de amostragem da "
"sequência de áudio para 44100 Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9978,6 +9972,9 @@ msgstr ""
"basta inseri-lo e esperar que o K3b o detecte. Irá então aparecer como o seu "
"suporte de gravação.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Gravar Tudo"
diff --git a/pt_BR/CMakeLists.txt b/pt_BR/CMakeLists.txt
deleted file mode 100644
index ba78952..0000000
--- a/pt_BR/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/pt_BR/Makefile.am b/pt_BR/Makefile.am
deleted file mode 100644
index ff7ab78..0000000
--- a/pt_BR/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages doc
diff --git a/pt_BR/doc/CMakeLists.txt b/pt_BR/doc/CMakeLists.txt
deleted file mode 100644
index 71d8b73..0000000
--- a/pt_BR/doc/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
-
-tde_create_handbook(
- DESTINATION k3b
- LANG pt_BR
-)
diff --git a/pt_BR/doc/Makefile.am b/pt_BR/doc/Makefile.am
deleted file mode 100644
index 4eb065b..0000000
--- a/pt_BR/doc/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = pt_BR
-KDE_DOCS = k3b
diff --git a/pt_BR/doc/index.docbook b/pt_BR/doc/index.docbook
index 3fcfde0..6588170 100644
--- a/pt_BR/doc/index.docbook
+++ b/pt_BR/doc/index.docbook
@@ -296,15 +296,3 @@ or the ChangeLog file, or ... -->
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/pt_BR/messages/Makefile.am b/pt_BR/messages/Makefile.am
deleted file mode 100644
index 2046214..0000000
--- a/pt_BR/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = pt_BR
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/pt_BR/messages/k3b.po b/pt_BR/messages/k3b.po
index 2eaf201..1df6847 100644
--- a/pt_BR/messages/k3b.po
+++ b/pt_BR/messages/k3b.po
@@ -13,7 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-07-25 11:14-0300\n"
"Last-Translator: doutor.zero <doutor.zero@gmail.com>\n"
"Language-Team: Português do Brasil <pt@li.org>\n"
@@ -6065,11 +6065,11 @@ msgstr "&Propriedades"
msgid "Open the properties dialog"
msgstr "Abrir o diálogo de propriedades"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7149,19 +7149,23 @@ msgstr "Não foi possível definir os parâmetros (%1)."
msgid "Alsa device:"
msgstr "Dispositivo alsa:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Codificação de Áudio Avançada (AAC)"
@@ -9229,17 +9233,12 @@ msgstr "Substituir todos os &espaços por:"
msgid "&2-pass encoding"
msgstr "Codificação em &Duas Passagens"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Habilitar codificação em Duas Passagens"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9260,17 +9259,17 @@ msgstr ""
"<p>A codificação em Duas Passagens resulta em um tempo de codificação duas "
"vezes maior."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Corte Automático do &Vìdeo"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Detectar automaticamente as bordas pretas do vídeo"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9291,22 +9290,17 @@ msgstr ""
"<p>Mesmo que esse método seja bastante confiável, podem acontecer problemas "
"se a fonte de origem for excepcionalmente curta ou escura."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Reamostrar Áudio para &44.1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Mudar a taxa de amostragem do fluxo de áudio para 44.1 KHz"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9321,7 +9315,7 @@ msgstr ""
"<p>Se esta opção estiver selecionada, o K3b mudará a taxa de amostragem do "
"fluxo de áudio para 44100 Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Baixa prioridade de &execução para o processo de conversão do vídeo"
@@ -10004,6 +9998,9 @@ msgstr ""
"detectá-la. Ela aparecerá então como\n"
"sua mídia para queima.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Salvar Todos"
diff --git a/pt_BR/messages/libk3b.po b/pt_BR/messages/libk3b.po
index ca68e36..da24d7a 100644
--- a/pt_BR/messages/libk3b.po
+++ b/pt_BR/messages/libk3b.po
@@ -4,21 +4,23 @@
# Henrique Pinto <henrique.pinto@kdemail.net>, 2005.
# Diniz Bortolotto <diniz.bb@gmail.com>, 2007.
# doutor.zero <doutor.zero@gmail.com>, 2007, 2008.
+# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: libk3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2008-04-05 07:30-0300\n"
-"Last-Translator: doutor.zero <doutor.zero@gmail.com>\n"
-"Language-Team: Português do Brasil <kde-i18n-pt_br@kde.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: 2021-12-17 21:01+0000\n"
+"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/applications/k3b-lib/pt_BR/>\n"
+"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.9.1\n"
"X-Poedit-Language: Portuguese\n"
"X-Poedit-Country: BRAZIL\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
@@ -1515,14 +1517,12 @@ msgstr ""
" - %n cópias"
#: projects/audiocd/k3baudionormalizejob.cpp:58
-#, fuzzy
msgid "Could not find normalize-audio executable."
-msgstr "Não foi possível encontrar o executável do normalize."
+msgstr "Não foi possível encontrar o executável do normalize-audio."
#: projects/audiocd/k3baudionormalizejob.cpp:86
-#, fuzzy
msgid "Could not start normalize-audio."
-msgstr "Não foi possível iniciar o normalize."
+msgstr "Não foi possível iniciar o normalize-audio."
#: projects/audiocd/k3baudionormalizejob.cpp:126
msgid "Track %1 is already normalized."
diff --git a/pt_BR/messages/libk3bdevice.po b/pt_BR/messages/libk3bdevice.po
index b052367..1562d30 100644
--- a/pt_BR/messages/libk3bdevice.po
+++ b/pt_BR/messages/libk3bdevice.po
@@ -3,18 +3,21 @@
# Lisiane Sztoltz Teixeira <lisiane@conectiva.com.br>, 2004.
# Lisiane Sztoltz Teixeira <lisiane@kdemail.net>, 2004, 2005.
# Doutor.Zero <doutor.zero@gmail.com>, 2005.
+# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: libk3bdevice\n"
"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2006-09-30 20:23-0300\n"
-"Last-Translator: doutor.zero <doutor.zero@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
+"PO-Revision-Date: 2021-12-17 21:01+0000\n"
+"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/applications/k3b-device/pt_BR/>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.9.1\n"
"X-Poedit-Language: Portuguese\n"
"X-Poedit-Country: BRAZIL\n"
@@ -22,13 +25,13 @@ msgstr ""
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
-msgstr ""
+msgstr "Sebastião Luiz Guerra"
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
-msgstr ""
+msgstr "sebastiao.luiz.guerra@gmail.com"
#: k3bdeviceglobals.cpp:30 k3bdeviceglobals.cpp:153
msgid "CD-R"
diff --git a/ru/CMakeLists.txt b/ru/CMakeLists.txt
deleted file mode 100644
index ba78952..0000000
--- a/ru/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/ru/Makefile.am b/ru/Makefile.am
deleted file mode 100644
index ff7ab78..0000000
--- a/ru/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages doc
diff --git a/ru/doc/CMakeLists.txt b/ru/doc/CMakeLists.txt
deleted file mode 100644
index e9c0d23..0000000
--- a/ru/doc/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
-
-tde_create_handbook(
- DESTINATION k3b
- LANG ru
-)
diff --git a/ru/doc/Makefile.am b/ru/doc/Makefile.am
deleted file mode 100644
index a95d86b..0000000
--- a/ru/doc/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = ru
-KDE_DOCS = k3b
diff --git a/ru/doc/index.docbook b/ru/doc/index.docbook
index 2548cd5..5bbafc6 100644
--- a/ru/doc/index.docbook
+++ b/ru/doc/index.docbook
@@ -312,15 +312,3 @@ or the ChangeLog file, or ... -->
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/ru/messages/Makefile.am b/ru/messages/Makefile.am
deleted file mode 100644
index 1c418b6..0000000
--- a/ru/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = ru
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/ru/messages/k3b.po b/ru/messages/k3b.po
index 9e20b93..e55771f 100644
--- a/ru/messages/k3b.po
+++ b/ru/messages/k3b.po
@@ -13,7 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2008-03-17 15:54+0300\n"
"Last-Translator: Andrey Cherepanov <skull@kde.ru>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -5980,11 +5980,11 @@ msgstr "&Свойства"
msgid "Open the properties dialog"
msgstr "Открыть свойства"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7070,19 +7070,23 @@ msgstr "Не удалось установить параметры (%1)."
msgid "Alsa device:"
msgstr "Устройство ALSA:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Advanced Audio Coding (AAC)"
@@ -9123,17 +9127,12 @@ msgstr "Заменить все &пробелы на:"
msgid "&2-pass encoding"
msgstr "&двухпроходное кодирование"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Использовать двухпроходное кодирование"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9153,17 +9152,17 @@ msgstr ""
"<p>Задействование двухпроходного кодирования приводит к удвоению времени "
"кодирования."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Автоматическое кадрирование &видео"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Автоматически определять и обрезать чёрную окантовку фильма"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9184,22 +9183,17 @@ msgstr ""
"<p>Впрочем этот метод может вызвать проблемы если исходный материал слишком "
"близок к чёрному цвету."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Передискретизировать звук в &44.1 кГц"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Изменить частоту дискретизации звукового потока на 44,1 КГц"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9213,7 +9207,7 @@ msgstr ""
"<p>Если этот параметр отмечен, K3b будет изменять частоту дискретизации "
"звукового потока до 44100 Гц."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Низкий &приоритет процесса видеокодирования"
@@ -9886,6 +9880,9 @@ msgstr ""
"и подождав, пока K3b определит его. Он будет будет показываться как диск для "
"записи.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Сохранить всё"
diff --git a/ru/messages/libk3b.po b/ru/messages/libk3b.po
index ddd1199..9eed1e3 100644
--- a/ru/messages/libk3b.po
+++ b/ru/messages/libk3b.po
@@ -3,12 +3,13 @@
#
# Nick Shaforostoff <shafff@ukr.net>, 2004, 2005, 2006.
# Vitaly Lipatov <lav@etersoft.ru>, 2007.
+# Alexander Golubev <fatzer2@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: libk3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2020-01-04 14:07+0000\n"
-"Last-Translator: Serg Bormant <bormant@mail.ru>\n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: 2022-02-10 03:03+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/k3b-lib/ru/>\n"
"Language: ru\n"
@@ -17,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.10\n"
+"X-Generator: Weblate 4.10.1\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
@@ -2482,7 +2483,7 @@ msgstr "Ошибка записи"
#: projects/k3bgrowisofshandler.cpp:277
#, c-format
msgid "Fatal error at startup: %1"
-msgstr "Фатальная ошибка при запуске: %1"
+msgstr "Критическая ошибка при запуске: %1"
#: projects/k3bgrowisofshandler.cpp:285
msgid "Warning at exit: (1)"
@@ -2495,7 +2496,7 @@ msgstr "Возможно, mkisofs завершила работу с ошибк
#: projects/k3bgrowisofshandler.cpp:289
#, c-format
msgid "Fatal error during recording: %1"
-msgstr "Фатальная ошибка в процессе записи: %1"
+msgstr "Критическая ошибка в процессе записи: %1"
#: projects/k3bgrowisofswriter.cpp:163
msgid "Growisofs version %1 is too old. K3b needs at least version 5.10."
diff --git a/rw/Makefile.am b/rw/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/rw/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/rw/messages/Makefile.am b/rw/messages/Makefile.am
deleted file mode 100644
index 8d437bc..0000000
--- a/rw/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = rw
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/rw/messages/k3b.po b/rw/messages/k3b.po
index 679065a..5c4603e 100644
--- a/rw/messages/k3b.po
+++ b/rw/messages/k3b.po
@@ -15,7 +15,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b 3.4\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2005-05-25 18:36-0600\n"
"Last-Translator: Steve Murphy <murf@e-tools.com>\n"
"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -6466,11 +6466,11 @@ msgstr "Indangabintu"
msgid "Open the properties dialog"
msgstr "Gufungura i Indangabintu Ikiganiro "
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7598,22 +7598,25 @@ msgstr "OYA Tangira &vendorShortName; %1 . "
msgid "Alsa device:"
msgstr "i Amapareye "
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
#, fuzzy
msgid "Windows Media v1"
msgstr "Idosiye Idasanzwe Windows"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
#, fuzzy
msgid "Windows Media v2"
msgstr "Idosiye Idasanzwe Windows"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-#, fuzzy
-msgid "MPEG 1 Layer III"
-msgstr "1 "
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "Igenamiterere ya konti yo mu rwego rwo hejuru"
@@ -9570,17 +9573,12 @@ msgstr "Byose Na: : "
msgid "&2-pass encoding"
msgstr "Byihuta Imisobekere: "
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Byihuta Imisobekere: "
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9592,17 +9590,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "inyerekanamashusho Ubwoko: . "
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Bidakora i umukara Impera Bya i "
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9615,22 +9613,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, fuzzy, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Kuri . 1 "
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9640,7 +9633,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -10220,6 +10213,10 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "1 "
+
+#, fuzzy
#~ msgid "Save As"
#~ msgstr "Gushyingura Byose"
diff --git a/se/Makefile.am b/se/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/se/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/se/messages/Makefile.am b/se/messages/Makefile.am
deleted file mode 100644
index 2893691..0000000
--- a/se/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = se
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/se/messages/k3b.po b/se/messages/k3b.po
index 5de4cf2..798032a 100644
--- a/se/messages/k3b.po
+++ b/se/messages/k3b.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2006-04-03 17:03+0200\n"
"Last-Translator: Børre Gaup <boerre@skolelinux.no>\n"
"Language-Team: Northern Sami <i18n-sme@lister.ping.uio.no>\n"
@@ -5375,11 +5375,11 @@ msgstr "&Iešvuođat"
msgid "Open the properties dialog"
msgstr ""
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6355,19 +6355,23 @@ msgstr "Ii sáhttán rahpat %1 nammasaš fiilla"
msgid "Alsa device:"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr ""
@@ -8203,17 +8207,12 @@ msgstr "Buhtte dáinna:"
msgid "&2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8225,17 +8224,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8248,22 +8247,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr ""
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8273,7 +8267,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
diff --git a/sk/Makefile.am b/sk/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/sk/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/sk/messages/Makefile.am b/sk/messages/Makefile.am
deleted file mode 100644
index 1e1bb19..0000000
--- a/sk/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = sk
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/sk/messages/k3b.po b/sk/messages/k3b.po
index a6c73d8..1e17d3a 100644
--- a/sk/messages/k3b.po
+++ b/sk/messages/k3b.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2019-12-04 23:59+0000\n"
"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
@@ -5709,11 +5709,11 @@ msgstr "&Vlastnosti"
msgid "Open the properties dialog"
msgstr "Otvoriť dialóg vlastností"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6783,19 +6783,23 @@ msgstr "Nemožno nastaviť parametre (%1)."
msgid "Alsa device:"
msgstr "Alsa zariadenie:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "Pokročile audio/video nastavenia"
@@ -8741,17 +8745,12 @@ msgstr "Zameniť všetky &prázdne miesta za:"
msgid "&2-pass encoding"
msgstr "rychlé kódování"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "rychlé kódování"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8763,17 +8762,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Ripovanie Video CD"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Odrezať čierne okraje filmu"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8786,22 +8785,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Prevzorkovať audio na &44,1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8811,7 +8805,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9411,6 +9405,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Uložiť všetko"
diff --git a/sr/Makefile.am b/sr/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/sr/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/sr/messages/Makefile.am b/sr/messages/Makefile.am
deleted file mode 100644
index 791c3c6..0000000
--- a/sr/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = sr
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/sr/messages/k3b.po b/sr/messages/k3b.po
index 9952bab..d84a708 100644
--- a/sr/messages/k3b.po
+++ b/sr/messages/k3b.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2008-02-28 14:34+0100\n"
"Last-Translator: Slobodan Simic <simicsl@verat.net>\n"
"Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -5932,11 +5932,11 @@ msgstr "&Својства"
msgid "Open the properties dialog"
msgstr "Отвори дијалог својства"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7010,19 +7010,23 @@ msgstr "Не могу да поставим параметре (%1)."
msgid "Alsa device:"
msgstr "Alsa уређај:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows-ов Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows-ов Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 слој III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Напредно аудио кодирање (AAC)"
@@ -9044,17 +9048,12 @@ msgstr "Замени све &размаке са:"
msgid "&2-pass encoding"
msgstr "&2-пролазно кодирање"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Укључи 2-пролазно кодирање"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9073,17 +9072,17 @@ msgstr ""
"битним протоком и лошијег квалитета.\n"
"<p>Кодирање у два пролаза повећава и време кодирања готово двоструко."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Аутоматско одсецање &видеа"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Аутоматски одређује црне ивице видеа"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9103,22 +9102,17 @@ msgstr ""
"<p>Иако је овај метод доста поуздан, проблеми могу настати ако је материјал "
"веома кратак или таман."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Пребаци аудио на &44.1 КHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Мења учестаност узорковања аудио тока на 44.1 KHz"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9132,7 +9126,7 @@ msgstr ""
"<p>Ако је ова опција означена K3b ће променити учестаност узорковања аудио "
"тока на 44100 Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Низак проритет ра&споређивања за поступак транскодовања видеа"
@@ -9797,6 +9791,9 @@ msgstr ""
"једноставно га убаците и сачекајте да га K3b препозна. Тада ће се он "
"појавити као диск за нарезивање.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 слој III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Сними све"
diff --git a/sr@Latn/Makefile.am b/sr@Latn/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/sr@Latn/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/sr@Latn/messages/Makefile.am b/sr@Latn/messages/Makefile.am
deleted file mode 100644
index 1347978..0000000
--- a/sr@Latn/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = sr@Latn
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/sr@Latn/messages/k3b.po b/sr@Latn/messages/k3b.po
index 5de4ff5..9274ddf 100644
--- a/sr@Latn/messages/k3b.po
+++ b/sr@Latn/messages/k3b.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-08-08 09:09+0200\n"
"Last-Translator: Slobodan Simic <simicsl@verat.net>\n"
"Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -5940,11 +5940,11 @@ msgstr "&Svojstva"
msgid "Open the properties dialog"
msgstr "Otvori dijalog svojstva"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7018,19 +7018,23 @@ msgstr "Ne mogu da postavim parametre (%1)."
msgid "Alsa device:"
msgstr "Alsa uređaj:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows-ov Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows-ov Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 sloj III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Napredno audio kodiranje (AAC)"
@@ -9055,17 +9059,12 @@ msgstr "Zameni sve &razmake sa:"
msgid "&2-pass encoding"
msgstr "&2-prolazno kodiranje"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Uključi 2-prolazno kodiranje"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9084,17 +9083,17 @@ msgstr ""
"bitnim protokom i lošijeg kvaliteta.\n"
"<p>Kodiranje u dva prolaza povećava i vreme kodiranja gotovo dvostruko."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Automatsko odsecanje &videa"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Automatski određuje crne ivice videa"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9114,22 +9113,17 @@ msgstr ""
"<p>Iako je ovaj metod dosta pouzdan, problemi mogu nastati ako je materijal "
"veoma kratak ili taman."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Prebaci audio na &44.1 KHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Menja učestanost uzorkovanja audio toka na 44.1 KHz"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9143,7 +9137,7 @@ msgstr ""
"<p>Ako je ova opcija označena K3b će promeniti učestanost uzorkovanja audio "
"toka na 44100 Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Nizak proritet ra&spoređivanja za postupak transkodovanja videa"
@@ -9810,6 +9804,9 @@ msgstr ""
"jednostavno ga ubacite i sačekajte da ga K3b prepozna. Tada će se on "
"pojaviti kao disk za narezivanje.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 sloj III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Snimi sve"
diff --git a/stamp-h.in b/stamp-h.in
deleted file mode 100644
index e69de29..0000000
--- a/stamp-h.in
+++ /dev/null
diff --git a/subdirs b/subdirs
deleted file mode 100644
index 827c58e..0000000
--- a/subdirs
+++ /dev/null
@@ -1,54 +0,0 @@
-af
-ar
-bg
-br
-bs
-ca
-cs
-cy
-da
-de
-el
-en_GB
-es
-et
-eu
-fa
-fi
-fr
-ga
-gl
-he
-hi
-hu
-is
-it
-ja
-ka
-km
-lt
-mk
-ms
-nb
-nds
-ne
-nl
-nn
-pa
-pl
-pt
-pt_BR
-ru
-rw
-se
-sk
-sr
-sr@Latn
-sv
-ta
-tr
-uk
-uz
-uz@cyrillic
-zh_CN
-zh_TW
diff --git a/sv/CMakeLists.txt b/sv/CMakeLists.txt
deleted file mode 100644
index ba78952..0000000
--- a/sv/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/sv/Makefile.am b/sv/Makefile.am
deleted file mode 100644
index ff7ab78..0000000
--- a/sv/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages doc
diff --git a/sv/doc/CMakeLists.txt b/sv/doc/CMakeLists.txt
deleted file mode 100644
index 5fb876e..0000000
--- a/sv/doc/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
-
-tde_create_handbook(
- DESTINATION k3b
- LANG sv
-)
diff --git a/sv/doc/Makefile.am b/sv/doc/Makefile.am
deleted file mode 100644
index 9526665..0000000
--- a/sv/doc/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = sv
-KDE_DOCS = k3b
diff --git a/sv/doc/index.docbook b/sv/doc/index.docbook
index b598647..03560f5 100644
--- a/sv/doc/index.docbook
+++ b/sv/doc/index.docbook
@@ -316,15 +316,3 @@ or the ChangeLog file, or ... -->
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/sv/messages/Makefile.am b/sv/messages/Makefile.am
deleted file mode 100644
index 300ce12..0000000
--- a/sv/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = sv
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/sv/messages/k3b.po b/sv/messages/k3b.po
index 0775d06..0b59465 100644
--- a/sv/messages/k3b.po
+++ b/sv/messages/k3b.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-09-03 18:13+0200\n"
"Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -5985,11 +5985,11 @@ msgstr "&Egenskaper"
msgid "Open the properties dialog"
msgstr "Öppna egenskapsdialogrutan"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7057,19 +7057,23 @@ msgstr "Kunde inte ställa in parametrar (%1)."
msgid "Alsa device:"
msgstr "ALSA-enhet:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media version1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media version 2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Lager III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Avancerad ljudkodning (AAC)"
@@ -9109,17 +9113,12 @@ msgstr "Ersätt alla &mellanslag med:"
msgid "&2-pass encoding"
msgstr "Kodning med &2 genomgångar"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Aktivera kodning med 2 genomgångar"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9138,17 +9137,17 @@ msgstr ""
"bithastighet och lägre kvalitet.\n"
"<p>Kodning med 2 genomgångar resulterar i dubbel kodningstid."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Automatisk beskärning av &video"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Detektera automatiskt svarta kanter i video"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9169,22 +9168,17 @@ msgstr ""
"<p>Även om metoden är mycket tillförlitlig kan det uppstå problem om "
"källmaterialet är ovanligt kort eller mörkt."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Omsampla ljud till &44,1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Ändra samplingsfrekvens för ljudströmmen till 44,1 KHz"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9198,7 +9192,7 @@ msgstr ""
"<p>Om alternativet markeras, ändrar K3b ljudströmmens samplingsfrekvens till "
"44100 Hz."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Låg s&chemaläggningsprioritet för videokodningsprocessen"
@@ -9869,6 +9863,9 @@ msgstr ""
"medium, mata helt enkelt in det och vänta på att K3b detekterar det. Det "
"visas därefter som brännmedium.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Lager III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Spara alla"
diff --git a/ta/Makefile.am b/ta/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/ta/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/ta/messages/Makefile.am b/ta/messages/Makefile.am
deleted file mode 100644
index 80776c9..0000000
--- a/ta/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = ta
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/ta/messages/k3b.po b/ta/messages/k3b.po
index 07dae50..59f79b4 100644
--- a/ta/messages/k3b.po
+++ b/ta/messages/k3b.po
@@ -15,7 +15,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2005-03-29 04:01-0800\n"
"Last-Translator: Tamil PC <tamilpc@ambalam.com>\n"
"Language-Team: <ta@li.org>\n"
@@ -5726,11 +5726,11 @@ msgstr "&பண்புகள்"
msgid "Open the properties dialog"
msgstr "குறுந்தகடு நகல் உரையாடலைத் திறக்கவும்"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6771,19 +6771,23 @@ msgstr "தொடங்க முடியவில்லை %1"
msgid "Alsa device:"
msgstr "சாதனத்தை மறுஅலகிடு"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "மேம்பட்ட ஒலி/வீடியோ அமைப்புக்கள்"
@@ -8671,17 +8675,12 @@ msgstr "எல்லா வெற்றிடத்தையும் மாற
msgid "&2-pass encoding"
msgstr "குறியாக்கம் துவங்கு"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "குறியாக்கம் துவங்கு"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8693,17 +8692,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "வீடியோ சிடியைப் பிரித்தெடு"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "திரை படத்தின் கருப்பு விளிம்புகளை வெட்டவும்"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8716,22 +8715,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, fuzzy, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "44.1kHzக்கு மறுஉதாரணம்"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8741,7 +8735,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
diff --git a/template/messages/k3b.pot b/template/messages/k3b.pot
index ae51da4..9b4ef64 100644
--- a/template/messages/k3b.pot
+++ b/template/messages/k3b.pot
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:13+0200\n"
+"POT-Creation-Date: 2022-09-10 20:31+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -617,15 +617,14 @@ msgstr ""
#: k3bdatamodewidget.cpp:39
msgid ""
-"<p><b>Data Mode</b><p>Data tracks may be written in two different "
-"modes:</p><p><b>Auto</b><br>Let K3b select the best suited data "
-"mode.</p><p><b>Mode 1</b><br>This is the <em>original</em> writing mode as "
-"introduced in the <em>Yellow Book</em> standard. It is the preferred mode "
-"when writing pure data CDs.</p><p><b>Mode 2</b><br>To be exact <em>XA Mode 2 "
-"Form 1</em>, but since the other modes are rarely used it is common to refer "
-"to it as <em>Mode 2</em>.</p><p><b>Be aware:</b> Do not mix different modes "
-"on one CD. Some older drives may have problems reading mode 1 multisession "
-"CDs."
+"<p><b>Data Mode</b><p>Data tracks may be written in two different modes:</"
+"p><p><b>Auto</b><br>Let K3b select the best suited data mode.</p><p><b>Mode "
+"1</b><br>This is the <em>original</em> writing mode as introduced in the "
+"<em>Yellow Book</em> standard. It is the preferred mode when writing pure "
+"data CDs.</p><p><b>Mode 2</b><br>To be exact <em>XA Mode 2 Form 1</em>, but "
+"since the other modes are rarely used it is common to refer to it as "
+"<em>Mode 2</em>.</p><p><b>Be aware:</b> Do not mix different modes on one "
+"CD. Some older drives may have problems reading mode 1 multisession CDs."
msgstr ""
#: k3bdebuggingoutputdialog.cpp:39
@@ -1024,8 +1023,8 @@ msgstr ""
#: k3bemptydiscwaiter.cpp:165
msgid ""
-"Please insert a complete or appendable %4 medium into drive<p><b>%1 %2 "
-"(%3)</b>."
+"Please insert a complete or appendable %4 medium into drive<p><b>%1 %2 (%3)</"
+"b>."
msgstr ""
#: k3bemptydiscwaiter.cpp:172
@@ -1034,8 +1033,8 @@ msgstr ""
#: k3bemptydiscwaiter.cpp:179
msgid ""
-"Please insert an empty or appendable %4 medium into drive<p><b>%1 %2 "
-"(%3)</b>."
+"Please insert an empty or appendable %4 medium into drive<p><b>%1 %2 (%3)</"
+"b>."
msgstr ""
#: k3bemptydiscwaiter.cpp:186
@@ -1156,8 +1155,8 @@ msgstr ""
msgid ""
"<p>K3b can integrate itself into Konqueror. This integration allows to start "
"K3b from the context menu in the file manager.<p><em>The Konqueror "
-"integration can always be disabled and enabled again from the K3b "
-"settings.</em>"
+"integration can always be disabled and enabled again from the K3b settings.</"
+"em>"
msgstr ""
#: k3binteractiondialog.cpp:89
@@ -1210,8 +1209,8 @@ msgid ""
"<p>K3b handles three sets of settings in action dialogs: the defaults, the "
"saved settings, and the last used settings. Please choose which of these "
"sets should be loaded if an action dialog is opened again.<p><em>Be aware "
-"that this choice can always be changed from the K3b configuration "
-"dialog.</em>"
+"that this choice can always be changed from the K3b configuration dialog.</"
+"em>"
msgstr ""
#: k3binteractiondialog.cpp:331 option/k3bmiscoptiontab.cpp:49
@@ -1296,11 +1295,11 @@ msgstr ""
#: k3blsofwrapperdialog.cpp:75
msgid ""
-"<p>Device <b>'%1'</b> is already in use by other applications "
-"(<em>%2</em>).<p>It is highly recommended to quit those before continuing. "
-"Otherwise K3b might not be able to fully access the device.<p><em>Hint: "
-"Sometimes shutting down an application does not happen instantly. In that "
-"case you might have to use the '%3' button."
+"<p>Device <b>'%1'</b> is already in use by other applications (<em>%2</em>)."
+"<p>It is highly recommended to quit those before continuing. Otherwise K3b "
+"might not be able to fully access the device.<p><em>Hint: Sometimes shutting "
+"down an application does not happen instantly. In that case you might have "
+"to use the '%3' button."
msgstr ""
#: k3blsofwrapperdialog.cpp:103
@@ -1887,9 +1886,9 @@ msgstr ""
#: k3btempdirselectionwidget.cpp:81
msgid ""
-"<p>This is the directory in which K3b will save the <em>image "
-"files</em>.<p>Please make sure that it resides on a partition that has "
-"enough free space."
+"<p>This is the directory in which K3b will save the <em>image files</em>."
+"<p>Please make sure that it resides on a partition that has enough free "
+"space."
msgstr ""
#: k3btempdirselectionwidget.cpp:126
@@ -1976,8 +1975,8 @@ msgid ""
"choose the maximum writing speed possible with the used medium. This is the "
"recommended selection for most media.</p><p><b>Ignore</b> (DVD only)<br>This "
"will leave the speed selection to the writer device. Use this if K3b is "
-"unable to set the writing speed.<p>1x refers to 1385 KB/s for DVD and 175 "
-"KB/s for CD.</p><p><b>Caution:</b> Make sure your system is able to send the "
+"unable to set the writing speed.<p>1x refers to 1385 KB/s for DVD and 175 KB/"
+"s for CD.</p><p><b>Caution:</b> Make sure your system is able to send the "
"data fast enough to prevent buffer underruns."
msgstr ""
@@ -2389,8 +2388,8 @@ msgstr ""
#: misc/k3bcdimagewritingdialog.cpp:275 misc/k3bdvdcopydialog.cpp:104
#: misc/k3bdvdformattingdialog.cpp:68 misc/k3bisoimagewritingdialog.cpp:205
#: misc/k3bisoimagewritingdialog.cpp:218 option/k3boptiondialog.cpp:44
-#: projects/base_k3bbootimageview.ui:166
-#: projects/k3baudioburndialog.cpp:82 projects/k3bdatapropertiesdialog.cpp:177
+#: projects/base_k3bbootimageview.ui:166 projects/k3baudioburndialog.cpp:82
+#: projects/k3bdatapropertiesdialog.cpp:177
#: projects/k3bprojectburndialog.cpp:271 projects/k3bvcdburndialog.cpp:446
#: projects/k3bvcdburndialog.cpp:476 projects/k3bvcdtrackdialog.cpp:452
#: rip/k3baudioprojectconvertingdialog.cpp:112
@@ -2489,8 +2488,8 @@ msgstr ""
msgid ""
"<p>In CD Cloning mode K3b performs a raw copy of the CD. That means it does "
"not care about the content but simply copies the CD bit by bit. It may be "
-"used to copy VideoCDs or CDs which contain erroneous "
-"sectors.<p><b>Caution:</b> Only single session CDs can be cloned."
+"used to copy VideoCDs or CDs which contain erroneous sectors.<p><b>Caution:</"
+"b> Only single session CDs can be cloned."
msgstr ""
#: misc/k3bcdcopydialog.cpp:273 misc/k3bdvdcopydialog.cpp:238
@@ -2574,9 +2573,8 @@ msgstr ""
#: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:291
#: misc/k3bcdimagewritingdialog.cpp:309 misc/k3bcdimagewritingdialog.cpp:770
#: option/base_k3bcddboptiontab.ui:421 option/k3boptiondialog.cpp:129
-#: projects/k3baudioburndialog.cpp:104
-#: projects/k3bdatapropertiesdialog.cpp:178 projects/k3bvcdburndialog.cpp:429
-#: rip/k3baudiorippingdialog.cpp:154
+#: projects/k3baudioburndialog.cpp:104 projects/k3bdatapropertiesdialog.cpp:178
+#: projects/k3bvcdburndialog.cpp:429 rip/k3baudiorippingdialog.cpp:154
#, no-c-format
msgid "Advanced"
msgstr ""
@@ -2840,8 +2838,8 @@ msgstr ""
#: option/k3bburningoptiontab.cpp:116
msgid ""
-"<p>Each medium has an official maximum capacity which is stored in a "
-"read-only area of the medium and is guaranteed by the vendor. However, this "
+"<p>Each medium has an official maximum capacity which is stored in a read-"
+"only area of the medium and is guaranteed by the vendor. However, this "
"official maximum is not always the actual maximum. Many media have an actual "
"total capacity that is slightly larger than the official amount.<p>If this "
"option is checked K3b will disable a safety check that prevents burning "
@@ -2869,10 +2867,10 @@ msgstr ""
msgid ""
"<p>If this option is checked K3b will not eject the medium once the burn "
"process finishes. This can be helpful in case one leaves the computer after "
-"starting the burning and does not want the tray to be open all the "
-"time.<p>However, on Linux systems a freshly burned medium has to be "
-"reloaded. Otherwise the system will not detect the changes and still treat "
-"it as an empty medium."
+"starting the burning and does not want the tray to be open all the time."
+"<p>However, on Linux systems a freshly burned medium has to be reloaded. "
+"Otherwise the system will not detect the changes and still treat it as an "
+"empty medium."
msgstr ""
#: option/k3bburningoptiontab.cpp:143
@@ -2900,8 +2898,7 @@ msgstr ""
msgid "CD-Text capable:"
msgstr ""
-#: option/k3bdevicewidget.cpp:130
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:190
+#: option/k3bdevicewidget.cpp:130 rip/videodvd/k3bvideodvdrippingwidget.cpp:190
#: rip/videodvd/k3bvideodvdrippingwidget.cpp:191
msgid "auto"
msgstr ""
@@ -3053,8 +3050,8 @@ msgid "Path"
msgstr ""
#: ../plugins/decoder/ogg/k3boggvorbisdecoder.cpp:121
-#: option/base_k3bthemeoptiontab.ui:59
-#: option/k3bexternalbinwidget.cpp:134 option/k3bpluginoptiontab.cpp:69
+#: option/base_k3bthemeoptiontab.ui:59 option/k3bexternalbinwidget.cpp:134
+#: option/k3bpluginoptiontab.cpp:69
#, no-c-format
msgid "Version"
msgstr ""
@@ -3221,8 +3218,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: option/base_k3bthemeoptiontab.ui:48
-#: option/k3bpluginoptiontab.cpp:68
+#: option/base_k3bthemeoptiontab.ui:48 option/k3bpluginoptiontab.cpp:68
#, no-c-format
msgid "Author"
msgstr ""
@@ -3268,8 +3264,8 @@ msgstr ""
#: option/k3bthemeoptiontab.cpp:209
msgid ""
-"<qt>Are you sure you want to remove the <strong>%1</strong> icon "
-"theme?<br><br>This will delete the files installed by this theme.</qt>"
+"<qt>Are you sure you want to remove the <strong>%1</strong> icon theme?"
+"<br><br>This will delete the files installed by this theme.</qt>"
msgstr ""
#: ../plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp:80
@@ -3320,10 +3316,9 @@ msgstr ""
#: projects/k3baudioburndialog.cpp:301
msgid ""
"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
-"uses <em>normalize-audio</em> "
-"(http://www1.cs.columbia.edu/~cvaill/normalize/) to normalize audio tracks. "
-"In order to use this functionality, please install it first. (sudo apt-get "
-"install normalize-audio)"
+"uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/"
+"normalize/) to normalize audio tracks. In order to use this functionality, "
+"please install it first. (sudo apt-get install normalize-audio)"
msgstr ""
#: projects/k3baudioburndialog.cpp:308 projects/k3baudioburndialog.cpp:327
@@ -3558,15 +3553,13 @@ msgstr ""
msgid "Floppy"
msgstr ""
-#: projects/base_k3bbootimageview.ui:134
-#: projects/k3bbootimageview.cpp:59
+#: projects/base_k3bbootimageview.ui:134 projects/k3bbootimageview.cpp:59
#, no-c-format
msgid "Harddisk"
msgstr ""
#: ../plugins/decoder/mp3/k3bmaddecoder.cpp:440
-#: projects/base_k3bbootimageview.ui:145
-#: projects/k3bbootimageview.cpp:61
+#: projects/base_k3bbootimageview.ui:145 projects/k3bbootimageview.cpp:61
#, no-c-format
msgid "None"
msgstr ""
@@ -3591,9 +3584,9 @@ msgid ""
"familiar with terms like 'harddisk emulation' you most likely want to use a "
"floppy image here. Floppy images can be created by directly extracting them "
"from a real floppy disk:<pre>dd if=/dev/floppy of=/tmp/floppy.img</pre>or by "
-"using one of the many boot floppy generators that can be found on <a "
-"href=\"http://www.google.com/search?q=linux+boot+floppy&ie=UTF-8&oe=UTF-8\">t"
-"he internet</a>."
+"using one of the many boot floppy generators that can be found on <a href="
+"\"http://www.google.com/search?q=linux+boot+floppy&ie=UTF-8&oe=UTF-8\">the "
+"internet</a>."
msgstr ""
#: projects/k3bbootimageview.cpp:146
@@ -3744,9 +3737,8 @@ msgstr ""
msgid "Most writers do not support writing multisession CDs in DAO mode."
msgstr ""
-#: option/base_k3bcddboptiontab.ui:108
-#: projects/k3bdatadirtreeview.cpp:84 projects/k3bdatapropertiesdialog.cpp:108
-#: projects/k3bdataviewitem.cpp:170
+#: option/base_k3bcddboptiontab.ui:108 projects/k3bdatadirtreeview.cpp:84
+#: projects/k3bdatapropertiesdialog.cpp:108 projects/k3bdataviewitem.cpp:170
#, no-c-format
msgid "Directory"
msgstr ""
@@ -3785,15 +3777,15 @@ msgid ""
"After that press the burn button to write the CD."
msgstr ""
-#: projects/base_k3bbootimageview.ui:77
-#: projects/k3bdatafileview.cpp:72 projects/k3bmovixlistview.cpp:176
-#: rip/k3baudiocdlistview.cpp:39 rip/k3bvideocdview.cpp:169
+#: projects/base_k3bbootimageview.ui:77 projects/k3bdatafileview.cpp:72
+#: projects/k3bmovixlistview.cpp:176 rip/k3baudiocdlistview.cpp:39
+#: rip/k3bvideocdview.cpp:169
#, no-c-format
msgid "Size"
msgstr ""
-#: projects/base_k3bbootimageview.ui:88
-#: projects/k3bdatafileview.cpp:73 projects/k3bmovixlistview.cpp:177
+#: projects/base_k3bbootimageview.ui:88 projects/k3bdatafileview.cpp:73
+#: projects/k3bmovixlistview.cpp:177
#, no-c-format
msgid "Local Path"
msgstr ""
@@ -3909,9 +3901,9 @@ msgstr ""
#: projects/k3bdataimagesettingswidget.cpp:300
msgid ""
"<p>Be aware that without the Joliet extensions Windows systems will not be "
-"able to display long filenames. You will only see the ISO9660 "
-"filenames.<p>If you do not intend to use the CD/DVD on a Windows system it "
-"is safe to disable Joliet."
+"able to display long filenames. You will only see the ISO9660 filenames."
+"<p>If you do not intend to use the CD/DVD on a Windows system it is safe to "
+"disable Joliet."
msgstr ""
#: projects/k3bdataimagesettingswidget.cpp:305
@@ -3926,18 +3918,18 @@ msgstr ""
msgid ""
"<p><b>Multisession Mode</b><p><b>Auto</b><br>Let K3b decide which mode to "
"use. The decision will be based on the size of the project (does it fill the "
-"whole media) and the state of the inserted media (appendable or "
-"not).<p><b>No Multisession</b><br>Create a single-session CD or DVD and "
-"close the disk.<p><b>Start Multisession</b><br>Start a multisession CD or "
-"DVD, not closing the disk to allow further sessions to be "
-"apppended.<p><b>Continue Multisession</b><br>Continue an appendable data CD "
-"(as for example created in <em>Start Multisession</em> mode) and add another "
-"session without closing the disk to allow further sessions to be "
-"apppended.<p><b>Finish Multisession</b><br>Continue an appendable data CD "
-"(as for example created in <em>Start Multisession</em> mode), add another "
-"session, and close the disk.<p><em>In the case of DVD+RW and DVD-RW "
-"restricted overwrite media K3b will not actually create multiple sessions "
-"but grow the file system to include the new data.</em>"
+"whole media) and the state of the inserted media (appendable or not)."
+"<p><b>No Multisession</b><br>Create a single-session CD or DVD and close the "
+"disk.<p><b>Start Multisession</b><br>Start a multisession CD or DVD, not "
+"closing the disk to allow further sessions to be apppended.<p><b>Continue "
+"Multisession</b><br>Continue an appendable data CD (as for example created "
+"in <em>Start Multisession</em> mode) and add another session without closing "
+"the disk to allow further sessions to be apppended.<p><b>Finish "
+"Multisession</b><br>Continue an appendable data CD (as for example created "
+"in <em>Start Multisession</em> mode), add another session, and close the "
+"disk.<p><em>In the case of DVD+RW and DVD-RW restricted overwrite media K3b "
+"will not actually create multiple sessions but grow the file system to "
+"include the new data.</em>"
msgstr ""
#: projects/k3bdatamultisessioncombobox.cpp:76
@@ -4033,8 +4025,8 @@ msgid ""
"<p>If this option is checked, the file or directory (and its entire "
"contents) will be hidden on the ISO9660 and RockRidge filesystem.</p><p>This "
"is useful, for example, for having different README files for RockRidge and "
-"Joliet, which can be managed by hiding README.joliet on RockRidge and "
-"README.rr on the Joliet filesystem.</p>"
+"Joliet, which can be managed by hiding README.joliet on RockRidge and README."
+"rr on the Joliet filesystem.</p>"
msgstr ""
#: projects/k3bdatapropertiesdialog.cpp:207
@@ -4373,8 +4365,8 @@ msgid ""
"<p><b>Why does K3b offer 4.4 GB and 8.0 GB instead of 4.7 and 8.5 like it "
"says on the media?</b><p>A single layer DVD media has a capacity of "
"approximately 4.4 GB which equals 4.4*1024<sup>3</sup> bytes. Media "
-"producers just calculate with 1000 instead of 1024 for advertising "
-"reasons.<br>This results in 4.4*1024<sup>3</sup>/1000<sup>3</sup> = 4.7 GB."
+"producers just calculate with 1000 instead of 1024 for advertising reasons."
+"<br>This results in 4.4*1024<sup>3</sup>/1000<sup>3</sup> = 4.7 GB."
msgstr ""
#: projects/k3bfillstatusdisplay.cpp:541
@@ -4392,8 +4384,8 @@ msgstr ""
#: projects/k3bfillstatusdisplay.cpp:548
msgid ""
"<p>Please specify the size of the media. Use suffixes <b>gb</b>,<b>mb</b>, "
-"and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and "
-"<em>minutes</em> respectively."
+"and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and <em>minutes</"
+"em> respectively."
msgstr ""
#: projects/k3bfillstatusdisplay.cpp:611
@@ -4421,12 +4413,12 @@ msgid ""
"<em>Blue book CD</em><br>K3b will create a multisession CD with 2 sessions. "
"The first session will contain all audio tracks and the second session will "
"contain a mode 2 form 1 data track.<br>This mode is based on the <em>Blue "
-"book</em> standard (also known as <em>Extended Audio CD</em>, "
-"<em>CD-Extra</em>, or <em>CD Plus</em>) and has the advantage that a hifi "
-"audio CD player will only recognize the first session and ignore the second "
-"session with the data track.<br>If the CD is intended to be used in a hifi "
-"audio CD player this is the recommended mode.<br>Some older CD-ROMs may have "
-"problems reading a blue book CD since it is a multisession CD."
+"book</em> standard (also known as <em>Extended Audio CD</em>, <em>CD-Extra</"
+"em>, or <em>CD Plus</em>) and has the advantage that a hifi audio CD player "
+"will only recognize the first session and ignore the second session with the "
+"data track.<br>If the CD is intended to be used in a hifi audio CD player "
+"this is the recommended mode.<br>Some older CD-ROMs may have problems "
+"reading a blue book CD since it is a multisession CD."
msgstr ""
#: projects/k3bmixedburndialog.cpp:124
@@ -4456,10 +4448,9 @@ msgstr ""
#: projects/k3bmixedburndialog.cpp:311
msgid ""
"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
-"uses <em>normalize-audio</em> "
-"(http://www1.cs.columbia.edu/~cvaill/normalize/) to normalize audio tracks. "
-"In order to use this functionality, please install it first (sudo apt-get "
-"install normalize-audio."
+"uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/"
+"normalize/) to normalize audio tracks. In order to use this functionality, "
+"please install it first (sudo apt-get install normalize-audio."
msgstr ""
#: projects/k3bmixeddirtreeview.cpp:45
@@ -4703,16 +4694,15 @@ msgid ""
"<p>This is the most basic <b>Video CD</b> specification dating back to 1993, "
"which has the following characteristics:<ul><li>One mode2 mixed form "
"ISO-9660 track containing file pointers to the information areas.</li><li>Up "
-"to 98 multiplex-ed MPEG-1 audio/video streams or CD-DA audio "
-"tracks.</li><li>Up to 500 MPEG sequence entry points used as chapter "
-"divisions.</li></ul><p>The Video CD specification requires the multiplex-ed "
-"MPEG-1 stream to have a CBR of less than 174300 bytes (1394400 bits) per "
-"second in order to accommodate single speed CD-ROM drives.<br>The "
-"specification allows for the following two resolutions:<ul><li>352 x 240 @ "
-"29.97 Hz (NTSC SIF).</li><li>352 x 240 @ 23.976 Hz (FILM "
-"SIF).</li></ul><p>The CBR MPEG-1, layer II audio stream is fixed at 224 kbps "
-"with 1 stereo or 2 mono channels.<p><b>It is recommended to keep the video "
-"bit-rate under 1151929.1 bps.</b>"
+"to 98 multiplex-ed MPEG-1 audio/video streams or CD-DA audio tracks.</"
+"li><li>Up to 500 MPEG sequence entry points used as chapter divisions.</li></"
+"ul><p>The Video CD specification requires the multiplex-ed MPEG-1 stream to "
+"have a CBR of less than 174300 bytes (1394400 bits) per second in order to "
+"accommodate single speed CD-ROM drives.<br>The specification allows for the "
+"following two resolutions:<ul><li>352 x 240 @ 29.97 Hz (NTSC SIF).</"
+"li><li>352 x 240 @ 23.976 Hz (FILM SIF).</li></ul><p>The CBR MPEG-1, layer "
+"II audio stream is fixed at 224 kbps with 1 stereo or 2 mono channels."
+"<p><b>It is recommended to keep the video bit-rate under 1151929.1 bps.</b>"
msgstr ""
#: projects/k3bvcdburndialog.cpp:165
@@ -4720,23 +4710,23 @@ msgid ""
"<p>About two years after the Video CD 1.1 specification came out, an "
"improved <b>Video CD 2.0</b> standard was published in 1995.<p>This one "
"added the following items to the features already available in the Video CD "
-"1.1 specification:<ul><li>Support for MPEG segment play items "
-"(<b>\"SPI\"</b>), consisting of still pictures, motion pictures and/or audio "
-"(only) streams was added.</li><li>Note Segment Items::.</li><li>Support for "
+"1.1 specification:<ul><li>Support for MPEG segment play items (<b>\"SPI\"</"
+"b>), consisting of still pictures, motion pictures and/or audio (only) "
+"streams was added.</li><li>Note Segment Items::.</li><li>Support for "
"interactive playback control (<b>\"PBC\"</b>) was added.</li><li>Support for "
-"playing related access by providing a scan point index file was added. "
-"(<b>\"/EXT/SCANDATA.DAT\"</b>)</li><li>Support for closed "
-"captions.</li><li>Support for mixing NTSC and PAL content.</li></ul><p>By "
-"adding PAL support to the Video CD 1.1 specification, the following "
-"resolutions became available:<ul><li>352 x 240 @ 29.97 Hz (NTSC "
-"SIF).</li><li>352 x 240 @ 23.976 Hz (FILM SIF).</li><li>352 x 288 @ 25 Hz "
-"(PAL SIF).</li></ul><p>For segment play items the following audio encodings "
-"became available:<ul><li>Joint stereo, stereo or dual channel audio streams "
-"at 128, 192, 224 or 384 kbit/sec bit-rate.</li><li>Mono audio streams at 64, "
-"96 or 192 kbit/sec bit-rate.</li></ul><p>Also the possibility to have audio "
-"only streams and still pictures was provided.<p><b>The bit-rate of "
-"multiplex-ed streams should be kept under 174300 bytes/sec (except for "
-"single still picture items) in order to accommodate single speed drives.</b>"
+"playing related access by providing a scan point index file was added. (<b>"
+"\"/EXT/SCANDATA.DAT\"</b>)</li><li>Support for closed captions.</"
+"li><li>Support for mixing NTSC and PAL content.</li></ul><p>By adding PAL "
+"support to the Video CD 1.1 specification, the following resolutions became "
+"available:<ul><li>352 x 240 @ 29.97 Hz (NTSC SIF).</li><li>352 x 240 @ "
+"23.976 Hz (FILM SIF).</li><li>352 x 288 @ 25 Hz (PAL SIF).</li></ul><p>For "
+"segment play items the following audio encodings became available:"
+"<ul><li>Joint stereo, stereo or dual channel audio streams at 128, 192, 224 "
+"or 384 kbit/sec bit-rate.</li><li>Mono audio streams at 64, 96 or 192 kbit/"
+"sec bit-rate.</li></ul><p>Also the possibility to have audio only streams "
+"and still pictures was provided.<p><b>The bit-rate of multiplex-ed streams "
+"should be kept under 174300 bytes/sec (except for single still picture "
+"items) in order to accommodate single speed drives.</b>"
msgstr ""
#: projects/k3bvcdburndialog.cpp:184
@@ -4746,64 +4736,64 @@ msgid ""
"CD specification was called into life 1999.<p>In the midst of 2000 a full "
"subset of this <b>Super Video CD</b> specification was published as "
"<b>IEC-62107</b>.<p>As the most notable change over Video CD 2.0 is a switch "
-"from MPEG-1 CBR to MPEG-2 VBR encoding for the video stream was "
-"performed.<p>The following new features--building upon the Video CD 2.0 "
-"specification--are:<ul><li>Use of MPEG-2 encoding instead of MPEG-1 for the "
-"video stream.</li><li>Allowed VBR encoding of MPEG-1 audio "
-"stream.</li><li>Higher resolutions (see below) for video stream "
-"resolution.</li><li>Up to 4 overlay graphics and text (<b>\"OGT\"</b>) "
-"sub-channels for user switchable subtitle displaying in addition to the "
-"already existing closed caption facility.</li><li>Command lists for "
-"controlling the SVCD virtual machine.</li></ul><p>For the <b>Super Video "
-"CD</b>, only the following two resolutions are supported for motion video "
-"and (low resolution) still pictures:<ul><li>480 x 480 @ 29.97 Hz (NTSC 2/3 "
-"D-2).</li><li>480 x 576 @ 25 Hz (PAL 2/3 D-2).</li></ul>"
+"from MPEG-1 CBR to MPEG-2 VBR encoding for the video stream was performed."
+"<p>The following new features--building upon the Video CD 2.0 specification--"
+"are:<ul><li>Use of MPEG-2 encoding instead of MPEG-1 for the video stream.</"
+"li><li>Allowed VBR encoding of MPEG-1 audio stream.</li><li>Higher "
+"resolutions (see below) for video stream resolution.</li><li>Up to 4 overlay "
+"graphics and text (<b>\"OGT\"</b>) sub-channels for user switchable subtitle "
+"displaying in addition to the already existing closed caption facility.</"
+"li><li>Command lists for controlling the SVCD virtual machine.</li></"
+"ul><p>For the <b>Super Video CD</b>, only the following two resolutions are "
+"supported for motion video and (low resolution) still pictures:<ul><li>480 x "
+"480 @ 29.97 Hz (NTSC 2/3 D-2).</li><li>480 x 576 @ 25 Hz (PAL 2/3 D-2).</"
+"li></ul>"
msgstr ""
#: projects/k3bvcdburndialog.cpp:198
msgid ""
"<p>This is actually just a minor variation defined in IEC-62107 on the Super "
-"Video CD 1.0 format for compatibility with current products in the "
-"market.<p>It differs from the Super Video CD 1.0 format in the following "
-"items:<ul><li>The system profile tag field in <b>/SVCD/INFO.SVD</b> is set "
-"to <b>1</b> instead of <b>0</b>.</li><li>The system identification field "
-"value in <b>/SVCD/INFO.SVD</b> is set to <b>HQ-VCD</b> instead of "
-"<b>SUPERVCD</b>.</li><li><b>/EXT/SCANDATA.DAT</b> is mandatory instead of "
-"being optional.</li><li><b>/SVCD/SEARCH.DAT</b> is optional instead of being "
-"mandatory.</li></ul>"
+"Video CD 1.0 format for compatibility with current products in the market."
+"<p>It differs from the Super Video CD 1.0 format in the following items:"
+"<ul><li>The system profile tag field in <b>/SVCD/INFO.SVD</b> is set to "
+"<b>1</b> instead of <b>0</b>.</li><li>The system identification field value "
+"in <b>/SVCD/INFO.SVD</b> is set to <b>HQ-VCD</b> instead of <b>SUPERVCD</b>."
+"</li><li><b>/EXT/SCANDATA.DAT</b> is mandatory instead of being optional.</"
+"li><li><b>/SVCD/SEARCH.DAT</b> is optional instead of being mandatory.</li></"
+"ul>"
msgstr ""
#: projects/k3bvcdburndialog.cpp:206
msgid ""
"<p>If Autodetect is:</p><ul><li>ON then K3b will set the correct VideoCD "
-"type.</li><li>OFF then the correct VideoCD type needs to be set by the "
-"user.</li></ul><p>If you are not sure about the correct VideoCD type, it is "
-"best to turn Autodetect ON.</p><p>If you want to force the VideoCD type, you "
-"must turn Autodetect OFF. This is useful for some standalone DVD players "
-"without SVCD support.</p>"
+"type.</li><li>OFF then the correct VideoCD type needs to be set by the user."
+"</li></ul><p>If you are not sure about the correct VideoCD type, it is best "
+"to turn Autodetect ON.</p><p>If you want to force the VideoCD type, you must "
+"turn Autodetect OFF. This is useful for some standalone DVD players without "
+"SVCD support.</p>"
msgstr ""
#: projects/k3bvcdburndialog.cpp:213
msgid ""
-"<ul><li>Rename <b>\"/MPEG2\"</b> folder on SVCDs to (non-compliant) "
-"\"/MPEGAV\".</li><li>Enables the use of the (deprecated) signature "
-"<b>\"ENTRYSVD\"</b> instead of <b>\"ENTRYVCD\"</b> for the file "
-"<b>\"/SVCD/ENTRY.SVD\"</b>.</li></ul>"
+"<ul><li>Rename <b>\"/MPEG2\"</b> folder on SVCDs to (non-compliant) \"/MPEGAV"
+"\".</li><li>Enables the use of the (deprecated) signature <b>\"ENTRYSVD\"</"
+"b> instead of <b>\"ENTRYVCD\"</b> for the file <b>\"/SVCD/ENTRY.SVD\"</b>.</"
+"li></ul>"
msgstr ""
#: projects/k3bvcdburndialog.cpp:216
msgid ""
-"<ul><li>Enables the use of the (deprecated) Chinese "
-"<b>\"/SVCD/TRACKS.SVD\"</b> format which differs from the format defined in "
-"the <b>IEC-62107</b> specification.</li></ul><p><b>The differences are most "
-"exposed on SVCDs containing more than one video track.</b>"
+"<ul><li>Enables the use of the (deprecated) Chinese <b>\"/SVCD/TRACKS.SVD\"</"
+"b> format which differs from the format defined in the <b>IEC-62107</b> "
+"specification.</li></ul><p><b>The differences are most exposed on SVCDs "
+"containing more than one video track.</b>"
msgstr ""
#: projects/k3bvcdburndialog.cpp:220
msgid ""
"<p>though most devices will have problems with such an out-of-specification "
-"media.<p><b>You may want use this option for images longer than 80 "
-"minutes</b>"
+"media.<p><b>You may want use this option for images longer than 80 minutes</"
+"b>"
msgstr ""
#: projects/k3bvcdburndialog.cpp:224
@@ -4811,9 +4801,9 @@ msgid ""
"<p>To allow the play of Video-CDs on a CD-i player, the Video-CD standard "
"requires that a CD-i application program must be present.<p>This program is "
"designed to:<ul><li>provide full play back control as defined in the PSD of "
-"the standard</l><li>be extremely simple to use and easy-to-learn for the "
-"end-user</li></ul><p>The program runs on CD-i players equipped with the "
-"CDRTOS 1.1(.1) operating system and a Digital Video extension cartridge."
+"the standard</l><li>be extremely simple to use and easy-to-learn for the end-"
+"user</li></ul><p>The program runs on CD-i players equipped with the CDRTOS "
+"1.1(.1) operating system and a Digital Video extension cartridge."
msgstr ""
#: projects/k3bvcdburndialog.cpp:231
@@ -4842,15 +4832,15 @@ msgstr ""
msgid ""
"<p>An Access Point Sector, APS, is an MPEG video sector on the VCD/SVCD "
"which is suitable to be jumped to directly.<p>APS are required for entry "
-"points and scantables. APS have to fulfil the requirement to precede every "
-"I-frame by a GOP header which shall be preceded by a sequence header in its "
+"points and scantables. APS have to fulfil the requirement to precede every I-"
+"frame by a GOP header which shall be preceded by a sequence header in its "
"turn.<p>The start codes of these 3 items are required to be contained all in "
-"the same MPEG pack/sector, thus forming a so-called access point "
-"sector.<p>This requirement can be relaxed by enabling the relaxed aps "
-"option, i.e. every sector containing an I-frame will be regarded as an "
-"APS.<p><b>Warning:</b> The sequence header is needed for a playing device to "
-"figure out display parameters, such as display resolution and frame rate, "
-"relaxing the aps requirement may lead to non-working entry points."
+"the same MPEG pack/sector, thus forming a so-called access point sector."
+"<p>This requirement can be relaxed by enabling the relaxed aps option, i.e. "
+"every sector containing an I-frame will be regarded as an APS.<p><b>Warning:"
+"</b> The sequence header is needed for a playing device to figure out "
+"display parameters, such as display resolution and frame rate, relaxing the "
+"aps requirement may lead to non-working entry points."
msgstr ""
#: projects/k3bvcdburndialog.cpp:253
@@ -4867,9 +4857,9 @@ msgstr ""
msgid ""
"<p>Viewing Restriction may be interpreted by the playing device.<p>The "
"allowed range goes from 0 to 3.<ul><li>0 = unrestricted, free to view for "
-"all</li><li>3 = restricted, content not suitable for ages under "
-"18</li></ul><p>Actually, the exact meaning is not defined and is player "
-"dependant.<p><b>Most players ignore that value.<b>"
+"all</li><li>3 = restricted, content not suitable for ages under 18</li></"
+"ul><p>Actually, the exact meaning is not defined and is player dependant."
+"<p><b>Most players ignore that value.<b>"
msgstr ""
#: projects/k3bvcdburndialog.cpp:266
@@ -4882,34 +4872,34 @@ msgid ""
"lead-out area begins, i.e. the number of post-gap sectors.<p>The ECMA-130 "
"specification requires the last data track before the lead-out to carry a "
"post-gap of at least 150 sectors, which is used as default for this "
-"parameter.<p>Some operating systems may encounter I/O errors due to "
-"read-ahead issues when reading the last MPEG track if this parameter is set "
-"too low.<p>Allowed value content: [0..300]. Default: 150."
+"parameter.<p>Some operating systems may encounter I/O errors due to read-"
+"ahead issues when reading the last MPEG track if this parameter is set too "
+"low.<p>Allowed value content: [0..300]. Default: 150."
msgstr ""
#: projects/k3bvcdburndialog.cpp:274
msgid ""
"<p>Used to set the track pre-gap for all tracks in sectors globally.<p>The "
-"specification requires the pre-gaps to be at least 150 sectors "
-"long.<p>Allowed value content: [0..300]. Default: 150."
+"specification requires the pre-gaps to be at least 150 sectors long."
+"<p>Allowed value content: [0..300]. Default: 150."
msgstr ""
#: projects/k3bvcdburndialog.cpp:279
msgid ""
-"Margins are used to compensate for inaccurate sector-addressing issues on "
-"CD-ROM media. Interestingly, they have been abandoned for Super Video "
-"CDs.<p>For Video CD 1.0/1.1/2.0 this margin should be at least 15 sectors "
-"long.<p>Allowed value content: [0..150]. Default: 30 for Video CD "
-"1.0/1.1/2.0, otherwise (i.e. Super Video CD 1.0 and HQ-VCD 1.0) 0."
+"Margins are used to compensate for inaccurate sector-addressing issues on CD-"
+"ROM media. Interestingly, they have been abandoned for Super Video CDs."
+"<p>For Video CD 1.0/1.1/2.0 this margin should be at least 15 sectors long."
+"<p>Allowed value content: [0..150]. Default: 30 for Video CD 1.0/1.1/2.0, "
+"otherwise (i.e. Super Video CD 1.0 and HQ-VCD 1.0) 0."
msgstr ""
#: projects/k3bvcdburndialog.cpp:284
msgid ""
"<p>Margins are used to compensate for inaccurate sector-addressing issues on "
-"CD-ROM media. Interestingly, they have been abandoned for Super Video "
-"CDs.<p>For Video CD 1.0/1.1/2.0 this margin should be at least 15 sectors "
-"long.<p>Allowed value content: [0..150]. Default: 45 for Video CD "
-"1.0/1.1/2.0, otherwise 0."
+"CD-ROM media. Interestingly, they have been abandoned for Super Video CDs."
+"<p>For Video CD 1.0/1.1/2.0 this margin should be at least 15 sectors long."
+"<p>Allowed value content: [0..150]. Default: 45 for Video CD 1.0/1.1/2.0, "
+"otherwise 0."
msgstr ""
#: projects/k3bvcdburndialog.cpp:299
@@ -5150,11 +5140,11 @@ msgstr ""
msgid ""
"<p>Times to repeat the playback of 'play track'.<p>The reactivity attribute "
"controls whether the playback of 'play track' is finished, thus delayed, "
-"before executing user triggered action or an immediate jump is "
-"performed.<p>After the specified number of repetitions have completed, the "
-"<wait> time begins to count down, unless set to an infinite wait time.<p>If "
-"this element is omitted, a default of `1' is used, i.e. the 'play track' "
-"will be displayed once."
+"before executing user triggered action or an immediate jump is performed."
+"<p>After the specified number of repetitions have completed, the <wait> time "
+"begins to count down, unless set to an infinite wait time.<p>If this element "
+"is omitted, a default of `1' is used, i.e. the 'play track' will be "
+"displayed once."
msgstr ""
#: projects/k3bvcdtrackdialog.cpp:245
@@ -5353,11 +5343,11 @@ msgstr ""
msgid "Open the properties dialog"
msgstr ""
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -5654,8 +5644,8 @@ msgid ""
"Most audio tracks contain an empty pregap which does not belong to the track "
"itself.</p><p>Although the default behaviour of nearly all ripping software "
"is to include the pregaps for most CDs it makes more sense to ignore them. "
-"When creating a K3b audio project you will regenerate these pregaps "
-"anyway.</p>"
+"When creating a K3b audio project you will regenerate these pregaps anyway.</"
+"p>"
msgstr ""
#: rip/k3baudiorippingdialog.cpp:328
@@ -5773,20 +5763,19 @@ msgstr ""
msgid ""
"<p><b>Pattern special strings:</b><p>The following strings will be replaced "
"with their respective meaning in every track name.<br><em>Hint:</em> %A "
-"differs from %a only on soundtracks or compilations.<p><table "
-"border=\"0\"><tr><td></td><td><em>Meaning</em></td><td><em>Alternatives</em><"
-"/td></tr><tr><td>%a</td><td>artist of the track</td><td>%{a} or "
-"%{artist}</td></tr><tr><td>%t</td><td>title of the track</td><td>%{t} or "
-"%{title}</td></tr><tr><td>%n</td><td>track number</td><td>%{n} or "
-"%{number}</td></tr><tr><td>%y</td><td>year of the CD</td><td>%{y} or "
-"%{year}</td></tr><tr><td>%c</td><td>extended track information</td><td>%{c} "
-"or %{comment}</td></tr><tr><td>%g</td><td>genre of the CD</td><td>%{g} or "
-"%{genre}</td></tr><tr><td>%A</td><td>album artist</td><td>%{A} or "
-"%{albumartist}</td></tr><tr><td>%T</td><td>album title</td><td>%{T} or "
-"%{albumtitle}</td></tr><tr><td>%C</td><td>extended CD "
-"information</td><td>%{C} or "
-"%{albumcomment}</td></tr><tr><td>%d</td><td>current date</td><td>%{d} or "
-"%{date}</td></tr></table>"
+"differs from %a only on soundtracks or compilations.<p><table border="
+"\"0\"><tr><td></td><td><em>Meaning</em></td><td><em>Alternatives</em></td></"
+"tr><tr><td>%a</td><td>artist of the track</td><td>%{a} or %{artist}</td></"
+"tr><tr><td>%t</td><td>title of the track</td><td>%{t} or %{title}</td></"
+"tr><tr><td>%n</td><td>track number</td><td>%{n} or %{number}</td></"
+"tr><tr><td>%y</td><td>year of the CD</td><td>%{y} or %{year}</td></"
+"tr><tr><td>%c</td><td>extended track information</td><td>%{c} or %{comment}</"
+"td></tr><tr><td>%g</td><td>genre of the CD</td><td>%{g} or %{genre}</td></"
+"tr><tr><td>%A</td><td>album artist</td><td>%{A} or %{albumartist}</td></"
+"tr><tr><td>%T</td><td>album title</td><td>%{T} or %{albumtitle}</td></"
+"tr><tr><td>%C</td><td>extended CD information</td><td>%{C} or %{albumcomment}"
+"</td></tr><tr><td>%d</td><td>current date</td><td>%{d} or %{date}</td></tr></"
+"table>"
msgstr ""
#: rip/k3bcddbpatternwidget.cpp:153
@@ -5799,8 +5788,8 @@ msgid ""
"specified<li>@C='Soundtrack'{TEXT} includes TEXT if the CD's extended "
"information is named Soundtrack<li>!C='Soundtrack'{TEXT} includes TEXT if "
"the CD's extended information is anything else but Soundtrack<li>It is also "
-"possible to include special strings in texts and conditions, e.g. "
-"!a='%A'{%a} only includes the title's artist information if it does not "
+"possible to include special strings in texts and conditions, e.g. !"
+"a='%A'{%a} only includes the title's artist information if it does not "
"differ from the album artist.</ul><p>Conditional includes make use of the "
"same characters as the special strings, which means that the X in @X{...} "
"can be one character out of [atnycgATCd]."
@@ -5825,8 +5814,8 @@ msgstr ""
#: rip/k3bvideocdrip.cpp:102 rip/k3bvideocdrip.cpp:111
msgid ""
-"You can find this on your distribution disks or download it from "
-"http://www.vcdimager.org"
+"You can find this on your distribution disks or download it from http://www."
+"vcdimager.org"
msgstr ""
#: rip/k3bvideocdrip.cpp:110
@@ -5945,8 +5934,8 @@ msgstr ""
#: rip/k3bvideocdrippingdialog.cpp:140
msgid ""
-"<p>Ignore extended PSD (located in the ISO-9660 filesystem under "
-"`/EXT/PSD_X.VCD') and use the <em>standard</em> PSD.</p>"
+"<p>Ignore extended PSD (located in the ISO-9660 filesystem under `/EXT/PSD_X."
+"VCD') and use the <em>standard</em> PSD.</p>"
msgstr ""
#: rip/k3bvideocdrippingdialog.cpp:142
@@ -5956,8 +5945,8 @@ msgstr ""
#: rip/k3bvideocdrippingdialog.cpp:143
msgid ""
"<p>This option only makes sense if you are reading from a BIN CD disk image. "
-"This indicates to `vcdxrip' to assume a 2336-byte sector mode for image "
-"file.</p><b>Note: This option is slated to disappear.</b>"
+"This indicates to `vcdxrip' to assume a 2336-byte sector mode for image file."
+"</p><b>Note: This option is slated to disappear.</b>"
msgstr ""
#: rip/k3bvideocdrippingdialog.cpp:146
@@ -5966,12 +5955,11 @@ msgstr ""
#: rip/k3bvideocdrippingdialog.cpp:147
msgid ""
-"<p>This option creates an XML description file with all video CD "
-"information.</p><p>This file will always contain all of the "
-"information.</p><p>Example: If you only extract sequences, the description "
-"file will also hold the information for files and segments.</p><p>The "
-"filename is the same as the video CD name, with a .xml extension. The "
-"default is VIDEOCD.xml.</p>"
+"<p>This option creates an XML description file with all video CD information."
+"</p><p>This file will always contain all of the information.</p><p>Example: "
+"If you only extract sequences, the description file will also hold the "
+"information for files and segments.</p><p>The filename is the same as the "
+"video CD name, with a .xml extension. The default is VIDEOCD.xml.</p>"
msgstr ""
#: rip/k3bvideocdrippingdialog.cpp:179
@@ -6198,9 +6186,9 @@ msgstr ""
#: rip/videodvd/k3bvideodvdrippingview.cpp:142
msgid ""
-"<p>K3b uses transcode to rip Video DVDs. Your installation of transcode "
-"(<em>%1</em>) lacks support for any of the codecs supported by K3b.<p>Please "
-"make sure it is installed properly."
+"<p>K3b uses transcode to rip Video DVDs. Your installation of transcode (<em>"
+"%1</em>) lacks support for any of the codecs supported by K3b.<p>Please make "
+"sure it is installed properly."
msgstr ""
#: rip/videodvd/k3bvideodvdrippingview.cpp:155
@@ -6248,27 +6236,24 @@ msgstr ""
#: rip/videodvd/k3bvideodvdrippingwidget.cpp:283
msgid ""
"<p><b>Pattern special strings:</b><p>The following strings will be replaced "
-"with their respective meaning in every track name.<br><p><table "
-"border=\"0\"><tr><td></td><td><em>Meaning</em></td><td><em>Alternatives</em><"
-"/td></tr><tr><td>%t</td><td>title number</td><td>%{t} or "
-"%{title_number}</td></tr><tr><td>%i</td><td>volume id (mostly the name of "
-"the Video DVD)</td><td>%{i} or "
-"%{volume_id}</td></tr><tr><td>%b</td><td>beautified volume id</td><td>%{b} "
-"or %{beautified_volume_id}</td></tr><tr><td>%l</td><td>two chars language "
-"code</td><td>%{l} or %{lang_code}</td></tr><tr><td>%n</td><td>language "
-"name</td><td>%{n} or %{lang_name}</td></tr><tr><td>%a</td><td>audio format "
-"(on the Video DVD)</td><td>%{a} or "
-"%{audio_format}</td></tr><tr><td>%c</td><td>number of audio channels (on the "
-"Video DVD)</td><td>%{c} or %{channels}</td></tr><tr><td>%v</td><td>size of "
-"the original video</td><td>%{v} or "
-"%{orig_video_size}</td></tr><tr><td>%s</td><td>size of the resulting video "
-"(<em>Caution: auto-clipping values are not taken into "
-"account!</em>)</td><td>%{s} or "
-"%{video_size}</td></tr><tr><td>%r</td><td>aspect ratio of the original "
-"video</td><td>%{r} or %{aspect_ratio}</td></tr><tr><td>%d</td><td>current "
-"date</td><td>%{d} or %{date}</td></tr></table><p><em>Hint: K3b also accepts "
-"slight variations of the long special strings. One can, for example, leave "
-"out the underscores.</em>"
+"with their respective meaning in every track name.<br><p><table border="
+"\"0\"><tr><td></td><td><em>Meaning</em></td><td><em>Alternatives</em></td></"
+"tr><tr><td>%t</td><td>title number</td><td>%{t} or %{title_number}</td></"
+"tr><tr><td>%i</td><td>volume id (mostly the name of the Video DVD)</td><td>"
+"%{i} or %{volume_id}</td></tr><tr><td>%b</td><td>beautified volume id</"
+"td><td>%{b} or %{beautified_volume_id}</td></tr><tr><td>%l</td><td>two chars "
+"language code</td><td>%{l} or %{lang_code}</td></tr><tr><td>%n</"
+"td><td>language name</td><td>%{n} or %{lang_name}</td></tr><tr><td>%a</"
+"td><td>audio format (on the Video DVD)</td><td>%{a} or %{audio_format}</td></"
+"tr><tr><td>%c</td><td>number of audio channels (on the Video DVD)</td><td>"
+"%{c} or %{channels}</td></tr><tr><td>%v</td><td>size of the original video</"
+"td><td>%{v} or %{orig_video_size}</td></tr><tr><td>%s</td><td>size of the "
+"resulting video (<em>Caution: auto-clipping values are not taken into "
+"account!</em>)</td><td>%{s} or %{video_size}</td></tr><tr><td>%r</"
+"td><td>aspect ratio of the original video</td><td>%{r} or %{aspect_ratio}</"
+"td></tr><tr><td>%d</td><td>current date</td><td>%{d} or %{date}</td></tr></"
+"table><p><em>Hint: K3b also accepts slight variations of the long special "
+"strings. One can, for example, leave out the underscores.</em>"
msgstr ""
#: rip/videodvd/k3bvideodvdrippingwidget.cpp:335
@@ -6326,19 +6311,23 @@ msgstr ""
msgid "Alsa device:"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr ""
@@ -6725,8 +6714,8 @@ msgstr ""
#: ../plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp:118
msgid ""
"<qt>This specifies how the files should be renamed. Currently only the "
-"special strings <em>%a</em> (Artist), <em>%n</em> (Track number), and "
-"<em>%t</em> (Title) ,are supported."
+"special strings <em>%a</em> (Artist), <em>%n</em> (Track number), and <em>"
+"%t</em> (Title) ,are supported."
msgstr ""
#: ../plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp:133
@@ -7390,12 +7379,12 @@ msgid ""
"part of an audio track that is marked as post-gap is counted backwards.\n"
"<p>This setting is irrelevant for most users as todays CD burners can put "
"arbitrary audio data in the post-gap when burning in DAO mode.\n"
-"<p><i>In other CD-burning applications the post-gap might be called the "
-"pre-gap. The pre-gap of track 2 is the same as the post-gap of track 1.\n"
+"<p><i>In other CD-burning applications the post-gap might be called the pre-"
+"gap. The pre-gap of track 2 is the same as the post-gap of track 1.\n"
"<p><b>Changing the post-gap does not change the length of the track!</b>\n"
"<p><b>When writing in TAO writing mode (not recommended for Audio CDs) the "
-"post-gap will most likely be muted and on some burners forced to 2 "
-"seconds.</b>"
+"post-gap will most likely be muted and on some burners forced to 2 seconds.</"
+"b>"
msgstr ""
#: projects/base_k3bbootimageview.ui:36
@@ -7418,8 +7407,7 @@ msgstr ""
msgid "Remove selected boot image"
msgstr ""
-#: projects/base_k3bbootimageview.ui:66
-#: projects/base_k3bbootimageview.ui:112
+#: projects/base_k3bbootimageview.ui:66 projects/base_k3bbootimageview.ui:112
#, no-c-format
msgid "Emulation Type"
msgstr ""
@@ -7459,8 +7447,7 @@ msgstr ""
msgid "Boot-info-table"
msgstr ""
-#: projects/base_k3bbootimageview.ui:207
-#: projects/base_k3bbootimageview.ui:218
+#: projects/base_k3bbootimageview.ui:207 projects/base_k3bbootimageview.ui:218
#, no-c-format
msgid "0"
msgstr ""
@@ -7564,8 +7551,8 @@ msgid ""
"\n"
"<p><b>Discard broken symlinks</b><br>\n"
"K3b will discard all symbolic links that do not point to a file inside the "
-"project. That includes all links to absolute paths like "
-"'/home/myhome/testfile'.\n"
+"project. That includes all links to absolute paths like '/home/myhome/"
+"testfile'.\n"
"\n"
"<p><b>Discard all symlinks</b><br>\n"
"K3b will discard all symbolic links that have been added to the project; "
@@ -7609,8 +7596,8 @@ msgid ""
"If this option is checked, K3b will leave all spaces in filenames as they "
"are.\n"
"<p><b>Strip</b><br>\n"
-"If this option is checked, K3b will remove all spaces from all "
-"filenames.<br>\n"
+"If this option is checked, K3b will remove all spaces from all filenames."
+"<br>\n"
"Example: 'my good file.ext' becomes 'mygoodfile.ext'\n"
"<p><b>Extended Strip</b><br>\n"
"If this option is checked K3b will remove all spaces in all filenames and "
@@ -7813,9 +7800,9 @@ msgid ""
"background movie has been selected, eMovix will display it during playback.\n"
"<p>Additional background movies can be installed. However, this is not as "
"simple as a few mouse clicks. The background movies are stored in the emovix "
-"shared data folder (mostly <i>/usr/share/emovix</i> or "
-"<i>/usr/local/share/emovix</i>) under <em>backgrounds</em>. So to add a "
-"background one has to copy the file to that folder."
+"shared data folder (mostly <i>/usr/share/emovix</i> or <i>/usr/local/share/"
+"emovix</i>) under <em>backgrounds</em>. So to add a background one has to "
+"copy the file to that folder."
msgstr ""
#: projects/base_k3bmovixoptionswidget.ui:181
@@ -8175,17 +8162,12 @@ msgstr ""
msgid "&2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8197,17 +8179,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8220,22 +8202,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr ""
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8245,7 +8222,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -8662,17 +8639,17 @@ msgid ""
"<p>The sample data encoding is signed linear (2's complement), unsigned "
"linear, u-law (logarithmic), A-law (logarithmic), ADPCM, IMA_ADPCM, GSM, or "
"Floating-point.</p>\n"
-"<p><b>U-law</b> (actually shorthand for mu-law) and <b>A-law</b> are the "
-"U.S. and international standards for logarithmic telephone sound "
-"compression. When uncompressed u-law has roughly the precision of 14-bit PCM "
-"audio and A-law has roughly the precision of 13-bit PCM audio. A-law and "
-"u-law data is sometimes encoded using a reversed bit-ordering (i.e. MSB "
-"becomes LSB).<br> <b>ADPCM </b> is a form of sound compression that has a "
-"good compromise between good sound quality and fast encoding/decoding time. "
-"It is used for telephone sound compression and places where full fidelity is "
-"not as important. When uncompressed it has roughly the precision of 16-bit "
-"PCM audio. Popular versions of ADPCM include G.726, MS ADPCM, and IMA ADPCM. "
-"It has different meanings in different file handlers. In .wav files it "
+"<p><b>U-law</b> (actually shorthand for mu-law) and <b>A-law</b> are the U."
+"S. and international standards for logarithmic telephone sound compression. "
+"When uncompressed u-law has roughly the precision of 14-bit PCM audio and A-"
+"law has roughly the precision of 13-bit PCM audio. A-law and u-law data is "
+"sometimes encoded using a reversed bit-ordering (i.e. MSB becomes LSB).<br> "
+"<b>ADPCM </b> is a form of sound compression that has a good compromise "
+"between good sound quality and fast encoding/decoding time. It is used for "
+"telephone sound compression and places where full fidelity is not as "
+"important. When uncompressed it has roughly the precision of 16-bit PCM "
+"audio. Popular versions of ADPCM include G.726, MS ADPCM, and IMA ADPCM. It "
+"has different meanings in different file handlers. In .wav files it "
"represents MS ADPCM files, in all others it means G.726 ADPCM. <br> <b>IMA "
"ADPCM</b> is a specific form of ADPCM compression, slightly simpler and "
"slightly lower fidelity than Microsoft's flavor of ADPCM. IMA ADPCM is also "
@@ -8765,8 +8742,8 @@ msgstr ""
msgid ""
"<p>...that you do not need to bother changing the settings marked as "
"<em>advanced</em> if you \n"
-"do not know what they mean. K3b's defaults are suitable for most daily "
-"use.</p>\n"
+"do not know what they mean. K3b's defaults are suitable for most daily use.</"
+"p>\n"
msgstr ""
#: tips:36
diff --git a/template/messages/libk3b.pot b/template/messages/libk3b.pot
index caa5954..63c1236 100644
--- a/template/messages/libk3b.pot
+++ b/template/messages/libk3b.pot
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:13+0200\n"
+"POT-Creation-Date: 2021-07-07 22:29+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1313,8 +1313,7 @@ msgstr ""
msgid "Unable to seek in track %1."
msgstr ""
-#: projects/audiocd/k3baudioimager.cpp:104
-#: projects/datacd/k3bisoimager.cpp:499
+#: projects/audiocd/k3baudioimager.cpp:104 projects/datacd/k3bisoimager.cpp:499
msgid "Could not open %1 for writing"
msgstr ""
@@ -1731,8 +1730,8 @@ msgstr ""
#: projects/datadvd/k3bdvdbooktypejob.cpp:120
msgid ""
-"Please insert an empty DVD+R or a DVD+RW medium into drive<p><b>%1 %2 "
-"(%3)</b>."
+"Please insert an empty DVD+R or a DVD+RW medium into drive<p><b>%1 %2 (%3)</"
+"b>."
msgstr ""
#: projects/datadvd/k3bdvdbooktypejob.cpp:188
@@ -2619,8 +2618,8 @@ msgstr ""
#: projects/videocd/k3bvcdjob.cpp:189 projects/videocd/k3bvcdjob.cpp:198
msgid ""
-"You can find this on your distribution disks or download it from "
-"http://www.vcdimager.org"
+"You can find this on your distribution disks or download it from http://www."
+"vcdimager.org"
msgstr ""
#: projects/videocd/k3bvcdjob.cpp:197
@@ -2903,16 +2902,16 @@ msgstr ""
#: tools/k3bstdguiitems.cpp:56
msgid ""
"<p>If this option is checked, K3b enables <em>Burnfree</em> (or <em>Just "
-"Link</em>). This is a feature of the CD writer which avoids buffer "
-"underruns.<p>Without <em>burnfree</em>, if the writer cannot get any more "
-"data a buffer underrun would occurs, since the writer needs a constant "
-"stream of data to write the CD.<p>With <em>burnfree</em> the writer can "
-"<em>mark</em> the current position of the laser and get back to it when the "
-"buffer is filled again;but, since this means having little data gaps on the "
-"CD, <b>it is highly recommended to always choose an appropriate writing "
-"speed to prevent the usage of burnfree, especially for audio CDs</b> (in the "
-"worst case one would hear the gap).<p><em>Burnfree</em> was formerly known "
-"as <em>Burnproof</em>, but has since been renamed when it became part of the "
+"Link</em>). This is a feature of the CD writer which avoids buffer underruns."
+"<p>Without <em>burnfree</em>, if the writer cannot get any more data a "
+"buffer underrun would occurs, since the writer needs a constant stream of "
+"data to write the CD.<p>With <em>burnfree</em> the writer can <em>mark</em> "
+"the current position of the laser and get back to it when the buffer is "
+"filled again;but, since this means having little data gaps on the CD, <b>it "
+"is highly recommended to always choose an appropriate writing speed to "
+"prevent the usage of burnfree, especially for audio CDs</b> (in the worst "
+"case one would hear the gap).<p><em>Burnfree</em> was formerly known as "
+"<em>Burnproof</em>, but has since been renamed when it became part of the "
"MMC standard."
msgstr ""
@@ -2992,12 +2991,11 @@ msgstr ""
#: tools/k3bstdguiitems.cpp:123
msgid ""
"<p>If this option is checked K3b uses some otherwise-unused space on the "
-"audio CD to store additional information, like the artist or the CD "
-"title.<p>CD-TEXT is an extension to the audio CD standard introduced by "
-"Sony.<p>CD-TEXT will only be usable on CD players that support this "
-"extension (mostly car CD players).<p>Since a CD-TEXT-enhanced CDs will work "
-"in any CD player it is never a bad idea to enable this (if you specify "
-"CD-TEXT data)."
+"audio CD to store additional information, like the artist or the CD title."
+"<p>CD-TEXT is an extension to the audio CD standard introduced by Sony.<p>CD-"
+"TEXT will only be usable on CD players that support this extension (mostly "
+"car CD players).<p>Since a CD-TEXT-enhanced CDs will work in any CD player "
+"it is never a bad idea to enable this (if you specify CD-TEXT data)."
msgstr ""
#: tools/k3bstdguiitems.cpp:142
@@ -3071,9 +3069,9 @@ msgstr ""
#: tools/k3bstdguiitems.cpp:194
msgid ""
"<p>If this option is checked and K3b is not able to read an audio sector "
-"from the source CD it will be replaced with zeros on the resulting "
-"copy.<p>Since audio CD Player are able to interpolate small errors in the "
-"data it is no problem to let K3b skip unreadable sectors."
+"from the source CD it will be replaced with zeros on the resulting copy."
+"<p>Since audio CD Player are able to interpolate small errors in the data it "
+"is no problem to let K3b skip unreadable sectors."
msgstr ""
#: videodvd/k3bvideodvd.cpp:251
diff --git a/tr/Makefile.am b/tr/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/tr/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/tr/messages/Makefile.am b/tr/messages/Makefile.am
deleted file mode 100644
index a9550cb..0000000
--- a/tr/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = tr
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/tr/messages/k3b.po b/tr/messages/k3b.po
index bd9fa6d..3f40cb6 100644
--- a/tr/messages/k3b.po
+++ b/tr/messages/k3b.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-06-25 15:35+0300\n"
"Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
"Language-Team: <tr@li.org>\n"
@@ -5968,11 +5968,11 @@ msgstr "&Özellikler"
msgid "Open the properties dialog"
msgstr "Özellikler diyaloğunu aç"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -7030,19 +7030,23 @@ msgstr "(%1) parametreler ayarlanamadı."
msgid "Alsa device:"
msgstr "Alsa aygıtı:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "Gelişmiş Ses Kodlama (AAC)"
@@ -9089,17 +9093,12 @@ msgstr "Tüm boşl&ukları değiştirmek için kullan:"
msgid "&2-pass encoding"
msgstr "&2-geçiş kodlama"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "2-geçiş kodlamasını etkinleştir"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9118,17 +9117,17 @@ msgstr ""
"sahip video dosyaları oluşturacak.\n"
"<p>2-geçişli kodlama ile kodlama süresi iki katına çıkar."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Otomatik &Video Kırpma"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Görüntüdeki siyah sınırları otomatik olarak meydana çıkar"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9149,22 +9148,17 @@ msgstr ""
"<p>Bu yol her ne kadar güvenilir de olsa kaynak malzeme istisna olarak kısa "
"veya koyu ise problemler olabilir."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Sesi 44.1 kHz' örnekle"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Ses yayınının örnekleme oranını 44.1 KHz olarak değiştir"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9178,7 +9172,7 @@ msgstr ""
"<p>Eğer bu seçenek tercih edilirse K3b ses yayınının örnekleme oranını 44100 "
"Hz olarak değiştirecek."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Video ç&apraz aktarımı (transcode) için düşük öncelik programla"
@@ -9848,6 +9842,9 @@ msgstr ""
"istiyorsanız diski takın ve K3b'nin onu algılamasını bekleyin. Sonra "
"diskinize yazmaya başlayabilirsiniz.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Tümünü Kaydet"
diff --git a/uk/CMakeLists.txt b/uk/CMakeLists.txt
deleted file mode 100644
index ba78952..0000000
--- a/uk/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/uk/Makefile.am b/uk/Makefile.am
deleted file mode 100644
index ff7ab78..0000000
--- a/uk/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages doc
diff --git a/uk/doc/CMakeLists.txt b/uk/doc/CMakeLists.txt
deleted file mode 100644
index 1d207f5..0000000
--- a/uk/doc/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
-
-tde_create_handbook(
- DESTINATION k3b
- LANG uk
-)
diff --git a/uk/doc/Makefile.am b/uk/doc/Makefile.am
deleted file mode 100644
index 51f84fc..0000000
--- a/uk/doc/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = uk
-KDE_DOCS = k3b
diff --git a/uk/doc/index.docbook b/uk/doc/index.docbook
index 9537f0c..158c21a 100644
--- a/uk/doc/index.docbook
+++ b/uk/doc/index.docbook
@@ -360,15 +360,3 @@ or the ChangeLog file, or ... -->
&documentation.index;
</book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/uk/messages/Makefile.am b/uk/messages/Makefile.am
deleted file mode 100644
index 7ffee10..0000000
--- a/uk/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = uk
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/uk/messages/k3b.po b/uk/messages/k3b.po
index 87ed7a8..ee07623 100644
--- a/uk/messages/k3b.po
+++ b/uk/messages/k3b.po
@@ -4,32 +4,34 @@
# Ivan Petrouchtchak <iip@telus.net>, 2004, 2005.
# Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>, 2005, 2006, 2007.
# Yuri Chornoivan <yurchor@ukr.net>, 2007.
+# Roman Savochenko <roman@oscada.org>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2007-10-01 22:55-0700\n"
-"Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
-"Language-Team: Ukrainian <translation@linux.org.ua>\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
+"PO-Revision-Date: 2021-10-07 07:30+0000\n"
+"Last-Translator: Roman Savochenko <roman@oscada.org>\n"
+"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/k3b/uk/>\n"
"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.8.1\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
-msgstr "Іван Петрущак"
+msgstr "Іван Петрущак,Роман Савоченко"
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
-msgstr "ivanpetrouchtchak@yahoo.com"
+msgstr "ivanpetrouchtchak@yahoo.com,roman@oscada.org"
#: k3b.cpp:155
msgid "K3b - The CD and DVD Kreator"
@@ -57,7 +59,7 @@ msgstr "Новий проект &КД з даними"
#: k3b.cpp:240
msgid "New &Mixed Mode CD Project"
-msgstr "Новий проект КД &змішаного режиму"
+msgstr "Новий Проект КД &Змішаного Режиму"
#: k3b.cpp:242
msgid "New &Video CD Project"
@@ -1107,7 +1109,7 @@ msgstr "Знайдено носій %1 в %2 - %3. Перезаписати йо
#: k3bemptydiscwaiter.cpp:473
#, c-format
msgid "Found %1"
-msgstr "Знайдено %1"
+msgstr "Знайдено %1"
#: k3bemptydiscwaiter.cpp:468
msgid "Found %1 media in %2 - %3. Should it be formatted?"
@@ -1492,7 +1494,7 @@ msgid ""
"_n: %1 in %n track\n"
"%1 in %n tracks"
msgstr ""
-"%1 в %n доріжці\n"
+"%1 в одній доріжці\n"
"%1 в %n доріжках\n"
"%1 в %n доріжках"
@@ -1502,7 +1504,7 @@ msgid ""
"_n: and %n session\n"
" and %n sessions"
msgstr ""
-" і %n сеанс\n"
+"і один сеанс\n"
" і %n сеанси\n"
" і %n сеансів"
@@ -1586,7 +1588,7 @@ msgstr "Доріжки DVD"
#: k3bstatusbarmanager.cpp:60
msgid "Temp:"
-msgstr "Temp:"
+msgstr "Темп:"
#: k3bstatusbarmanager.cpp:113
msgid "No info"
@@ -1597,7 +1599,7 @@ msgid ""
"_n: 1 file in %1\n"
"%n files in %1"
msgstr ""
-"%n файл в %1\n"
+"один файл в %1\n"
"%n файли в %1\n"
"%n файлів в %1"
@@ -1607,7 +1609,7 @@ msgid ""
"_n: 1 folder\n"
"%n folders"
msgstr ""
-"%n тека\n"
+"одна тека\n"
"%n теки\n"
"%n тек"
@@ -1617,7 +1619,7 @@ msgid ""
"_n: Audio CD (1 track)\n"
"Audio CD (%n tracks)"
msgstr ""
-"Аудіо-КД (%n доріжка)\n"
+"Аудіо-КД (одна доріжка)\n"
"Аудіо-КД (%n доріжки)\n"
"Аудіо-КД (%n доріжок)"
@@ -1626,18 +1628,23 @@ msgid "Data CD (%1)"
msgstr "КД з даними (%1)"
#: k3bstatusbarmanager.cpp:209
-#, fuzzy
msgid ""
"_n: Mixed CD (1 track and %1)\n"
"Mixed CD (%n tracks and %1)"
-msgstr "Змішаний КД (%n доріжка і %1)"
+msgstr ""
+"Змішаний КД (одна доріжка та %1)\n"
+"Змішаний КД (%n доріжки та %1)\n"
+"Змішаний КД (%n доріжок та %1)"
#: k3bstatusbarmanager.cpp:216
-#, fuzzy, c-format
+#, c-format
msgid ""
"_n: Video CD (1 track)\n"
"Video CD (%n tracks)"
-msgstr "Відео-КД (%n доріжка)"
+msgstr ""
+"Відео-КД (одна доріжка)\n"
+"Відео-КД (%n доріжки)\n"
+"Відео-КД (%n доріжок)"
#: k3bstatusbarmanager.cpp:222
msgid "eMovix CD (%1)"
@@ -1665,7 +1672,7 @@ msgid ""
"_n: 1 problem\n"
"%n problems"
msgstr ""
-"%n проблема\n"
+"одна проблема\n"
"%n проблеми\n"
"%n проблем"
@@ -2157,10 +2164,10 @@ msgid ""
"certain writer. In this case one may select the application manually."
msgstr ""
"<p>Для запису КД або DVD K3b застосовує засоби командного рядка cdrecord, "
-"growisofs та cdrdao. <p>Зазвичай, K3b автоматично вибирає найкращу програму "
-"для для певного завдання, але в деяких випадках, можливо, що одна з програм "
-"не працює належним чином з певним пристроєм запису. В цьому випадку можна "
-"вибрати програму вручну."
+"growisofs та cdrdao. <p>Зазвичай, K3b автоматично обирає найкращу програму "
+"для певного завдання, але в деяких випадках, можливо, що одна з програм не "
+"працює належним чином з певним пристроєм запису. В цьому випадку можна "
+"обрати програму вручну."
#: k3bwriterselectionwidget.cpp:262 projects/k3bdataurladdingdialog.cpp:440
#: projects/k3bdataurladdingdialog.cpp:676
@@ -2873,7 +2880,7 @@ msgid ""
"_n: %n track\n"
"%n tracks"
msgstr ""
-"%n доріжка\n"
+"одна доріжка\n"
"%n доріжки\n"
"%n доріжок"
@@ -3399,7 +3406,7 @@ msgstr ""
#: option/k3bexternalbinwidget.cpp:234
msgid " (not found)"
-msgstr "(не знайдено)"
+msgstr " (не знайдено)"
#: option/k3bmiscoptiontab.cpp:50
msgid "Load the K3b Defaults at dialog startup."
@@ -3598,7 +3605,7 @@ msgid ""
"_n: 1 track (%1 minutes)\n"
"%n tracks (%1 minutes)"
msgstr ""
-"%n доріжка (%1 хв)\n"
+"одна доріжка (%1 хв)\n"
"%n доріжки (%1 хв)\n"
"%n доріжок (%1 хв)"
@@ -3644,7 +3651,6 @@ msgstr ""
"записуванні за допомогою cdrdao."
#: projects/k3baudioburndialog.cpp:301
-#, fuzzy
msgid ""
"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
"uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/"
@@ -3653,8 +3659,9 @@ msgid ""
msgstr ""
"<p><b>Не встановлена зовнішня програма <em>normalize</em>.</b><p>K3b вживає "
"<em>normalize</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) для "
-"нормалізації звукових доріжок. Будь ласка, спочатку встановіть цю програму, "
-"щоб мати доступ до цієї функціональності."
+"нормалізації звукових доріжок. Будь ласка, спочатку встановіть цю програму "
+"щоб мати доступ до цієї функціональності. (sudo apt-get install normalize-"
+"audio)"
#: projects/k3baudioburndialog.cpp:308 projects/k3baudioburndialog.cpp:327
#: projects/k3bmixedburndialog.cpp:318 projects/k3bmixedburndialog.cpp:337
@@ -3774,7 +3781,7 @@ msgstr "Пошук"
#: projects/k3baudiotrackplayer.cpp:147
msgid "Previous"
-msgstr "Попередн."
+msgstr "Попереднє"
#: projects/k3baudiotrackplayer.cpp:187
msgid "Playing track %1: %2 - %3"
@@ -4354,11 +4361,11 @@ msgstr "Почати багатосеансовий запис"
#: projects/k3bdatamultisessioncombobox.cpp:79
msgid "Continue Multisession "
-msgstr "Продовжити багатосеансовий запис"
+msgstr "Продовжити багатосеансовий запис "
#: projects/k3bdatamultisessioncombobox.cpp:80
msgid "Finish Multisession "
-msgstr "Закінчити багатосеансовий запис"
+msgstr "Закінчити багатосеансовий запис "
#: projects/k3bdatapropertiesdialog.cpp:45
msgid "File Properties"
@@ -4396,7 +4403,7 @@ msgid ""
"_n: in 1 file\n"
"in %n files"
msgstr ""
-"в %n файлі\n"
+"в одному файлі\n"
"в %n файлах\n"
"в %n файлах"
@@ -4406,7 +4413,7 @@ msgid ""
"_n: and 1 directory\n"
"and %n directories"
msgstr ""
-"і %n каталозі\n"
+"і одному каталозі\n"
"і %n каталогах\n"
"і %n каталогах"
@@ -4817,7 +4824,7 @@ msgid ""
"_n: unused\n"
"%n minutes"
msgstr ""
-"%n хвилина\n"
+"не використано\n"
"%n хвилини\n"
"%n хвилин"
@@ -4929,17 +4936,17 @@ msgstr ""
"програвати доріжки з даними."
#: projects/k3bmixedburndialog.cpp:311
-#, fuzzy
msgid ""
"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
"uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/"
"normalize/) to normalize audio tracks. In order to use this functionality, "
"please install it first (sudo apt-get install normalize-audio."
msgstr ""
-"<p><b>Не встановлена зовнішня програма <em>normalize</em>.</b><p>K3b вживає "
-"<em>normalize</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) для "
-"нормалізації звукових доріжок. Будь ласка, спочатку встановіть цю програму, "
-"щоб мати доступ до цієї функціональності."
+"<p><b>Не встановлена зовнішня програма <em>normalize-audio</em>.</b><p>K3b "
+"вживає <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/"
+"normalize/) для нормалізації звукових доріжок. Будь ласка, спочатку "
+"встановіть цю програму щоб мати доступ до цієї функціональності (sudo apt-"
+"get install normalize-audio)."
#: projects/k3bmixeddirtreeview.cpp:45
msgid "Audio Tracks"
@@ -4959,7 +4966,7 @@ msgid ""
"_n: 1 file (%1)\n"
"%n files (%1)"
msgstr ""
-"%n файл (%1)\n"
+"один файл (%1)\n"
"%n файли (%1)\n"
"%n файлів (%1)"
@@ -5087,7 +5094,7 @@ msgid ""
"_n: 1 MPEG (%1)\n"
"%n MPEGs (%1)"
msgstr ""
-"%n файл MPEG (%1)\n"
+"один файл MPEG (%1)\n"
"%n файли MPEG (%1)\n"
"%n файлів MPEG (%1)"
@@ -6008,13 +6015,13 @@ msgstr "&Властивості"
msgid "Open the properties dialog"
msgstr "Відкрити вікно властивостей"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
-msgstr ""
+msgstr "Режим теки не підтримується для віддалених розміщень."
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
-msgstr ""
+msgstr "Сховок KOffice"
#: rip/k3baudiocdlistview.cpp:36
msgid "Artist"
@@ -6169,7 +6176,7 @@ msgid ""
"_n: 1 track (%1)\n"
"%n tracks (%1)"
msgstr ""
-"%n доріжка (%1)\n"
+"одна доріжка (%1)\n"
"%n доріжки (%1)\n"
"%n доріжок (%1)"
@@ -6277,7 +6284,7 @@ msgid ""
"_n: 1 track (encoding to %1)\n"
"%n tracks (encoding to %1)"
msgstr ""
-"%n доріжка (кодування в %1)\n"
+"одна доріжка (кодування в %1)\n"
"%n доріжки (кодування в %1)\n"
"%n доріжок (кодування в %1)"
@@ -6287,7 +6294,7 @@ msgid ""
"_n: 1 track\n"
"%n tracks"
msgstr ""
-"%n доріжка\n"
+"одна доріжка\n"
"%n доріжки\n"
"%n доріжок"
@@ -6742,7 +6749,7 @@ msgid ""
"_n: 1 title from %1\n"
"%n titles from %1"
msgstr ""
-"%n заголовок з %1\n"
+"один заголовок з %1\n"
"%n заголовки з %1\n"
"%n заголовків з %1"
@@ -6798,7 +6805,7 @@ msgid ""
"_n: Transcoding %n title to %1/%2\n"
"Transcoding %n titles to %1/%2"
msgstr ""
-"Перекодовування %n заголовка у %1/%2\n"
+"Перекодовування одного заголовку у %1/%2\n"
"Перекодовування %n заголовків у %1/%2\n"
"Перекодовування %n заголовків у %1/%2"
@@ -6856,7 +6863,7 @@ msgid ""
"_n: %n chapter\n"
"%n chapters"
msgstr ""
-"%n розділ\n"
+"один розділ\n"
"%n розділи\n"
"%n розділів"
@@ -6929,7 +6936,7 @@ msgid ""
"_n: %n title\n"
"%n titles"
msgstr ""
-"%n заголовок\n"
+"один заголовок\n"
"%n заголовки\n"
"%n заголовків"
@@ -7092,19 +7099,23 @@ msgstr "Не вдалось встановити параметри (%1)."
msgid "Alsa device:"
msgstr "Пристрій alsa:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr "WavPack"
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr "Мавпяче Аудіо (APE)"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "AAC (Advanced Audio Coding)"
@@ -7404,7 +7415,7 @@ msgstr "AIFF"
#: ../plugins/encoder/sox/k3bsoxencoder.cpp:312
msgid "Audio Visual Research"
-msgstr "Audio Visual Research"
+msgstr "Аудіо Візуальний Винахід"
#: ../plugins/encoder/sox/k3bsoxencoder.cpp:314
msgid "CD-R"
@@ -8163,12 +8174,12 @@ msgstr ""
"наприклад, про виконавця або назву КД.\n"
"<p>CD-Text це розширення стандарту аудіо-КД, що було введене компанією "
"Sony.\n"
-"<p>CD-TEXT буде використовуватись тільки на програвачах КД, які підтримують "
-"це розширення (в основному, автомобільні програвачі КД).\n"
+"<p>CD-Text буде використовуватись лише на програвачах КД, які підтримують це "
+"розширення (в основному, автомобільні програвачі КД) та програмне "
+"забезпечення на кшталт K3b звісно.\n"
"<p>Оскільки КД з CD-Text будуть працювати у будь-якому Hifi CD або DVD "
"програвачі, навіть якщо він не підтримує CD-Text повністю, варто ввімкнути "
-"цю функціональність\n"
-"(але не забудьте ввести інформацію для CD-Text)."
+"цю функціональність (але не забудьте ввести інформацію для CD-Text)."
#: projects/base_k3baudiocdtextwidget.ui:65
#, no-c-format
@@ -8206,7 +8217,7 @@ msgid "Preemph&asis"
msgstr "Попередня &корекція"
#: projects/base_k3baudiotrackwidget.ui:207
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"<p>Preemphasis is mainly used in audio processing. Higher frequencies in "
"audio Q_SIGNALS usually have lower amplitudes. This can lead to bad signal "
@@ -8215,12 +8226,11 @@ msgid ""
"transmission (preemphasis); the receiver will then weaken them accordingly "
"for playback."
msgstr ""
-"<p>Попередня корекція в основному використовується під час опрацювання "
-"аудіо. Вищі частоти в звукових сигналах переважно мають нижчі амплітуди. Це "
-"може спричиняти зниження якості сигналу, оскільки високі частоти можуть "
-"занадто ослабнути. Щоб уникнути цього, високі частоти підсилюються перед "
-"передачею (preemphasis); потім отримувач відповідно послабить їх для "
-"програвання."
+"<p>Preemphasis переважно використовується під час опрацювання аудіо. Вищі "
+"частоти в звукових сигналах за звичай мають нижчі амплітуди. Це може "
+"спричиняти зниження якості сигналу оскільки високі частоти можуть занадто "
+"ослабнути. Щоб уникнути цього, високі частоти підсилюються перед передачею "
+"(preemphasis); потім отримувач відповідно послабить їх для програвання."
#: projects/base_k3baudiotrackwidget.ui:215
#, no-c-format
@@ -9153,17 +9163,12 @@ msgstr "Замінити всі п&ропуски на:"
msgid "&2-pass encoding"
msgstr "&2-прохідне кодування"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr "Дозволити кодування за 2 проходи"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -9182,17 +9187,17 @@ msgstr ""
"частотою вибірки даних з нижчою якістю.\n"
"<p>Двопрохідне кодування збільшує час кодування вдвічі."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "Автоматичне обрізання &відео"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "Автоматично виявлити чорну рамку відео"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -9214,22 +9219,17 @@ msgstr ""
"<p>Хоча цей метод дуже надійний, він може призвести до проблем, якщо "
"матеріал джерела дуже короткий або темний."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "Передискретизувати у &44.1 КГц"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "Змінити частоту дискретизації аудіопотоку до 44.1 КГц"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -9243,7 +9243,7 @@ msgstr ""
"<p>Якщо цей параметр увімкнено, K3b змінить частоту дискретизації аудіо "
"потоку на 44100 Гц."
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr "Низький п&ріоритет процесу перекодування відео"
@@ -9845,7 +9845,6 @@ msgstr ""
"що вони означають. K3b може автоматично вибрати відповідні значення.</p>\n"
#: tips:17
-#, fuzzy
msgid ""
"<p>...that K3b has two types of settings. On the one hand K3b has settings "
"like most\n"
@@ -9863,17 +9862,16 @@ msgid ""
msgstr ""
"<p>...що K3b має два типи параметрів. По-перше, K3b має параметри як і "
"більшість програм\n"
-"TDE, які доступні через вікно налаштування з меню параметрів. По-друге, всі "
-"вікна дій K3b\n"
+"TDE, які доступні через вікно налаштування з меню параметрів; по-друге, всі "
+"діалогові вікна K3b\n"
"мають три кнопки для завантаження і збереження типових параметрів для певної "
"дії.\n"
-"Таким чином можна, наприклад, вказати типові параметри для копіювання КД. "
-"Потім ці параметри\n"
-"будуть завантажені при кожному відкритті вікна копіювання КД. "
-"Кнопка<em>Типові параметри K3b</em>\n"
-"буде відновлювати <em>стандартні параметри</em>, якщо ви не впевнені у "
-"правильності\n"
-"вибраних вами параметрів.</p>\n"
+"Таким чином можна, наприклад, вказати типові параметри для копіювання КД: "
+"потім ці типові\n"
+"параметри буде завантажено при кожному відкритті вікна копіювання КД.\n"
+"Кнопка<em>Типові параметри K3b</em> буде відновлювати <em>параметри "
+"розробника</em>,\n"
+"якщо ви не впевнені у правильності вибраних вами параметрів.</p>\n"
#: tips:29
msgid ""
@@ -9896,12 +9894,11 @@ msgid ""
"the possibility to rip these tracks to any format supported by K3b (like mp3 "
"or Ogg-Vorbis).</p>\n"
msgstr ""
-"<p>Просто клацніть лівою кнопкою мишки на один з ваших пристроїв у дереві "
-"пристроїв та файлів і\n"
-"побачите що станеться. K3b відкриває певне вікно залежно від вмісту носія. "
-"Наприклад, для аудіо-КД\n"
-"буде показано список доріжок, які можна видерти в будь-якому форматі, що "
-"підтримується програмою K3b\n"
+"<p>Просто клацніть лівою кнопкою миші на одному з ваших пристроїв у дереві "
+"пристроїв та файлів і побачите що станеться.\n"
+"K3b відкриває певне вікно залежно від вмісту носія. Наприклад, для аудіо-КД "
+"буде показано список доріжок,\n"
+"які можна видерти в будь-якому форматі, що підтримується програмою K3b "
"(напр., mp3 або Ogg-Vorbis).</p>\n"
#: tips:44
@@ -9916,6 +9913,9 @@ msgstr ""
"записати на певний носій, просто вставте його і зачекайте поки K3b виявить "
"його. Він з'явиться як ваш носій для записування.</p>\n"
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Зберегти все"
diff --git a/uk/messages/libk3b.po b/uk/messages/libk3b.po
index c121f94..6b717e4 100644
--- a/uk/messages/libk3b.po
+++ b/uk/messages/libk3b.po
@@ -2,39 +2,36 @@
#
# Ivan Petrouchtchak <iip@telus.net>, 2004, 2005.
# Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>, 2005, 2006, 2007.
+# Roman Savochenko <roman@oscada.org>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: libk3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2007-09-16 16:18-0700\n"
-"Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
-"Language-Team: Ukrainian <translation@linux.org.ua>\n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: 2021-10-07 07:30+0000\n"
+"Last-Translator: Roman Savochenko <roman@oscada.org>\n"
+"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/k3b-lib/uk/>\n"
"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.8.1\n"
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1: 2);\n"
+"10<=4 && (n%100<10 || n%100>=20) ? 1: 2);\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
-msgstr "Іван Петрущак"
+msgstr "Іван Петрущак,Роман Савоченко"
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
-msgstr "rysin@kde.org,ivanpetrouchtchak@yahoo.com"
+msgstr "rysin@kde.org,ivanpetrouchtchak@yahoo.com,roman@oscada.org"
#: cddb/k3bcddb.cpp:237
msgid "Found freedb entry."
@@ -214,7 +211,7 @@ msgid ""
"_n: %n copy successfully created\n"
"%n copies successfully created"
msgstr ""
-"Успішно створено %n копію\n"
+"Успішно створено копію\n"
"Успішно створено %n копії\n"
"Успішно створено %n копій"
@@ -234,7 +231,7 @@ msgid ""
"_n: - %n Copy\n"
" - %n Copies"
msgstr ""
-" - %n копія\n"
+"- Одна Копія\n"
" - %n копії\n"
" - %n копій"
@@ -523,8 +520,8 @@ msgid ""
"_n: Creating 1 copy\n"
"Creating %n copies"
msgstr ""
-"Створення %n копії\n"
-"Створення %n копій\n"
+"Створення копії\n"
+"Створення %n копій\n"
"Створення %n копій"
#: jobs/k3bcdda2wavreader.cpp:98 jobs/k3bclonejob.cpp:88
@@ -640,9 +637,9 @@ msgid ""
"_n: Creating 1 clone copy\n"
"Creating %n clone copies"
msgstr ""
-"Створення %n копії клона\n"
-"Створення %n копій клона\n"
-"Створення %n копій клона"
+"Створення копії клону\n"
+"Створення %n копій клону\n"
+"Створення %n копій клону"
#: jobs/k3bdatatrackreader.cpp:139
msgid "Unable to open libdvdcss."
@@ -684,7 +681,7 @@ msgid ""
"_n: Ignored %n erroneous sector.\n"
"Ignored a total of %n erroneous sectors."
msgstr ""
-"Пропущено %n помилковий сектор.\n"
+"Пропущено помилковий сектор.\n"
"Пропущено %n помилкові сектори.\n"
"Пропущено %n помилкових секторів."
@@ -867,7 +864,7 @@ msgstr "Режим обмеженого перезапису неможливи
#: jobs/k3bdvdcopyjob.cpp:842 projects/datadvd/k3bdvdjob.cpp:274
#: projects/datadvd/k3bdvdjob.cpp:289
msgid "Writing %1 in DAO mode."
-msgstr "Запис в ре%1жимі DAO."
+msgstr "Запис %1 в режимі DAO."
#: jobs/k3bdvdcopyjob.cpp:846 projects/datadvd/k3bdvdjob.cpp:297
msgid "Writing %1 in incremental mode."
@@ -1119,9 +1116,8 @@ msgid "Checking medium"
msgstr "Перевірка носія"
#: jobs/k3bverificationjob.cpp:205
-#, fuzzy
msgid "Internal Error: Verification job improperly initialized (%1)"
-msgstr "Внутрішня помилка: неправильно започатковане завдання перевірки"
+msgstr "Внутрішня помилка: Неправильно започатковане завдання перевірки (%1)"
#: jobs/k3bverificationjob.cpp:239
#, c-format
@@ -1203,7 +1199,7 @@ msgstr "Вилучення незавершеного відеофайла \"%1\
#: jobs/k3bvideodvdtitletranscodingjob.cpp:453
msgid "Execution of %1 failed."
-msgstr "Помилка виконання: %1"
+msgstr "Помилка виконання %1."
#: jobs/k3bvideodvdtitletranscodingjob.cpp:454
msgid "Please consult the debugging output for details."
@@ -1235,9 +1231,9 @@ msgid ""
"codecs used these days. Its subproject libavcodec forms the basis for "
"multimedia players such as xine or mplayer."
msgstr ""
-"FFmpeg - це проект з відкритим кодом, який намагається підтримувати "
-"більшість сучасних відео- і аудіокодеків. Його підпроект - libavcodec - "
-"складає основу програвачів таких мультимедії, як xine і mplayer."
+"FFmpeg це проект з відкритим кодом, який намагається підтримувати більшість "
+"сучасних відео та аудіокодеків. Його підпроект libavcodec складає основу "
+"програвачів таких мультимедії, як xine та mplayer."
#: jobs/k3bvideodvdtitletranscodingjob.cpp:517
msgid ""
@@ -1500,7 +1496,7 @@ msgid ""
"_n: 1 track (%1 minutes)\n"
"%n tracks (%1 minutes)"
msgstr ""
-"%n доріжка (%1 хв)\n"
+"одна доріжка (%1 хв)\n"
"%n доріжки (%1 хв)\n"
"%n доріжок (%1 хв)"
@@ -1513,19 +1509,17 @@ msgid ""
"_n: - %n copy\n"
" - %n copies"
msgstr ""
-" - %n копія\n"
+"- одна копія\n"
" - %n копії\n"
" - %n копій"
#: projects/audiocd/k3baudionormalizejob.cpp:58
-#, fuzzy
msgid "Could not find normalize-audio executable."
-msgstr "Не вдалось знайти програму нормалізації."
+msgstr "Не вдалось знайти програму нормалізації аудіо."
#: projects/audiocd/k3baudionormalizejob.cpp:86
-#, fuzzy
msgid "Could not start normalize-audio."
-msgstr "Не вдалось запустити нормалізацію."
+msgstr "Не вдалось запустити normalize-audio."
#: projects/audiocd/k3baudionormalizejob.cpp:126
msgid "Track %1 is already normalized."
@@ -1635,7 +1629,7 @@ msgid ""
"_n: ISO9660 Filesystem (Size: %1) - %n copy\n"
"ISO9660 Filesystem (Size: %1) - %n copies"
msgstr ""
-"Файлова система ISO-9660 (розмір: %1) - %n копія\n"
+"Файлова система ISO-9660 (розмір: %1) - одна копія\n"
"Файлова система ISO-9660 (розмір: %1) - %n копії\n"
"Файлова система ISO-9660 (розмір: %1) - %n копій"
@@ -2125,7 +2119,7 @@ msgstr "Cdrecord %1 не підтримує перезапис диска."
#: projects/k3bcdrecordwriter.cpp:352
msgid "Starting %1 simulation at %2x speed..."
-msgstr "Починається симуляція в режимі на%1 швидкості %2x..."
+msgstr "Починається %1 симуляція на швидкості %2x..."
#: projects/k3bcdrecordwriter.cpp:359
msgid "Starting %1 writing at %2x speed..."
@@ -2217,7 +2211,7 @@ msgid ""
"_n: Burnfree was used 1 time.\n"
"Burnfree was used %n times."
msgstr ""
-"Burnfree було використано %n раз.\n"
+"Burnfree було використано одного разу.\n"
"Burnfree було використано %n рази.\n"
"Burnfree було використано %n разів."
@@ -2227,7 +2221,7 @@ msgid ""
"_n: Buffer was low 1 time.\n"
"Buffer was low %n times."
msgstr ""
-"Буфер був низьким %n раз.\n"
+"Буфер був низьким одного разу.\n"
"Буфер був низьким %n рази.\n"
"Буфер був низьким %n разів."
@@ -2687,7 +2681,7 @@ msgid ""
"_n: 1 file (%1) and about 8 MB eMovix data\n"
"%n files (%1) and about 8 MB eMovix data"
msgstr ""
-"%n файл (%1) і приблизно 8 МБ даних eMovix\n"
+"один файл (%1) і приблизно 8 МБ даних eMovix\n"
"%n файли (%1) і приблизно 8 МБ даних eMovix\n"
"%n файлів (%1) і приблизно 8 МБ даних eMovix"
@@ -2869,7 +2863,7 @@ msgid ""
"_n: 1 MPEG (%1)\n"
"%n MPEGs (%1)"
msgstr ""
-"%n файл MPEG (%1)\n"
+"один файл MPEG (%1)\n"
"%n файли MPEG (%1)\n"
"%n файлів MPEG (%1)"
diff --git a/uk/messages/libk3bdevice.po b/uk/messages/libk3bdevice.po
index e9e1604..6af345f 100644
--- a/uk/messages/libk3bdevice.po
+++ b/uk/messages/libk3bdevice.po
@@ -3,34 +3,36 @@
#
# Ivan Petrouchtchak <iip@telus.net>, 2004, 2005.
# Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>, 2006, 2007.
+# Roman Savochenko <roman@oscada.org>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: libk3bdevice\n"
"POT-Creation-Date: 2020-05-11 04:18+0200\n"
-"PO-Revision-Date: 2007-01-31 22:35-0800\n"
-"Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
-"Language-Team: Ukrainian <translation@linux.org.ua>\n"
+"PO-Revision-Date: 2021-10-07 07:30+0000\n"
+"Last-Translator: Roman Savochenko <roman@oscada.org>\n"
+"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/k3b-device/uk/>\n"
"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.8.1\n"
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1: 2);\n"
+"10<=4 && (n%100<10 || n%100>=20) ? 1: 2);\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
-msgstr ""
+msgstr "Роман Савоченко"
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
-msgstr ""
+msgstr "roman@oscada.org"
#: k3bdeviceglobals.cpp:30 k3bdeviceglobals.cpp:153
msgid "CD-R"
@@ -142,19 +144,19 @@ msgstr "Обмежений перезапис"
#: k3bdeviceglobals.cpp:95
msgid "Layer Jump"
-msgstr "Layer Jump"
+msgstr "Стрибок Шару"
#: k3bdeviceglobals.cpp:98
msgid "Random Recording"
-msgstr "Випадковий запис"
+msgstr "Випадковий Запис"
#: k3bdeviceglobals.cpp:100
msgid "Sequential Recording"
-msgstr "Послідовний запис"
+msgstr "Послідовний Запис"
#: k3bdeviceglobals.cpp:102
msgid "Sequential Recording + POW"
-msgstr "Послідовний запис + POW"
+msgstr "Послідовний Запис + POW"
#: k3bdeviceglobals.cpp:105
msgid "None"
@@ -170,35 +172,35 @@ msgstr "Немає носія"
#: k3bdeviceglobals.cpp:125
msgid "DVD-R Sequential"
-msgstr "DVD-R Sequential"
+msgstr "DVD-R Послідовний"
#: k3bdeviceglobals.cpp:128
msgid "DVD-R Dual Layer"
-msgstr "DVD-R Dual Layer"
+msgstr "DVD-R Подвійно Шаровий"
#: k3bdeviceglobals.cpp:130
msgid "DVD-R Dual Layer Sequential"
-msgstr "DVD-R Dual Layer Sequential"
+msgstr "DVD-R Подвійно Шаровий Послідовний"
#: k3bdeviceglobals.cpp:132
msgid "DVD-R Dual Layer Jump"
-msgstr "DVD-R Dual Layer Jump"
+msgstr "DVD-R Подвійний Стрибок Шару"
#: k3bdeviceglobals.cpp:139
msgid "DVD-RW Restricted Overwrite"
-msgstr "DVD-RW Restricted Overwrite"
+msgstr "DVD-RW Обмеженого Перезапису"
#: k3bdeviceglobals.cpp:141
msgid "DVD-RW Sequential"
-msgstr "DVD-RW Sequential"
+msgstr "DVD-RW Послідовний"
#: k3bdeviceglobals.cpp:147
msgid "DVD+RW Dual Layer"
-msgstr "DVD+RW Dual Layer"
+msgstr "DVD+RW Подвійно Шаровий"
#: k3bdeviceglobals.cpp:149
msgid "DVD+R Dual Layer"
-msgstr "DVD+R Dual Layer"
+msgstr "DVD+R Подвійно Шаровий"
#: k3bdeviceglobals.cpp:168
msgid "BD-R Sequential (SRM)"
diff --git a/uz/Makefile.am b/uz/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/uz/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/uz/messages/Makefile.am b/uz/messages/Makefile.am
deleted file mode 100644
index 54c4841..0000000
--- a/uz/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = uz
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/uz/messages/k3b.po b/uz/messages/k3b.po
index 761bc00..0e3843c 100644
--- a/uz/messages/k3b.po
+++ b/uz/messages/k3b.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-04-08 19:41+0200\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -5593,11 +5593,11 @@ msgstr "Xossa&lari"
msgid "Open the properties dialog"
msgstr "Xossalar oynasini ochish"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6569,19 +6569,23 @@ msgstr ""
msgid "Alsa device:"
msgstr "Alsa uskunasi:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "Qoʻshimcha audio/video moslamalar"
@@ -8449,17 +8453,12 @@ msgstr ""
msgid "&2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8471,17 +8470,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8494,22 +8493,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr ""
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8519,7 +8513,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9061,6 +9055,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Hammasini saqlash"
diff --git a/uz@cyrillic/Makefile.am b/uz@cyrillic/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/uz@cyrillic/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/uz@cyrillic/messages/Makefile.am b/uz@cyrillic/messages/Makefile.am
deleted file mode 100644
index fa93c3b..0000000
--- a/uz@cyrillic/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = uz@cyrillic
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/uz@cyrillic/messages/k3b.po b/uz@cyrillic/messages/k3b.po
index 59affc1..12b83c2 100644
--- a/uz@cyrillic/messages/k3b.po
+++ b/uz@cyrillic/messages/k3b.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-04-08 19:41+0200\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -5581,11 +5581,11 @@ msgstr "Хосса&лари"
msgid "Open the properties dialog"
msgstr "Хоссалар ойнасини очиш"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6556,19 +6556,23 @@ msgstr ""
msgid "Alsa device:"
msgstr "Alsa ускунаси:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "Қўшимча аудио/видео мосламалар"
@@ -8435,17 +8439,12 @@ msgstr ""
msgid "&2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, no-c-format
msgid "Enable 2-pass encoding"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8457,17 +8456,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8480,22 +8479,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr ""
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8505,7 +8499,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9047,6 +9041,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "Ҳаммасини сақлаш"
diff --git a/zh_CN/Makefile.am b/zh_CN/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/zh_CN/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/zh_CN/messages/Makefile.am b/zh_CN/messages/Makefile.am
deleted file mode 100644
index b5f72f3..0000000
--- a/zh_CN/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = zh_CN
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/zh_CN/messages/k3b.po b/zh_CN/messages/k3b.po
index e1bf2c5..904ee39 100644
--- a/zh_CN/messages/k3b.po
+++ b/zh_CN/messages/k3b.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: k3b 0.12\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2007-04-26 11:12+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -5384,11 +5384,11 @@ msgstr "属性(&P)"
msgid "Open the properties dialog"
msgstr "打开属性对话框"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6364,19 +6364,23 @@ msgstr "无法设定参数(%1)。"
msgid "Alsa device:"
msgstr "Alsa 设备:"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MP3"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
msgid "Advanced Audio Coding (AAC)"
msgstr "高级音频编码(AAC)"
@@ -8213,17 +8217,12 @@ msgstr "将全部空白替换为(&B):"
msgid "&2-pass encoding"
msgstr "两遍编码(&2)"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "快速编码"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8235,17 +8234,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, no-c-format
msgid "Automatic &Video Clipping"
msgstr "自动提取视频(&V)"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "自动检测视频的黑框"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8258,22 +8257,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "音频重新采样到 &44.1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr ""
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr "将音频流的采样率更改为 44.1 KHz"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8283,7 +8277,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -8825,6 +8819,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MP3"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "全部保存"
diff --git a/zh_TW/Makefile.am b/zh_TW/Makefile.am
deleted file mode 100644
index b9efc84..0000000
--- a/zh_TW/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS= messages
diff --git a/zh_TW/messages/Makefile.am b/zh_TW/messages/Makefile.am
deleted file mode 100644
index c37fe4d..0000000
--- a/zh_TW/messages/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = zh_TW
-SUBDIRS = $(AUTODIRS)
-POFILES = AUTO
diff --git a/zh_TW/messages/k3b.po b/zh_TW/messages/k3b.po
index 1917363..818c614 100644
--- a/zh_TW/messages/k3b.po
+++ b/zh_TW/messages/k3b.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: K3b 0.10\n"
-"POT-Creation-Date: 2020-05-11 04:18+0200\n"
+"POT-Creation-Date: 2022-09-10 18:30+0000\n"
"PO-Revision-Date: 2006-03-29 10:31+0800\n"
"Last-Translator: You-Cheng Hsieh <yochenhsieh@xuite.net>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -5567,11 +5567,11 @@ msgstr "內容(&P)"
msgid "Open the properties dialog"
msgstr "開啟內容對話窗"
-#: projects/kostore/koStore.cc:161
+#: projects/kostore/koStore.cpp:160
msgid "The directory mode is not supported for remote locations."
msgstr ""
-#: projects/kostore/koStore.cc:162
+#: projects/kostore/koStore.cpp:161
msgid "KOffice Storage"
msgstr ""
@@ -6593,19 +6593,23 @@ msgstr "無法設定配置:"
msgid "Alsa device:"
msgstr "重新掃瞄裝置"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:236
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:266
msgid "Windows Media v1"
msgstr "Windows Media v1"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:238
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:268
msgid "Windows Media v2"
msgstr "Windows Media v2"
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240
-msgid "MPEG 1 Layer III"
-msgstr "MPEG 1 Layer III"
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:270
+msgid "WavPack"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:272
+msgid "Monkey's Audio (APE)"
+msgstr ""
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:242
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:274
#, fuzzy
msgid "Advanced Audio Coding (AAC)"
msgstr "進階聲音/影像設定"
@@ -8462,17 +8466,12 @@ msgstr "取代空白為(&B):"
msgid "&2-pass encoding"
msgstr "&2-pass 編碼"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:591
-#, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:594
#, fuzzy, no-c-format
msgid "Enable 2-pass encoding"
msgstr "&2-pass 編碼"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:600
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:597
#, no-c-format
msgid ""
"<p>If this option is checked K3b encodes the video titles in two passes. The "
@@ -8484,17 +8483,17 @@ msgid ""
"<p>2-pass encoding results in a doubled encoding time."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:610
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:607
#, fuzzy, no-c-format
msgid "Automatic &Video Clipping"
msgstr "自動判別視訊的類型。"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:613
#, fuzzy, no-c-format
msgid "Automatically detect the black borders of the video"
msgstr "切除電影黑色的邊框"
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:619
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:616
#, no-c-format
msgid ""
"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
@@ -8507,22 +8506,17 @@ msgid ""
"material is exceptionally short or dark."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:629
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:626
#, no-c-format
msgid "Resample Audio to &44.1 KHz"
msgstr "重新取樣為 44.1 kHz"
#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:632
#, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
-
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:638
-#, no-c-format
msgid "Change the sample rate of the audio stream to 44.1 KHz"
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:641
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:635
#, no-c-format
msgid ""
"<p>Video DVD audio streams normally are encoded with a sampling rate of "
@@ -8532,7 +8526,7 @@ msgid ""
"stream to 44100 Hz."
msgstr ""
-#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:650
+#: rip/videodvd/base_k3bvideodvdrippingwidget.ui:644
#, no-c-format
msgid "Low s&cheduling priority for the video transcoding process"
msgstr ""
@@ -9075,6 +9069,9 @@ msgid ""
"as your burning medium.</p>\n"
msgstr ""
+#~ msgid "MPEG 1 Layer III"
+#~ msgstr "MPEG 1 Layer III"
+
#, fuzzy
#~ msgid "Save As"
#~ msgstr "儲存全部"
@@ -9199,46 +9196,9 @@ msgstr ""
#~ msgid "(c) 1999 - 2006, Sebastian Trüg"
#~ msgstr "(c) 1999 - 2003, Sebastian Trueg 和 K3b 團隊"
-#, fuzzy
-#~ msgid "Alt+O"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+N"
-#~ msgstr "Alt+2"
-
-#~ msgid "Alt+K"
-#~ msgstr "Alt+K"
-
-#, fuzzy
-#~ msgid "Alt+A"
-#~ msgstr "Alt+C"
-
-#~ msgid "Alt+C"
-#~ msgstr "Alt+C"
-
#~ msgid "Form1"
#~ msgstr "表格1"
-#, fuzzy
-#~ msgid "Alt+Y"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+D"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+J"
-#~ msgstr "Alt+2"
-
-#, fuzzy
-#~ msgid "Alt+U"
-#~ msgstr "Alt+2"
-
-#~ msgid "Alt+B"
-#~ msgstr "Alt+B"
-
#~ msgid "Load user default settings"
#~ msgstr "載入使用者預設的設定"
@@ -9425,10 +9385,6 @@ msgstr ""
#~ msgid "Double Layer DVD"
#~ msgstr "Double Layer DVD±R"
-#, fuzzy
-#~ msgid "Alt+M"
-#~ msgstr "Alt+2"
-
#~ msgid "DVD-RW and DVD+RW"
#~ msgstr "DVD-RW 和 DVD+RW"
@@ -9455,9 +9411,6 @@ msgstr ""
#~ msgid "K3b Defaults"
#~ msgstr "K3b 預設值"
-#~ msgid "Alt+V"
-#~ msgstr "Alt+V"
-
#~ msgid "%A/%T/%a - %t"
#~ msgstr "%A/%T/%a - %t"