Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2014-06-10 14:36:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ki18n (Old) and /work/SRC/openSUSE:Factory/.ki18n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ki18n" Changes: -------- --- /work/SRC/openSUSE:Factory/ki18n/ki18n.changes 2014-05-14 20:27:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ki18n.new/ki18n.changes 2014-06-10 14:36:17.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Jun 1 18:02:12 UTC 2014 - [email protected] + +- Update to 4.100.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta3.php +- Add baselibs.conf + +------------------------------------------------------------------- Old: ---- ki18n-4.99.0.tar.xz New: ---- baselibs.conf ki18n-4.100.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.ZSteb2/_old 2014-06-10 14:36:18.000000000 +0200 +++ /var/tmp/diff_new_pack.ZSteb2/_new 2014-06-10 14:36:18.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5I18n5 Name: ki18n -Version: 4.99.0 +Version: 4.100.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.13 +BuildRequires: extra-cmake-modules >= 0.0.14 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 @@ -32,7 +32,8 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source0: ki18n-%{version}.tar.xz +Source: http://download.kde.org/unstable/frameworks/%{version}/%{name}-%{version}.tar.xz +Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,6 +46,7 @@ Summary: KDE Gettext-based UI text internationalization Group: System/GUI/KDE Obsoletes: libKF5I18n4 +Recommends: %lname-lang = %{version} %description -n %lname KI18n provides functionality for internationalizing user interface text @@ -65,6 +67,7 @@ and translators can use the familiar Gettext tools and workflows. Development files. +%lang_package -n %lname %prep %setup -q @@ -76,10 +79,14 @@ %kf5_makeinstall -C build %fdupes -s %{buildroot} + %find_lang %{name}5 + %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig +%files -n %lname-lang -f %{name}5.lang + %files -n %lname %defattr(-,root,root) %doc COPYING* README* ++++++ baselibs.conf ++++++ libKF5I18n5 ki18n-devel requires "libKF5I18n5-<targettype> = <version>" ++++++ ki18n-4.99.0.tar.xz -> ki18n-4.100.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-4.99.0/CMakeLists.txt new/ki18n-4.100.0/CMakeLists.txt --- old/ki18n-4.99.0/CMakeLists.txt 2014-05-05 02:25:33.000000000 +0200 +++ new/ki18n-4.100.0/CMakeLists.txt 2014-06-01 14:19:13.000000000 +0200 @@ -3,7 +3,7 @@ project(KI18n) # ECM setup -find_package(ECM 0.0.13 REQUIRED NO_MODULE) +find_package(ECM 0.0.14 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) include(FeatureSummary) @@ -12,7 +12,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "4.99.0") # handled by release scripts +set(KF5_VERSION "4.100.0") # handled by release scripts ecm_setup_version( ${KF5_VERSION} @@ -38,11 +38,16 @@ PURPOSE "Needed for building KI18n unless glibc is the system libc implementation" ) +include(cmake/KF5I18NMacros.cmake) + remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_TO_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) add_definitions(-DTRANSLATION_DOMAIN=\"ki18n5\") +if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") + ki18n_install(po) +endif() add_subdirectory(src) add_subdirectory(autotests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-4.99.0/autotests/CMakeLists.txt new/ki18n-4.100.0/autotests/CMakeLists.txt --- old/ki18n-4.99.0/autotests/CMakeLists.txt 2014-05-05 02:25:33.000000000 +0200 +++ new/ki18n-4.100.0/autotests/CMakeLists.txt 2014-06-01 14:19:13.000000000 +0200 @@ -1,37 +1,29 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) -include(ECMMarkAsTest) +include(ECMAddTests) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Concurrent) -macro(KI18N_UNIT_TESTS) - foreach(_testname ${ARGN}) - add_executable(${_testname} ${_testname}.cpp testhelpers.cpp) - target_link_libraries(${_testname} Qt5::Test Qt5::Concurrent KF5::I18n) - add_test(ki18n-${_testname} ${_testname}) - ecm_mark_as_test(${_testname}) - endforeach() -endmacro() - -ki18n_unit_tests( - klocalizedstringtest - ktranscripttest +ecm_add_test(klocalizedstringtest.cpp + TEST_NAME "ki18n-klocalizedstringtest" + LINK_LIBRARIES Qt5::Test Qt5::Concurrent KF5::I18n ${LibIntl_LIBRARIES} ) +# klocalizedstringtest needs the libintl include path +target_include_directories(ki18n-klocalizedstringtest PRIVATE ${LibIntl_INCLUDE_DIRS}) +ecm_add_test(ktranscripttest.cpp testhelpers.cpp + TEST_NAME "ki18n-ktranscripttest" + LINK_LIBRARIES Qt5::Test KF5::I18n +) # ktranscripttest needs the path to ktranscript in the build dir: it cannot rely # on the installed version since it must be able to run *before* the plugin is # installed. -target_compile_definitions(ktranscripttest PRIVATE "KTRANSCRIPT_PATH=\"$<TARGET_FILE:ktranscript>\"") - -# klocalizedstringtest needs some additional libraries -target_include_directories(klocalizedstringtest PRIVATE ${LibIntl_INCLUDE_DIRS}) -target_link_libraries(klocalizedstringtest ${LibIntl_LIBRARIES}) +target_compile_definitions(ki18n-ktranscripttest PRIVATE "KTRANSCRIPT_PATH=\"$<TARGET_FILE:ktranscript>\"") # ktranscriptcleantest needs to directly compile ktranscript.cpp with an addition DEFINE - -add_executable(ktranscriptcleantest ktranscriptcleantest.cpp ../src/ktranscript.cpp ../src/common_helpers.cpp) -target_compile_definitions(ktranscriptcleantest PRIVATE "KTRANSCRIPT_TESTBUILD") -target_link_libraries(ktranscriptcleantest Qt5::Script Qt5::Test Qt5::Concurrent KF5::I18n) -target_include_directories(ktranscriptcleantest PRIVATE ..) -add_test(ki18n-ktranscriptcleantest ktranscriptcleantest) -ecm_mark_as_test(ktranscriptcleantest) +ecm_add_test(ktranscriptcleantest.cpp ../src/ktranscript.cpp ../src/common_helpers.cpp + TEST_NAME ki18n-ktranscriptcleantest + LINK_LIBRARIES Qt5::Script Qt5::Test Qt5::Concurrent KF5::I18n +) +target_compile_definitions(ki18n-ktranscriptcleantest PRIVATE "KTRANSCRIPT_TESTBUILD") +target_include_directories(ki18n-ktranscriptcleantest PRIVATE ..) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-4.99.0/autotests/klocalizedstringtest.cpp new/ki18n-4.100.0/autotests/klocalizedstringtest.cpp --- old/ki18n-4.99.0/autotests/klocalizedstringtest.cpp 2014-05-05 02:25:33.000000000 +0200 +++ new/ki18n-4.100.0/autotests/klocalizedstringtest.cpp 2014-06-01 14:19:13.000000000 +0200 @@ -491,7 +491,7 @@ } #include <QThreadPool> -#include <qtconcurrentrun.h> +#include <QtConcurrentRun> #include <QFutureSynchronizer> void KLocalizedStringTest::testThreads() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-4.99.0/cmake/KF5I18NMacros.cmake new/ki18n-4.100.0/cmake/KF5I18NMacros.cmake --- old/ki18n-4.99.0/cmake/KF5I18NMacros.cmake 2014-05-05 02:25:33.000000000 +0200 +++ new/ki18n-4.100.0/cmake/KF5I18NMacros.cmake 2014-06-01 14:19:13.000000000 +0200 @@ -90,10 +90,83 @@ get_filename_component(lang ${lang_dir} NAME) file(GLOB po_files "${lang_dir}/*.po") - gettext_process_po_files(${lang} ALL + _ki18n_gettext_process_po_files(${lang} ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${po_files} ) ki18n_install_ts_files(${lang} ${lang_dir}/scripts) endforeach() endfunction() + + +############################################################################### +# The following code has been copied from CMake FindGettext.cmake and adjusted +# to support processing multiple .po files with the same name in different +# directories. +# +# CMake bug report: http://public.kitware.com/Bug/view.php?id=14904 +# +# This code comes with the following license notice: +#============================================================================= +# Copyright 2007-2009 Kitware, Inc. +# Copyright 2007 Alexander Neundorf <[email protected]> +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +function(_KI18N_GETTEXT_PROCESS_PO_FILES _lang) + set(_options ALL) + set(_oneValueArgs INSTALL_DESTINATION) + set(_multiValueArgs PO_FILES) + set(_gmoFiles) + + CMAKE_PARSE_ARGUMENTS(_parsedArguments "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN}) + + foreach(_current_PO_FILE ${_parsedArguments_PO_FILES}) + get_filename_component(_name ${_current_PO_FILE} NAME) + string(REGEX REPLACE "^(.+)(\\.[^.]+)$" "\\1" _basename ${_name}) + set(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}-${_basename}.gmo) + add_custom_command(OUTPUT ${_gmoFile} + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_current_PO_FILE} + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + DEPENDS ${_current_PO_FILE} + ) + + if(_parsedArguments_INSTALL_DESTINATION) + install(FILES ${_gmoFile} DESTINATION ${_parsedArguments_INSTALL_DESTINATION}/${_lang}/LC_MESSAGES/ RENAME ${_basename}.mo) + endif() + list(APPEND _gmoFiles ${_gmoFile}) + endforeach() + + + if(NOT TARGET pofiles) + add_custom_target(pofiles) + endif() + + _KI18N_GETTEXT_GET_UNIQUE_TARGET_NAME( pofiles uniqueTargetName) + + if(_parsedArguments_ALL) + add_custom_target(${uniqueTargetName} ALL DEPENDS ${_gmoFiles}) + else() + add_custom_target(${uniqueTargetName} DEPENDS ${_gmoFiles}) + endif() + + add_dependencies(pofiles ${uniqueTargetName}) + +endfunction() + +function(_KI18N_GETTEXT_GET_UNIQUE_TARGET_NAME _name _unique_name) + set(propertyName "_KI18N_GETTEXT_UNIQUE_COUNTER_${_name}") + get_property(currentCounter GLOBAL PROPERTY "${propertyName}") + if(NOT currentCounter) + set(currentCounter 1) + endif() + set(${_unique_name} "${_name}_${currentCounter}" PARENT_SCOPE) + math(EXPR currentCounter "${currentCounter} + 1") + set_property(GLOBAL PROPERTY ${propertyName} ${currentCounter} ) +endfunction() +# End of CMake copied code #################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-4.99.0/po/gl/ki18n5.po new/ki18n-4.100.0/po/gl/ki18n5.po --- old/ki18n-4.99.0/po/gl/ki18n5.po 2014-05-05 02:25:33.000000000 +0200 +++ new/ki18n-4.100.0/po/gl/ki18n5.po 2014-06-01 14:19:13.000000000 +0200 @@ -14,9 +14,9 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-27 20:57+0000\n" -"PO-Revision-Date: 2014-01-06 15:27+0100\n" +"PO-Revision-Date: 2014-05-13 23:05+0200\n" "Last-Translator: Marce Villarino <[email protected]>\n" -"Language-Team: Galician <[email protected]>\n" +"Language-Team: Galician <[email protected]>\n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,7 +39,7 @@ #: kuitmarkup.cpp:297 msgctxt "shortcut-key-delimiter/rich" msgid "+" -msgstr "+" +msgstr "─" #. i18n: Decide which string is used to delimit elements in a GUI path #. (e.g. -> in "Go to Settings->Advanced->Core tab.") in plain text. @@ -64,201 +64,155 @@ #. - the proper quotes, those used in msgid are English-standard #. - the <i> and <b> tags, does your language script work well with them? #: kuitmarkup.cpp:715 -#, fuzzy, kde-format -#| msgctxt "@title/plain" -#| msgid "== %1 ==" +#, kde-format msgctxt "tag-format-pattern <title> plain" msgid "== %1 ==" msgstr "== %1 ==" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:720 -#, fuzzy, kde-format -#| msgctxt "@title/rich" -#| msgid "<h2>%1</h2>" +#, kde-format msgctxt "tag-format-pattern <title> rich" msgid "<h2>%1</h2>" msgstr "<h2>%1</h2>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:728 -#, fuzzy, kde-format -#| msgctxt "@subtitle/plain" -#| msgid "~ %1 ~" +#, kde-format msgctxt "tag-format-pattern <subtitle> plain" msgid "~ %1 ~" msgstr "~ %1 ~" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:733 -#, fuzzy, kde-format -#| msgctxt "@subtitle/rich" -#| msgid "<h3>%1</h3>" +#, kde-format msgctxt "tag-format-pattern <subtitle> rich" msgid "<h3>%1</h3>" msgstr "<h3>%1</h3>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:741 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, kde-format msgctxt "tag-format-pattern <para> plain" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:746 -#, fuzzy, kde-format -#| msgctxt "@shortcut/rich" -#| msgid "<b>%1</b>" +#, kde-format msgctxt "tag-format-pattern <para> rich" msgid "<p>%1</p>" -msgstr "<b>%1</b>" +msgstr "<p>%1</p>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:754 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, kde-format msgctxt "tag-format-pattern <list> plain" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:759 -#, fuzzy, kde-format -#| msgctxt "@item/rich" -#| msgid "<li>%1</li>" +#, kde-format msgctxt "tag-format-pattern <list> rich" msgid "<ul>%1</ul>" -msgstr "<li>%1</li>" +msgstr "<ul>%1</ul>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:767 -#, fuzzy, kde-format -#| msgctxt "@item/plain" -#| msgid " * %1" +#, kde-format msgctxt "tag-format-pattern <item> plain" msgid " * %1" msgstr " * %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:772 -#, fuzzy, kde-format -#| msgctxt "@item/rich" -#| msgid "<li>%1</li>" +#, kde-format msgctxt "tag-format-pattern <item> rich" msgid "<li>%1</li>" msgstr "<li>%1</li>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:779 -#, fuzzy, kde-format -#| msgctxt "@note/plain" -#| msgid "Note: %1" +#, kde-format msgctxt "tag-format-pattern <note> plain" msgid "Note: %1" msgstr "Nota: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:784 -#, fuzzy, kde-format -#| msgctxt "@note/rich" -#| msgid "<i>Note</i>: %1" +#, kde-format msgctxt "tag-format-pattern <note> rich" msgid "<i>Note</i>: %1" msgstr "<i>Nota</i>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:790 -#, fuzzy, kde-format -#| msgid "Re: %1" +#, kde-format msgctxt "" "tag-format-pattern <note label=> plain\n" "%1 is the text, %2 is the note label" msgid "%2: %1" -msgstr "Re: %1" +msgstr "%2: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:796 -#, fuzzy, kde-format -#| msgctxt "" -#| "@note-with-label/rich\n" -#| "%1 is the note label, %2 is the text" -#| msgid "<i>%1</i>: %2" +#, kde-format msgctxt "" "tag-format-pattern <note label=> rich\n" "%1 is the text, %2 is the note label" msgid "<i>%2</i>: %1" -msgstr "<i>%1</i>: %2" +msgstr "<i>%2</i>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:803 -#, fuzzy, kde-format -#| msgctxt "@warning/plain" -#| msgid "WARNING: %1" +#, kde-format msgctxt "tag-format-pattern <warning> plain" msgid "WARNING: %1" msgstr "AVISO: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:808 -#, fuzzy, kde-format -#| msgctxt "@warning/rich" -#| msgid "<b>Warning</b>: %1" +#, kde-format msgctxt "tag-format-pattern <warning> rich" msgid "<b>Warning</b>: %1" msgstr "<b>Aviso</b>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:814 -#, fuzzy, kde-format -#| msgid "Re: %1" +#, kde-format msgctxt "" "tag-format-pattern <warning label=> plain\n" "%1 is the text, %2 is the warning label" msgid "%2: %1" -msgstr "Re: %1" +msgstr "%2: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:820 -#, fuzzy, kde-format -#| msgctxt "" -#| "@warning-with-label/rich\n" -#| "%1 is the warning label, %2 is the text" -#| msgid "<b>%1</b>: %2" +#, kde-format msgctxt "" "tag-format-pattern <warning label=> rich\n" "%1 is the text, %2 is the warning label" msgid "<b>%2</b>: %1" -msgstr "<b>%1</b>: %2" +msgstr "<b>%2</b>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:827 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, kde-format msgctxt "tag-format-pattern <link> plain" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:832 -#, fuzzy, kde-format -#| msgctxt "" -#| "@link-with-description/rich\n" -#| "%1 is the URL, %2 is the descriptive text" -#| msgid "<a href=\"%1\">%2</a>" +#, kde-format msgctxt "tag-format-pattern <link> rich" msgid "<a href=\"%1\">%1</a>" -msgstr "<a href=\"%1\">%2</a>" +msgstr "<a href=\"%1\">%1</a>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:838 -#, fuzzy, kde-format -#| msgctxt "name of digit set with digit string, e.g. 'Arabic (0123456789)'" -#| msgid "%1 (%2)" +#, kde-format msgctxt "" "tag-format-pattern <link url=> plain\n" "%1 is the descriptive text, %2 is the URL" @@ -267,78 +221,58 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:844 -#, fuzzy, kde-format -#| msgctxt "" -#| "@link-with-description/rich\n" -#| "%1 is the URL, %2 is the descriptive text" -#| msgid "<a href=\"%1\">%2</a>" +#, kde-format msgctxt "" "tag-format-pattern <link url=> rich\n" "%1 is the descriptive text, %2 is the URL" msgid "<a href=\"%2\">%1</a>" -msgstr "<a href=\"%1\">%2</a>" +msgstr "<a href=\"%2\">%1</a>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:851 -#, fuzzy, kde-format -#| msgctxt "@filename/plain" -#| msgid "‘%1’" +#, kde-format msgctxt "tag-format-pattern <filename> plain" msgid "‘%1’" msgstr "«%1»" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:856 -#, fuzzy, kde-format -#| msgctxt "@filename/rich" -#| msgid "<tt>%1</tt>" +#, kde-format msgctxt "tag-format-pattern <filename> rich" msgid "<tt>%1</tt>" msgstr "<tt>%1</tt>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:863 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, kde-format msgctxt "tag-format-pattern <application> plain" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:868 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, kde-format msgctxt "tag-format-pattern <application> rich" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:875 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, kde-format msgctxt "tag-format-pattern <command> plain" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:880 -#, fuzzy, kde-format -#| msgctxt "@filename/rich" -#| msgid "<tt>%1</tt>" +#, kde-format msgctxt "tag-format-pattern <command> rich" msgid "<tt>%1</tt>" msgstr "<tt>%1</tt>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:886 -#, fuzzy, kde-format -#| msgctxt "" -#| "@command-with-section/plain\n" -#| "%1 is the command name, %2 is its man section" -#| msgid "%1(%2)" +#, kde-format msgctxt "" "tag-format-pattern <command section=> plain\n" "%1 is the command name, %2 is its man section" @@ -347,11 +281,7 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:892 -#, fuzzy, kde-format -#| msgctxt "" -#| "@command-with-section/rich\n" -#| "%1 is the command name, %2 is its man section" -#| msgid "<tt>%1(%2)</tt>" +#, kde-format msgctxt "" "tag-format-pattern <command section=> rich\n" "%1 is the command name, %2 is its man section" @@ -360,36 +290,28 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:899 -#, fuzzy, kde-format -#| msgctxt "@resource/plain" -#| msgid "“%1”" +#, kde-format msgctxt "tag-format-pattern <resource> plain" msgid "“%1”" msgstr "«%1»" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:904 -#, fuzzy, kde-format -#| msgctxt "@resource/plain" -#| msgid "“%1”" +#, kde-format msgctxt "tag-format-pattern <resource> rich" msgid "“%1”" msgstr "«%1»" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:911 -#, fuzzy, kde-format -#| msgctxt "@resource/plain" -#| msgid "“%1”" +#, kde-format msgctxt "tag-format-pattern <icode> plain" msgid "“%1”" msgstr "«%1»" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:916 -#, fuzzy, kde-format -#| msgctxt "@filename/rich" -#| msgid "<tt>%1</tt>" +#, kde-format msgctxt "tag-format-pattern <icode> rich" msgid "<tt>%1</tt>" msgstr "<tt>%1</tt>" @@ -402,131 +324,103 @@ "\n" "%1\n" msgstr "" +"\n" +"%1\n" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:928 -#, fuzzy, kde-format -#| msgctxt "@shortcut/rich" -#| msgid "<b>%1</b>" +#, kde-format msgctxt "tag-format-pattern <bcode> rich" msgid "<pre>%1</pre>" -msgstr "<b>%1</b>" +msgstr "<pre>%1</pre>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:935 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, kde-format msgctxt "tag-format-pattern <shortcut> plain" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:940 -#, fuzzy, kde-format -#| msgctxt "@shortcut/rich" -#| msgid "<b>%1</b>" +#, kde-format msgctxt "tag-format-pattern <shortcut> rich" msgid "<b>%1</b>" msgstr "<b>%1</b>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:947 -#, fuzzy, kde-format -#| msgctxt "@interface/plain" -#| msgid "|%1|" +#, kde-format msgctxt "tag-format-pattern <interface> plain" msgid "|%1|" msgstr "|%1|" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:952 -#, fuzzy, kde-format -#| msgctxt "@interface/rich" -#| msgid "<i>%1</i>" +#, kde-format msgctxt "tag-format-pattern <interface> rich" msgid "<i>%1</i>" msgstr "<i>%1</i>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:959 -#, fuzzy, kde-format -#| msgctxt "@emphasis/plain" -#| msgid "*%1*" +#, kde-format msgctxt "tag-format-pattern <emphasis> plain" msgid "*%1*" msgstr "*%1*" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:964 -#, fuzzy, kde-format -#| msgctxt "@interface/rich" -#| msgid "<i>%1</i>" +#, kde-format msgctxt "tag-format-pattern <emphasis> rich" msgid "<i>%1</i>" msgstr "<i>%1</i>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:969 -#, fuzzy, kde-format -#| msgctxt "@emphasis-strong/plain" -#| msgid "**%1**" +#, kde-format msgctxt "tag-format-pattern <emphasis-strong> plain" msgid "**%1**" msgstr "**%1**" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:974 -#, fuzzy, kde-format -#| msgctxt "@shortcut/rich" -#| msgid "<b>%1</b>" +#, kde-format msgctxt "tag-format-pattern <emphasis-strong> rich" msgid "<b>%1</b>" msgstr "<b>%1</b>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:981 -#, fuzzy, kde-format -#| msgctxt "@placeholder/plain" -#| msgid "<%1>" +#, kde-format msgctxt "tag-format-pattern <placeholder> plain" msgid "<%1>" msgstr "<%1>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:986 -#, fuzzy, kde-format -#| msgctxt "@placeholder/rich" -#| msgid "<<i>%1</i>>" +#, kde-format msgctxt "tag-format-pattern <placeholder> rich" msgid "<<i>%1</i>>" msgstr "<<i>%1</i>>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:993 -#, fuzzy, kde-format -#| msgctxt "@placeholder/plain" -#| msgid "<%1>" +#, kde-format msgctxt "tag-format-pattern <email> plain" msgid "<%1>" msgstr "<%1>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:998 -#, fuzzy, kde-format -#| msgctxt "@email/rich" -#| msgid "<<a href=\"mailto:%1\";>%1</a>>" +#, kde-format msgctxt "tag-format-pattern <email> rich" msgid "<<a href=\"mailto:%1\";>%1</a>>" msgstr "<<a href=\"mailto:%1\";>%1</a>>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1004 -#, fuzzy, kde-format -#| msgctxt "" -#| "@email-with-name/plain\n" -#| "%1 is name, %2 is address" -#| msgid "%1 <%2>" +#, kde-format msgctxt "" "tag-format-pattern <email address=> plain\n" "%1 is name, %2 is address" @@ -535,11 +429,7 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1010 -#, fuzzy, kde-format -#| msgctxt "" -#| "@email-with-name/rich\n" -#| "%1 is name, %2 is address" -#| msgid "<a href=\"mailto:%2\";>%1</a>" +#, kde-format msgctxt "" "tag-format-pattern <email address=> rich\n" "%1 is name, %2 is address" @@ -548,55 +438,45 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1017 -#, fuzzy, kde-format -#| msgctxt "@envar/plain" -#| msgid "$%1" +#, kde-format msgctxt "tag-format-pattern <envar> plain" msgid "$%1" msgstr "$%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1022 -#, fuzzy, kde-format -#| msgctxt "@envar/rich" -#| msgid "<tt>$%1</tt>" +#, kde-format msgctxt "tag-format-pattern <envar> rich" msgid "<tt>$%1</tt>" msgstr "<tt>$%1</tt>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1029 -#, fuzzy, kde-format -#| msgctxt "@message/plain" -#| msgid "/%1/" +#, kde-format msgctxt "tag-format-pattern <message> plain" msgid "/%1/" msgstr "/%1/" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1034 -#, fuzzy, kde-format -#| msgctxt "@interface/rich" -#| msgid "<i>%1</i>" +#, kde-format msgctxt "tag-format-pattern <message> rich" msgid "<i>%1</i>" msgstr "<i>%1</i>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1041 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, kde-format msgctxt "tag-format-pattern <nl> plain" msgid "%1\n" -msgstr "%1" +msgstr "%1\n" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1046 #, kde-format msgctxt "tag-format-pattern <nl> rich" msgid "%1<br/>" -msgstr "" +msgstr "%1<br/>" #~ msgctxt "NAME OF TRANSLATORS" #~ msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-4.99.0/po/nds/ki18n5.po new/ki18n-4.100.0/po/nds/ki18n5.po --- old/ki18n-4.99.0/po/nds/ki18n5.po 2014-05-05 02:25:33.000000000 +0200 +++ new/ki18n-4.100.0/po/nds/ki18n5.po 2014-06-01 14:19:13.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-27 20:57+0000\n" -"PO-Revision-Date: 2014-02-24 02:01+0100\n" +"PO-Revision-Date: 2014-05-08 01:49+0200\n" "Last-Translator: Sönke Dibbern <[email protected]>\n" "Language-Team: Low Saxon <[email protected]>\n" "Language: nds\n" @@ -108,7 +108,7 @@ #, kde-format msgctxt "tag-format-pattern <list> rich" msgid "<ul>%1</ul>" -msgstr "<li>%1</li>" +msgstr "<ul>%1</ul>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:767 @@ -154,7 +154,7 @@ "tag-format-pattern <note label=> rich\n" "%1 is the text, %2 is the note label" msgid "<i>%2</i>: %1" -msgstr "<i>%1</i>: %2" +msgstr "<i>%2</i>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:803 @@ -186,7 +186,7 @@ "tag-format-pattern <warning label=> rich\n" "%1 is the text, %2 is the warning label" msgid "<b>%2</b>: %1" -msgstr "<b>%1</b>: %2" +msgstr "<b>%2</b>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:827 @@ -225,7 +225,7 @@ #, kde-format msgctxt "tag-format-pattern <filename> plain" msgid "‘%1’" -msgstr "»%1«" +msgstr "„%1“" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:856 @@ -246,7 +246,7 @@ #, kde-format msgctxt "tag-format-pattern <application> rich" msgid "%1" -msgstr "%1" +msgstr "<i>%1</i>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:875 @@ -260,7 +260,7 @@ #, kde-format msgctxt "tag-format-pattern <command> rich" msgid "<tt>%1</tt>" -msgstr "<b>%1</b>" +msgstr "<tt>%1</tt>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:886 @@ -278,14 +278,14 @@ "tag-format-pattern <command section=> rich\n" "%1 is the command name, %2 is its man section" msgid "<tt>%1(%2)</tt>" -msgstr "<b>%1</b>(%2)" +msgstr "<tt>%1</tt>(%2)" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:899 #, kde-format msgctxt "tag-format-pattern <resource> plain" msgid "“%1”" -msgstr "»%1«" +msgstr "„%1“" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:904 @@ -331,7 +331,7 @@ #, kde-format msgctxt "tag-format-pattern <shortcut> plain" msgid "%1" -msgstr "%1" +msgstr "<%1>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:940 @@ -433,7 +433,7 @@ #, kde-format msgctxt "tag-format-pattern <envar> plain" msgid "$%1" -msgstr "„$%1“" +msgstr "$%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1022 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-4.99.0/po/x-test/ki18n5.po new/ki18n-4.100.0/po/x-test/ki18n5.po --- old/ki18n-4.99.0/po/x-test/ki18n5.po 2014-05-05 02:25:33.000000000 +0200 +++ new/ki18n-4.100.0/po/x-test/ki18n5.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,474 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -# -msgid "" -msgstr "" -"Project-Id-Version: ki18n5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2014-04-27 20:57+0000\n" -"PO-Revision-Date: 2014-04-27 21:05+0000\n" -"Last-Translator: transxx.py program <[email protected]>\n" -"Language-Team: KDE Test Language <[email protected]>\n" -"Language: x-test\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#. i18n: Decide which string is used to delimit keys in a keyboard -#. shortcut (e.g. + in Ctrl+Alt+Tab) in plain text. -#: kuitmarkup.cpp:293 -msgctxt "shortcut-key-delimiter/plain" -msgid "+" -msgstr "xx+xx" - -#. i18n: Decide which string is used to delimit keys in a keyboard -#. shortcut (e.g. + in Ctrl+Alt+Tab) in rich text. -#: kuitmarkup.cpp:297 -msgctxt "shortcut-key-delimiter/rich" -msgid "+" -msgstr "xx+xx" - -#. i18n: Decide which string is used to delimit elements in a GUI path -#. (e.g. -> in "Go to Settings->Advanced->Core tab.") in plain text. -#: kuitmarkup.cpp:301 -msgctxt "gui-path-delimiter/plain" -msgid "→" -msgstr "xx→xx" - -#. i18n: Decide which string is used to delimit elements in a GUI path -#. (e.g. -> in "Go to Settings->Advanced->Core tab.") in rich text. -#: kuitmarkup.cpp:305 -msgctxt "gui-path-delimiter/rich" -msgid "→" -msgstr "xx→xx" - -#. i18n: The messages with context "tag-format-pattern <tag ...> format" -#. are KUIT patterns for formatting the text found inside KUIT tags. -#. The format is either "plain" or "rich", and tells if the pattern -#. is used for plain text or rich text (which can use HTML tags). -#. You may be in general satisfied with the patterns as they are in the -#. original. Some things you may consider changing: -#. - the proper quotes, those used in msgid are English-standard -#. - the <i> and <b> tags, does your language script work well with them? -#: kuitmarkup.cpp:715 -#, kde-format -msgctxt "tag-format-pattern <title> plain" -msgid "== %1 ==" -msgstr "xx== %1 ==xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:720 -#, kde-format -msgctxt "tag-format-pattern <title> rich" -msgid "<h2>%1</h2>" -msgstr "xx<h2>%1</h2>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:728 -#, kde-format -msgctxt "tag-format-pattern <subtitle> plain" -msgid "~ %1 ~" -msgstr "xx~ %1 ~xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:733 -#, kde-format -msgctxt "tag-format-pattern <subtitle> rich" -msgid "<h3>%1</h3>" -msgstr "xx<h3>%1</h3>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:741 -#, kde-format -msgctxt "tag-format-pattern <para> plain" -msgid "%1" -msgstr "xx%1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:746 -#, kde-format -msgctxt "tag-format-pattern <para> rich" -msgid "<p>%1</p>" -msgstr "xx<p>%1</p>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:754 -#, kde-format -msgctxt "tag-format-pattern <list> plain" -msgid "%1" -msgstr "xx%1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:759 -#, kde-format -msgctxt "tag-format-pattern <list> rich" -msgid "<ul>%1</ul>" -msgstr "xx<ul>%1</ul>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:767 -#, kde-format -msgctxt "tag-format-pattern <item> plain" -msgid " * %1" -msgstr "xx * %1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:772 -#, kde-format -msgctxt "tag-format-pattern <item> rich" -msgid "<li>%1</li>" -msgstr "xx<li>%1</li>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:779 -#, kde-format -msgctxt "tag-format-pattern <note> plain" -msgid "Note: %1" -msgstr "xxNote: %1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:784 -#, kde-format -msgctxt "tag-format-pattern <note> rich" -msgid "<i>Note</i>: %1" -msgstr "xx<i>Note</i>: %1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:790 -#, kde-format -msgctxt "" -"tag-format-pattern <note label=> plain\n" -"%1 is the text, %2 is the note label" -msgid "%2: %1" -msgstr "xx%2: %1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:796 -#, kde-format -msgctxt "" -"tag-format-pattern <note label=> rich\n" -"%1 is the text, %2 is the note label" -msgid "<i>%2</i>: %1" -msgstr "xx<i>%2</i>: %1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:803 -#, kde-format -msgctxt "tag-format-pattern <warning> plain" -msgid "WARNING: %1" -msgstr "xxWARNING: %1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:808 -#, kde-format -msgctxt "tag-format-pattern <warning> rich" -msgid "<b>Warning</b>: %1" -msgstr "xx<b>Warning</b>: %1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:814 -#, kde-format -msgctxt "" -"tag-format-pattern <warning label=> plain\n" -"%1 is the text, %2 is the warning label" -msgid "%2: %1" -msgstr "xx%2: %1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:820 -#, kde-format -msgctxt "" -"tag-format-pattern <warning label=> rich\n" -"%1 is the text, %2 is the warning label" -msgid "<b>%2</b>: %1" -msgstr "xx<b>%2</b>: %1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:827 -#, kde-format -msgctxt "tag-format-pattern <link> plain" -msgid "%1" -msgstr "xx%1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:832 -#, kde-format -msgctxt "tag-format-pattern <link> rich" -msgid "<a href=\"%1\">%1</a>" -msgstr "xx<a href=\"%1\">%1</a>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:838 -#, kde-format -msgctxt "" -"tag-format-pattern <link url=> plain\n" -"%1 is the descriptive text, %2 is the URL" -msgid "%1 (%2)" -msgstr "xx%1 (%2)xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:844 -#, kde-format -msgctxt "" -"tag-format-pattern <link url=> rich\n" -"%1 is the descriptive text, %2 is the URL" -msgid "<a href=\"%2\">%1</a>" -msgstr "xx<a href=\"%2\">%1</a>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:851 -#, kde-format -msgctxt "tag-format-pattern <filename> plain" -msgid "‘%1’" -msgstr "xx‘%1’xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:856 -#, kde-format -msgctxt "tag-format-pattern <filename> rich" -msgid "<tt>%1</tt>" -msgstr "xx<tt>%1</tt>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:863 -#, kde-format -msgctxt "tag-format-pattern <application> plain" -msgid "%1" -msgstr "xx%1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:868 -#, kde-format -msgctxt "tag-format-pattern <application> rich" -msgid "%1" -msgstr "xx%1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:875 -#, kde-format -msgctxt "tag-format-pattern <command> plain" -msgid "%1" -msgstr "xx%1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:880 -#, kde-format -msgctxt "tag-format-pattern <command> rich" -msgid "<tt>%1</tt>" -msgstr "xx<tt>%1</tt>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:886 -#, kde-format -msgctxt "" -"tag-format-pattern <command section=> plain\n" -"%1 is the command name, %2 is its man section" -msgid "%1(%2)" -msgstr "xx%1(%2)xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:892 -#, kde-format -msgctxt "" -"tag-format-pattern <command section=> rich\n" -"%1 is the command name, %2 is its man section" -msgid "<tt>%1(%2)</tt>" -msgstr "xx<tt>%1(%2)</tt>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:899 -#, kde-format -msgctxt "tag-format-pattern <resource> plain" -msgid "“%1”" -msgstr "xx“%1”xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:904 -#, kde-format -msgctxt "tag-format-pattern <resource> rich" -msgid "“%1”" -msgstr "xx“%1”xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:911 -#, kde-format -msgctxt "tag-format-pattern <icode> plain" -msgid "“%1”" -msgstr "xx“%1”xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:916 -#, kde-format -msgctxt "tag-format-pattern <icode> rich" -msgid "<tt>%1</tt>" -msgstr "xx<tt>%1</tt>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:923 -#, kde-format -msgctxt "tag-format-pattern <bcode> plain" -msgid "" -"\n" -"%1\n" -msgstr "" -"\n" -"xx\n" -"%1\n" -"xx\n" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:928 -#, kde-format -msgctxt "tag-format-pattern <bcode> rich" -msgid "<pre>%1</pre>" -msgstr "xx<pre>%1</pre>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:935 -#, kde-format -msgctxt "tag-format-pattern <shortcut> plain" -msgid "%1" -msgstr "xx%1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:940 -#, kde-format -msgctxt "tag-format-pattern <shortcut> rich" -msgid "<b>%1</b>" -msgstr "xx<b>%1</b>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:947 -#, kde-format -msgctxt "tag-format-pattern <interface> plain" -msgid "|%1|" -msgstr "xx|%1|xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:952 -#, kde-format -msgctxt "tag-format-pattern <interface> rich" -msgid "<i>%1</i>" -msgstr "xx<i>%1</i>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:959 -#, kde-format -msgctxt "tag-format-pattern <emphasis> plain" -msgid "*%1*" -msgstr "xx*%1*xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:964 -#, kde-format -msgctxt "tag-format-pattern <emphasis> rich" -msgid "<i>%1</i>" -msgstr "xx<i>%1</i>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:969 -#, kde-format -msgctxt "tag-format-pattern <emphasis-strong> plain" -msgid "**%1**" -msgstr "xx**%1**xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:974 -#, kde-format -msgctxt "tag-format-pattern <emphasis-strong> rich" -msgid "<b>%1</b>" -msgstr "xx<b>%1</b>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:981 -#, kde-format -msgctxt "tag-format-pattern <placeholder> plain" -msgid "<%1>" -msgstr "xx<%1>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:986 -#, kde-format -msgctxt "tag-format-pattern <placeholder> rich" -msgid "<<i>%1</i>>" -msgstr "xx<<i>%1</i>>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:993 -#, kde-format -msgctxt "tag-format-pattern <email> plain" -msgid "<%1>" -msgstr "xx<%1>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:998 -#, kde-format -msgctxt "tag-format-pattern <email> rich" -msgid "<<a href=\"mailto:%1\";>%1</a>>" -msgstr "xx<<a href=\"mailto:%1\";>%1</a>>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:1004 -#, kde-format -msgctxt "" -"tag-format-pattern <email address=> plain\n" -"%1 is name, %2 is address" -msgid "%1 <%2>" -msgstr "xx%1 <%2>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:1010 -#, kde-format -msgctxt "" -"tag-format-pattern <email address=> rich\n" -"%1 is name, %2 is address" -msgid "<a href=\"mailto:%2\";>%1</a>" -msgstr "xx<a href=\"mailto:%2\";>%1</a>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:1017 -#, kde-format -msgctxt "tag-format-pattern <envar> plain" -msgid "$%1" -msgstr "xx$%1xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:1022 -#, kde-format -msgctxt "tag-format-pattern <envar> rich" -msgid "<tt>$%1</tt>" -msgstr "xx<tt>$%1</tt>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:1029 -#, kde-format -msgctxt "tag-format-pattern <message> plain" -msgid "/%1/" -msgstr "xx/%1/xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:1034 -#, kde-format -msgctxt "tag-format-pattern <message> rich" -msgid "<i>%1</i>" -msgstr "xx<i>%1</i>xx" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:1041 -#, kde-format -msgctxt "tag-format-pattern <nl> plain" -msgid "%1\n" -msgstr "" -"xx%1\n" -"xx\n" - -#. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:1046 -#, kde-format -msgctxt "tag-format-pattern <nl> rich" -msgid "%1<br/>" -msgstr "xx%1<br/>xx" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-4.99.0/src/klocalizedstring.cpp new/ki18n-4.100.0/src/klocalizedstring.cpp --- old/ki18n-4.99.0/src/klocalizedstring.cpp 2014-05-05 02:25:33.000000000 +0200 +++ new/ki18n-4.100.0/src/klocalizedstring.cpp 2014-06-01 14:19:13.000000000 +0200 @@ -270,7 +270,7 @@ : catalogs() , languages() - , ourDomain("ki18n") + , ourDomain("ki18n5") , applicationDomain() , codeLanguage(QLatin1String("en_US")) , localeLanguages() @@ -1369,11 +1369,10 @@ #else QString pluginPathNoExt; QStringList nameFilters; - QString pluginSubdir = QLatin1String("kf5"); QString pluginName = QLatin1String("ktranscript"); nameFilters.append(pluginName + QLatin1String(".*")); foreach (const QString &dirPath, QCoreApplication::libraryPaths()) { - QString dirPathKf = dirPath + QLatin1Char('/') + pluginSubdir; + QString dirPathKf = dirPath + QLatin1Char('/'); if (!QDir(dirPathKf).entryList(nameFilters).isEmpty()) { pluginPathNoExt = dirPathKf + QLatin1Char('/') + pluginName; break; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
