Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2020-10-12 13:55:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ki18n (Old) and /work/SRC/openSUSE:Factory/.ki18n.new.3486 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ki18n" Mon Oct 12 13:55:02 2020 rev:87 rq:840823 version:5.75.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ki18n/ki18n.changes 2020-09-18 14:41:11.167990870 +0200 +++ /work/SRC/openSUSE:Factory/.ki18n.new.3486/ki18n.changes 2020-10-12 13:56:34.566147586 +0200 @@ -1,0 +2,13 @@ +Mon Oct 5 08:33:15 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.75.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.75.0 +- Changes since 5.74.0: + * Remove obsolete LGPL-2.0-only license file + * Relicense file to LGPL-2.0-or-later + * Update macOS platform name according to KApiDox warning + * Update documentation + +------------------------------------------------------------------- Old: ---- ki18n-5.74.0.tar.xz ki18n-5.74.0.tar.xz.sig New: ---- ki18n-5.75.0.tar.xz ki18n-5.75.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.lKIQeh/_old 2020-10-12 13:56:35.126147821 +0200 +++ /var/tmp/diff_new_pack.lKIQeh/_new 2020-10-12 13:56:35.126147821 +0200 @@ -17,14 +17,14 @@ %define lname libKF5I18n5 -%define _tar_path 5.74 +%define _tar_path 5.75 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: ki18n -Version: 5.74.0 +Version: 5.75.0 Release: 0 Summary: KDE Gettext-based UI text internationalization License: LGPL-2.1-or-later ++++++ ki18n-5.74.0.tar.xz -> ki18n-5.75.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.74.0/CMakeLists.txt new/ki18n-5.75.0/CMakeLists.txt --- old/ki18n-5.74.0/CMakeLists.txt 2020-09-06 12:26:11.000000000 +0200 +++ new/ki18n-5.75.0/CMakeLists.txt 2020-10-04 20:46:23.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.74.0") # handled by release scripts +set(KF5_VERSION "5.75.0") # handled by release scripts project(KI18n VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.74.0 NO_MODULE) +find_package(ECM 5.75.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.74.0/LICENSES/LGPL-2.0-only.txt new/ki18n-5.75.0/LICENSES/LGPL-2.0-only.txt --- old/ki18n-5.74.0/LICENSES/LGPL-2.0-only.txt 2020-09-06 12:26:11.000000000 +0200 +++ new/ki18n-5.75.0/LICENSES/LGPL-2.0-only.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,446 +0,0 @@ -GNU LIBRARY GENERAL PUBLIC LICENSE - -Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. - -51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is numbered 2 because -it goes with version 2 of the ordinary GPL.] - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public Licenses are intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. - -This license, the Library General Public License, applies to some specially -designated Free Software Foundation software, and to any other libraries whose -authors decide to use it. You can use it for your libraries, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom -to distribute copies of free software (and charge for this service if you -wish), that you receive source code or can get it if you want it, that you -can change the software or use pieces of it in new free programs; and that -you know you can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to -deny you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of -the library, or if you modify it. - -For example, if you distribute copies of the library, whether gratis or for -a fee, you must give the recipients all the rights that we gave you. You must -make sure that they, too, receive or can get the source code. If you link -a program with the library, you must provide complete object files to the -recipients so that they can relink them with the library, after making changes -to the library and recompiling it. And you must show them these terms so they -know their rights. - -Our method of protecting your rights has two steps: (1) copyright the library, -and (2) offer you this license which gives you legal permission to copy, distribute -and/or modify the library. - -Also, for each distributor's protection, we want to make certain that everyone -understands that there is no warranty for this free library. If the library -is modified by someone else and passed on, we want its recipients to know -that what they have is not the original version, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that companies distributing free software will individually -obtain patent licenses, thus in effect transforming the program into proprietary -software. To prevent this, we have made it clear that any patent must be licensed -for everyone's free use or not licensed at all. - -Most GNU software, including some libraries, is covered by the ordinary GNU -General Public License, which was designed for utility programs. This license, -the GNU Library General Public License, applies to certain designated libraries. -This license is quite different from the ordinary one; be sure to read it -in full, and don't assume that anything in it is the same as in the ordinary -license. - -The reason we have a separate public license for some libraries is that they -blur the distinction we usually make between modifying or adding to a program -and simply using it. Linking a program with a library, without changing the -library, is in some sense simply using the library, and is analogous to running -a utility program or application program. However, in a textual and legal -sense, the linked executable is a combined work, a derivative of the original -library, and the ordinary General Public License treats it as such. - -Because of this blurred distinction, using the ordinary General Public License -for libraries did not effectively promote software sharing, because most developers -did not use the libraries. We concluded that weaker conditions might promote -sharing better. - -However, unrestricted linking of non-free programs would deprive the users -of those programs of all benefit from the free status of the libraries themselves. -This Library General Public License is intended to permit developers of non-free -programs to use free libraries, while preserving your freedom as a user of -such programs to change the free libraries that are incorporated in them. -(We have not seen how to achieve this as regards changes in header files, -but we have achieved it as regards changes in the actual functions of the -Library.) The hope is that this will lead to faster development of free libraries. - -The precise terms and conditions for copying, distribution and modification -follow. Pay close attention to the difference between a "work based on the -library" and a "work that uses the library". The former contains code derived -from the library, while the latter only works together with the library. - -Note that it is possible for a library to be covered by the ordinary General -Public License rather than by this special one. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License Agreement applies to any software library which contains a -notice placed by the copyright holder or other authorized party saying it -may be distributed under the terms of this Library General Public License -(also called "this License"). Each licensee is addressed as "you". - -A "library" means a collection of software functions and/or data prepared -so as to be conveniently linked with application programs (which use some -of those functions and data) to form executables. - -The "Library", below, refers to any such software library or work which has -been distributed under these terms. A "work based on the Library" means either -the Library or any derivative work under copyright law: that is to say, a -work containing the Library or a portion of it, either verbatim or with modifications -and/or translated straightforwardly into another language. (Hereinafter, translation -is included without limitation in the term "modification".) - -"Source code" for a work means the preferred form of the work for making modifications -to it. For a library, complete source code means all the source code for all -modules it contains, plus any associated interface definition files, plus -the scripts used to control compilation and installation of the library. - -Activities other than copying, distribution and modification are not covered -by this License; they are outside its scope. The act of running a program -using the Library is not restricted, and output from such a program is covered -only if its contents constitute a work based on the Library (independent of -the use of the Library in a tool for writing it). Whether that is true depends -on what the Library does and what the program that uses the Library does. - -1. You may copy and distribute verbatim copies of the Library's complete source -code as you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and disclaimer -of warranty; keep intact all the notices that refer to this License and to -the absence of any warranty; and distribute a copy of this License along with -the Library. - -You may charge a fee for the physical act of transferring a copy, and you -may at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Library or any portion of it, -thus forming a work based on the Library, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all -of these conditions: - - a) The modified work must itself be a software library. - -b) You must cause the files modified to carry prominent notices stating that -you changed the files and the date of any change. - -c) You must cause the whole of the work to be licensed at no charge to all -third parties under the terms of this License. - -d) If a facility in the modified Library refers to a function or a table of -data to be supplied by an application program that uses the facility, other -than as an argument passed when the facility is invoked, then you must make -a good faith effort to ensure that, in the event an application does not supply -such function or table, the facility still operates, and performs whatever -part of its purpose remains meaningful. - -(For example, a function in a library to compute square roots has a purpose -that is entirely well-defined independent of the application. Therefore, Subsection -2d requires that any application-supplied function or table used by this function -must be optional: if the application does not supply it, the square root function -must still compute square roots.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Library, and can be reasonably -considered independent and separate works in themselves, then this License, -and its terms, do not apply to those sections when you distribute them as -separate works. But when you distribute the same sections as part of a whole -which is a work based on the Library, the distribution of the whole must be -on the terms of this License, whose permissions for other licensees extend -to the entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise -the right to control the distribution of derivative or collective works based -on the Library. - -In addition, mere aggregation of another work not based on the Library with -the Library (or with a work based on the Library) on a volume of a storage -or distribution medium does not bring the other work under the scope of this -License. - -3. You may opt to apply the terms of the ordinary GNU General Public License -instead of this License to a given copy of the Library. To do this, you must -alter all the notices that refer to this License, so that they refer to the -ordinary GNU General Public License, version 2, instead of to this License. -(If a newer version than version 2 of the ordinary GNU General Public License -has appeared, then you can specify that version instead if you wish.) Do not -make any other change in these notices. - -Once this change is made in a given copy, it is irreversible for that copy, -so the ordinary GNU General Public License applies to all subsequent copies -and derivative works made from that copy. - -This option is useful when you wish to copy part of the code of the Library -into a program that is not a library. - -4. You may copy and distribute the Library (or a portion or derivative of -it, under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you accompany it with the complete corresponding -machine-readable source code, which must be distributed under the terms of -Sections 1 and 2 above on a medium customarily used for software interchange. - -If distribution of object code is made by offering access to copy from a designated -place, then offering equivalent access to copy the source code from the same -place satisfies the requirement to distribute the source code, even though -third parties are not compelled to copy the source along with the object code. - -5. A program that contains no derivative of any portion of the Library, but -is designed to work with the Library by being compiled or linked with it, -is called a "work that uses the Library". Such a work, in isolation, is not -a derivative work of the Library, and therefore falls outside the scope of -this License. - -However, linking a "work that uses the Library" with the Library creates an -executable that is a derivative of the Library (because it contains portions -of the Library), rather than a "work that uses the library". The executable -is therefore covered by this License. Section 6 states terms for distribution -of such executables. - -When a "work that uses the Library" uses material from a header file that -is part of the Library, the object code for the work may be a derivative work -of the Library even though the source code is not. Whether this is true is -especially significant if the work can be linked without the Library, or if -the work is itself a library. The threshold for this to be true is not precisely -defined by law. - -If such an object file uses only numerical parameters, data structure layouts -and accessors, and small macros and small inline functions (ten lines or less -in length), then the use of the object file is unrestricted, regardless of -whether it is legally a derivative work. (Executables containing this object -code plus portions of the Library will still fall under Section 6.) - -Otherwise, if the work is a derivative of the Library, you may distribute -the object code for the work under the terms of Section 6. Any executables -containing that work also fall under Section 6, whether or not they are linked -directly with the Library itself. - -6. As an exception to the Sections above, you may also compile or link a "work -that uses the Library" with the Library to produce a work containing portions -of the Library, and distribute that work under terms of your choice, provided -that the terms permit modification of the work for the customer's own use -and reverse engineering for debugging such modifications. - -You must give prominent notice with each copy of the work that the Library -is used in it and that the Library and its use are covered by this License. -You must supply a copy of this License. If the work during execution displays -copyright notices, you must include the copyright notice for the Library among -them, as well as a reference directing the user to the copy of this License. -Also, you must do one of these things: - -a) Accompany the work with the complete corresponding machine-readable source -code for the Library including whatever changes were used in the work (which -must be distributed under Sections 1 and 2 above); and, if the work is an -executable linked with the Library, with the complete machine-readable "work -that uses the Library", as object code and/or source code, so that the user -can modify the Library and then relink to produce a modified executable containing -the modified Library. (It is understood that the user who changes the contents -of definitions files in the Library will not necessarily be able to recompile -the application to use the modified definitions.) - -b) Accompany the work with a written offer, valid for at least three years, -to give the same user the materials specified in Subsection 6a, above, for -a charge no more than the cost of performing this distribution. - -c) If distribution of the work is made by offering access to copy from a designated -place, offer equivalent access to copy the above specified materials from -the same place. - -d) Verify that the user has already received a copy of these materials or -that you have already sent this user a copy. - -For an executable, the required form of the "work that uses the Library" must -include any data and utility programs needed for reproducing the executable -from it. However, as a special exception, the source code distributed need -not include anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the operating -system on which the executable runs, unless that component itself accompanies -the executable. - -It may happen that this requirement contradicts the license restrictions of -other proprietary libraries that do not normally accompany the operating system. -Such a contradiction means you cannot use both them and the Library together -in an executable that you distribute. - -7. You may place library facilities that are a work based on the Library side-by-side -in a single library together with other library facilities not covered by -this License, and distribute such a combined library, provided that the separate -distribution of the work based on the Library and of the other library facilities -is otherwise permitted, and provided that you do these two things: - -a) Accompany the combined library with a copy of the same work based on the -Library, uncombined with any other library facilities. This must be distributed -under the terms of the Sections above. - -b) Give prominent notice with the combined library of the fact that part of -it is a work based on the Library, and explaining where to find the accompanying -uncombined form of the same work. - -8. You may not copy, modify, sublicense, link with, or distribute the Library -except as expressly provided under this License. Any attempt otherwise to -copy, modify, sublicense, link with, or distribute the Library is void, and -will automatically terminate your rights under this License. However, parties -who have received copies, or rights, from you under this License will not -have their licenses terminated so long as such parties remain in full compliance. - -9. You are not required to accept this License, since you have not signed -it. However, nothing else grants you permission to modify or distribute the -Library or its derivative works. These actions are prohibited by law if you -do not accept this License. Therefore, by modifying or distributing the Library -(or any work based on the Library), you indicate your acceptance of this License -to do so, and all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - -10. Each time you redistribute the Library (or any work based on the Library), -the recipient automatically receives a license from the original licensor -to copy, distribute, link with or modify the Library subject to these terms -and conditions. You may not impose any further restrictions on the recipients' -exercise of the rights granted herein. You are not responsible for enforcing -compliance by third parties to this License. - -11. If, as a consequence of a court judgment or allegation of patent infringement -or for any other reason (not limited to patent issues), conditions are imposed -on you (whether by court order, agreement or otherwise) that contradict the -conditions of this License, they do not excuse you from the conditions of -this License. If you cannot distribute so as to satisfy simultaneously your -obligations under this License and any other pertinent obligations, then as -a consequence you may not distribute the Library at all. For example, if a -patent license would not permit royalty-free redistribution of the Library -by all those who receive copies directly or indirectly through you, then the -only way you could satisfy both it and this License would be to refrain entirely -from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents -or other property right claims or to contest validity of any such claims; -this section has the sole purpose of protecting the integrity of the free -software distribution system which is implemented by public license practices. -Many people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose -that choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -12. If the distribution and/or use of the Library is restricted in certain -countries either by patents or by copyrighted interfaces, the original copyright -holder who places the Library under this License may add an explicit geographical -distribution limitation excluding those countries, so that distribution is -permitted only in or among countries not thus excluded. In such case, this -License incorporates the limitation as if written in the body of this License. - -13. The Free Software Foundation may publish revised and/or new versions of -the Library General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to address -new problems or concerns. - -Each version is given a distinguishing version number. If the Library specifies -a version number of this License which applies to it and "any later version", -you have the option of following the terms and conditions either of that version -or of any later version published by the Free Software Foundation. If the -Library does not specify a license version number, you may choose any version -ever published by the Free Software Foundation. - -14. If you wish to incorporate parts of the Library into other free programs -whose distribution conditions are incompatible with these, write to the author -to ask for permission. For software which is copyrighted by the Free Software -Foundation, write to the Free Software Foundation; we sometimes make exceptions -for this. Our decision will be guided by the two goals of preserving the free -status of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - -15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY -"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE -OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE -THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE -OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA -OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES -OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH -HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Libraries - -If you develop a new library, and you want it to be of the greatest possible -use to the public, we recommend making it free software that everyone can -redistribute and change. You can do so by permitting redistribution under -these terms (or, alternatively, under the terms of the ordinary General Public -License). - -To apply these terms, attach the following notices to the library. It is safest -to attach them to the start of each source file to most effectively convey -the exclusion of warranty; and each file should have at least the "copyright" -line and a pointer to where the full notice is found. - -one line to give the library's name and an idea of what it does. - -Copyright (C) year name of author - -This library is free software; you can redistribute it and/or modify it under -the terms of the GNU Library General Public License as published by the Free -Software Foundation; either version 2 of the License, or (at your option) -any later version. - -This library 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 Library General Public License for more -details. - -You should have received a copy of the GNU Library General Public License -along with this library; if not, write to the Free Software Foundation, Inc., -51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the library, if necessary. Here -is a sample; alter the names: - -Yoyodyne, Inc., hereby disclaims all copyright interest in - -the library `Frob' (a library for tweaking knobs) written - -by James Random Hacker. - -signature of Ty Coon, 1 April 1990 - -Ty Coon, President of Vice - -That's all there is to it! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.74.0/README.md new/ki18n-5.75.0/README.md --- old/ki18n-5.74.0/README.md 2020-09-06 12:26:11.000000000 +0200 +++ new/ki18n-5.75.0/README.md 2020-10-04 20:46:23.000000000 +0200 @@ -20,9 +20,12 @@ If you are using CMake, you need to have find_package(KF5I18n NO_MODULE) + ki18n_install(po) (or similar) in your CMakeLists.txt file, and you need to link to KF5::I18n. +When using QML, the QML Engine has to be setup for using i18n methods, which is done by creating a KLocalizedContext and registering it. + Information on using KI18n as a translation mechanism can be found in the [programmer's guide](@ref prg_guide) and the [translator's guide](@ref trn_guide). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.74.0/autotests/klocalizedstringtest.h new/ki18n-5.75.0/autotests/klocalizedstringtest.h --- old/ki18n-5.74.0/autotests/klocalizedstringtest.h 2020-09-06 12:26:11.000000000 +0200 +++ new/ki18n-5.75.0/autotests/klocalizedstringtest.h 2020-10-04 20:46:23.000000000 +0200 @@ -1,7 +1,7 @@ /* This file is part of the KDE libraries SPDX-FileCopyrightText: 2005 Thomas Braxton <brax...@cox.net> - SPDX-License-Identifier: LGPL-2.0-only + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef KLOCALIZEDSTRINGTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.74.0/metainfo.yaml new/ki18n-5.75.0/metainfo.yaml --- old/ki18n-5.74.0/metainfo.yaml 2020-09-06 12:26:11.000000000 +0200 +++ new/ki18n-5.75.0/metainfo.yaml 2020-10-04 20:46:23.000000000 +0200 @@ -6,7 +6,7 @@ - name: Linux - name: FreeBSD - name: Windows - - name: MacOSX + - name: macOS - name: Android portingAid: false deprecated: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.74.0/po/ca/ki18n5.po new/ki18n-5.75.0/po/ca/ki18n5.po --- old/ki18n-5.74.0/po/ca/ki18n5.po 2020-09-06 12:26:11.000000000 +0200 +++ new/ki18n-5.75.0/po/ca/ki18n5.po 2020-10-04 20:46:23.000000000 +0200 @@ -11,7 +11,7 @@ # Orestes Mas <ores...@tsc.upc.edu>, 2010. msgid "" msgstr "" -"Project-Id-Version: ki18n5\n" +"Project-Id-Version: ki18n\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-08 02:02+0200\n" "PO-Revision-Date: 2020-06-08 10:12+0100\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.74.0/po/ca@valencia/ki18n5.po new/ki18n-5.75.0/po/ca@valencia/ki18n5.po --- old/ki18n-5.74.0/po/ca@valencia/ki18n5.po 2020-09-06 12:26:11.000000000 +0200 +++ new/ki18n-5.75.0/po/ca@valencia/ki18n5.po 2020-10-04 20:46:23.000000000 +0200 @@ -11,7 +11,7 @@ # Orestes Mas <ores...@tsc.upc.edu>, 2010. msgid "" msgstr "" -"Project-Id-Version: ki18n5\n" +"Project-Id-Version: ki18n\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-08 02:02+0200\n" "PO-Revision-Date: 2018-01-01 22:58+0100\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.74.0/po/de/ki18n5.po new/ki18n-5.75.0/po/de/ki18n5.po --- old/ki18n-5.74.0/po/de/ki18n5.po 2020-09-06 12:26:11.000000000 +0200 +++ new/ki18n-5.75.0/po/de/ki18n5.po 2020-10-04 20:46:23.000000000 +0200 @@ -4,7 +4,7 @@ # Stephan Johach <hun...@gmx.de>, 2004, 2005, 2006, 2007. # Georg Schuster <gschus...@utanet.at>, 2005. # Thomas Reitelbach <t...@erdfunkstelle.de>, 2005, 2006, 2007, 2008, 2009. -# Burkhard Lück <lu...@hube-lueck.de>, 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014. +# Burkhard Lück <lu...@hube-lueck.de>, 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014, 2020. # Frederik Schwarzer <schwar...@kde.org>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016. # Johannes Obermayr <johannesoberm...@gmx.de>, 2010. # Panagiotis Papadopoulos <pano...@gmx.net>, 2010. @@ -14,14 +14,14 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-08 02:02+0200\n" -"PO-Revision-Date: 2016-11-22 20:07+0100\n" -"Last-Translator: Frederik Schwarzer <schwar...@kde.org>\n" +"PO-Revision-Date: 2020-09-09 09:33+0200\n" +"Last-Translator: Burkhard Lück <lu...@hube-lueck.de>\n" "Language-Team: German <kde-i18n...@kde.org>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.04.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #. i18n: Decide which string is used to delimit keys in a keyboard @@ -538,12 +538,10 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:874 -#, fuzzy, kde-format -#| msgctxt "tag-format-pattern <filename> rich" -#| msgid "<tt>%1</tt>" +#, kde-format msgctxt "tag-format-pattern <filename> rich" msgid "‘<tt>%1</tt>’" -msgstr "<tt>%1</tt>" +msgstr "‘<tt>%1</tt>’" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:881 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.74.0/po/el/ki18n5.po new/ki18n-5.75.0/po/el/ki18n5.po --- old/ki18n-5.74.0/po/el/ki18n5.po 2020-09-06 12:26:11.000000000 +0200 +++ new/ki18n-5.75.0/po/el/ki18n5.po 2020-10-04 20:46:23.000000000 +0200 @@ -14,7 +14,7 @@ # Petros Vidalis <p_vida...@hotmail.com>, 2010, 2011. # Dimitrios Glentadakis <dgl...@gmail.com>, 2010, 2011, 2012, 2013, 2014. # nikos, 2011. -# Stelios <ssta...@gmail.com>, 2012, 2013. +# Stelios <ssta...@gmail.com>, 2012, 2013, 2020. # Antonis Geralis <capoio...@gmail.com>, 2014. # Dimitris Kardarakos <dimk...@gmail.com>, 2015. msgid "" @@ -22,14 +22,14 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-08 02:02+0200\n" -"PO-Revision-Date: 2015-11-05 11:05+0200\n" -"Last-Translator: Dimitris Kardarakos <dimk...@gmail.com>\n" +"PO-Revision-Date: 2020-09-07 14:43+0300\n" +"Last-Translator: Stelios <ssta...@gmail.com>\n" "Language-Team: Greek <kde-i18n...@kde.org>\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.04.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #. i18n: Decide which string is used to delimit keys in a keyboard @@ -546,9 +546,7 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:874 -#, fuzzy, kde-format -#| msgctxt "tag-format-pattern <filename> rich" -#| msgid "<tt>%1</tt>" +#, kde-format msgctxt "tag-format-pattern <filename> rich" msgid "‘<tt>%1</tt>’" msgstr "<tt>%1</tt>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.74.0/po/ia/ki18n5.po new/ki18n-5.75.0/po/ia/ki18n5.po --- old/ki18n-5.74.0/po/ia/ki18n5.po 2020-09-06 12:26:11.000000000 +0200 +++ new/ki18n-5.75.0/po/ia/ki18n5.po 2020-10-04 20:46:23.000000000 +0200 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# g.sora <g.s...@tiscali.it>, 2010, 2011, 2012, 2013, 2014. +# g.sora <g.s...@tiscali.it>, 2010, 2011, 2012, 2013, 2014, 2020. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-08 02:02+0200\n" -"PO-Revision-Date: 2014-07-24 14:56+0200\n" +"PO-Revision-Date: 2020-09-16 22:58+0100\n" "Last-Translator: Giovanni Sora <g.s...@tiscali.it>\n" "Language-Team: Interlingua <kde-i18n-...@kde.org>\n" "Language: ia\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #. i18n: Decide which string is used to delimit keys in a keyboard #. shortcut (e.g. + in Ctrl+Alt+Tab) in plain text. @@ -531,12 +531,10 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:874 -#, fuzzy, kde-format -#| msgctxt "tag-format-pattern <filename> rich" -#| msgid "<tt>%1</tt>" +#, kde-format msgctxt "tag-format-pattern <filename> rich" msgid "‘<tt>%1</tt>’" -msgstr "<tt>%1</tt>" +msgstr "‘<tt>%1</tt>’" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:881 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.74.0/po/ro/ki18n5.po new/ki18n-5.75.0/po/ro/ki18n5.po --- old/ki18n-5.74.0/po/ro/ki18n5.po 2020-09-06 12:26:11.000000000 +0200 +++ new/ki18n-5.75.0/po/ro/ki18n5.po 2020-10-04 20:46:23.000000000 +0200 @@ -1,23 +1,23 @@ # Traducerea kdelibs4.po în Română # Laurenţiu Buzdugan <l...@rolix.org>, 2008, 2009. -# Sergiu Bivol <ser...@ase.md>, 2008, 2009, 2010. -# Sergiu Bivol <ser...@ase.md>, 2010, 2012, 2013, 2014. +# Sergiu Bivol <ser...@cip.md>, 2008, 2009, 2010. +# Sergiu Bivol <ser...@cip.md>, 2010, 2012, 2013, 2014, 2020. # Cristian Oneț <onet.crist...@gmail.com>, 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-08 02:02+0200\n" -"PO-Revision-Date: 2014-03-25 01:25+0200\n" -"Last-Translator: Sergiu Bivol <ser...@ase.md>\n" -"Language-Team: Romanian <kde-i18n...@kde.org>\n" +"PO-Revision-Date: 2020-09-13 12:56+0100\n" +"Last-Translator: Sergiu Bivol <ser...@cip.md>\n" +"Language-Team: Romanian\n" "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" +"X-Generator: Lokalize 19.12.3\n" #. i18n: Decide which string is used to delimit keys in a keyboard #. shortcut (e.g. + in Ctrl+Alt+Tab) in plain text. @@ -280,92 +280,76 @@ msgstr "Win" #: kuitmarkup.cpp:360 -#, fuzzy, kde-format -#| msgctxt "keyboard-key-name" -#| msgid "F%1" +#, kde-format msgctxt "keyboard-key-name" msgid "F1" -msgstr "F%1" +msgstr "F1" #: kuitmarkup.cpp:361 -#, fuzzy, kde-format -#| msgid "2" +#, kde-format msgctxt "keyboard-key-name" msgid "F2" -msgstr "2" +msgstr "F2" #: kuitmarkup.cpp:362 -#, fuzzy, kde-format -#| msgid "3" +#, kde-format msgctxt "keyboard-key-name" msgid "F3" -msgstr "3" +msgstr "F3" #: kuitmarkup.cpp:363 -#, fuzzy, kde-format -#| msgid "4" +#, kde-format msgctxt "keyboard-key-name" msgid "F4" -msgstr "4" +msgstr "F4" #: kuitmarkup.cpp:364 -#, fuzzy, kde-format -#| msgid "5" +#, kde-format msgctxt "keyboard-key-name" msgid "F5" -msgstr "5" +msgstr "F5" #: kuitmarkup.cpp:365 -#, fuzzy, kde-format -#| msgid "6" +#, kde-format msgctxt "keyboard-key-name" msgid "F6" -msgstr "6" +msgstr "F6" #: kuitmarkup.cpp:366 -#, fuzzy, kde-format -#| msgid "7" +#, kde-format msgctxt "keyboard-key-name" msgid "F7" -msgstr "7" +msgstr "F7" #: kuitmarkup.cpp:367 -#, fuzzy, kde-format -#| msgid "8" +#, kde-format msgctxt "keyboard-key-name" msgid "F8" -msgstr "8" +msgstr "F8" #: kuitmarkup.cpp:368 -#, fuzzy, kde-format -#| msgid "9" +#, kde-format msgctxt "keyboard-key-name" msgid "F9" -msgstr "9" +msgstr "F9" #: kuitmarkup.cpp:369 -#, fuzzy, kde-format -#| msgctxt "keyboard-key-name" -#| msgid "F%1" +#, kde-format msgctxt "keyboard-key-name" msgid "F10" -msgstr "F%1" +msgstr "F10" #: kuitmarkup.cpp:370 -#, fuzzy, kde-format -#| msgctxt "keyboard-key-name" -#| msgid "F%1" +#, kde-format msgctxt "keyboard-key-name" msgid "F11" -msgstr "F%1" +msgstr "F11" #: kuitmarkup.cpp:371 -#, fuzzy, kde-format -#| msgctxt "keyboard-key-name" -#| msgid "F%1" +#, kde-format msgctxt "keyboard-key-name" msgid "F12" -msgstr "F%1" +msgstr "F12" #. i18n: The messages with context "tag-format-pattern <tag ...> format" #. are KUIT patterns for formatting the text found inside KUIT tags. @@ -549,12 +533,10 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:874 -#, fuzzy, kde-format -#| msgctxt "tag-format-pattern <filename> rich" -#| msgid "<tt>%1</tt>" +#, kde-format msgctxt "tag-format-pattern <filename> rich" msgid "‘<tt>%1</tt>’" -msgstr "<tt>%1</tt>" +msgstr "„<tt>%1</tt>”" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:881 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.74.0/po/vi/ki18n5.po new/ki18n-5.75.0/po/vi/ki18n5.po --- old/ki18n-5.74.0/po/vi/ki18n5.po 2020-09-06 12:26:11.000000000 +0200 +++ new/ki18n-5.75.0/po/vi/ki18n5.po 2020-10-04 20:46:23.000000000 +0200 @@ -4,20 +4,21 @@ # Clytie Siddall <cly...@riverland.net.au>, 2006-2007. # Hoàng Đức Hiếu <hieu.d.ho...@gmail.com>, 2008, 2011. # Lê Hoàng Phương <herophuon...@gmail.com>, 2011, 2012. +# Phu Hung Nguyen <phuhngu...@disroot.org>, 2020. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-08 02:02+0200\n" -"PO-Revision-Date: 2012-09-23 18:43+0800\n" -"Last-Translator: Lê Hoàng Phương <herophuon...@gmail.com>\n" -"Language-Team: American English <kde-i18n...@kde.org>\n" +"PO-Revision-Date: 2020-09-20 22:31+0200\n" +"Last-Translator: Phu Hung Nguyen <phuhngu...@disroot.org>\n" +"Language-Team: Vietnamese <kde-l10n...@kde.org>\n" "Language: vi\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" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 19.12.2\n" #. i18n: Decide which string is used to delimit keys in a keyboard #. shortcut (e.g. + in Ctrl+Alt+Tab) in plain text. @@ -73,7 +74,7 @@ #, kde-format msgctxt "keyboard-key-name" msgid "CapsLock" -msgstr "CapsLock " +msgstr "CapsLock" #: kuitmarkup.cpp:326 #, kde-format @@ -280,92 +281,76 @@ msgstr "Win" #: kuitmarkup.cpp:360 -#, fuzzy, kde-format -#| msgctxt "keyboard-key-name" -#| msgid "F%1" +#, kde-format msgctxt "keyboard-key-name" msgid "F1" -msgstr "F%1" +msgstr "F1" #: kuitmarkup.cpp:361 -#, fuzzy, kde-format -#| msgid "2" +#, kde-format msgctxt "keyboard-key-name" msgid "F2" -msgstr "2" +msgstr "F2" #: kuitmarkup.cpp:362 -#, fuzzy, kde-format -#| msgid "3" +#, kde-format msgctxt "keyboard-key-name" msgid "F3" -msgstr "3" +msgstr "F3" #: kuitmarkup.cpp:363 -#, fuzzy, kde-format -#| msgid "4" +#, kde-format msgctxt "keyboard-key-name" msgid "F4" -msgstr "4" +msgstr "F4" #: kuitmarkup.cpp:364 -#, fuzzy, kde-format -#| msgid "5" +#, kde-format msgctxt "keyboard-key-name" msgid "F5" -msgstr "5" +msgstr "F5" #: kuitmarkup.cpp:365 -#, fuzzy, kde-format -#| msgid "6" +#, kde-format msgctxt "keyboard-key-name" msgid "F6" -msgstr "6" +msgstr "F6" #: kuitmarkup.cpp:366 -#, fuzzy, kde-format -#| msgid "7" +#, kde-format msgctxt "keyboard-key-name" msgid "F7" -msgstr "7" +msgstr "F7" #: kuitmarkup.cpp:367 -#, fuzzy, kde-format -#| msgid "8" +#, kde-format msgctxt "keyboard-key-name" msgid "F8" -msgstr "8" +msgstr "F8" #: kuitmarkup.cpp:368 -#, fuzzy, kde-format -#| msgid "9" +#, kde-format msgctxt "keyboard-key-name" msgid "F9" -msgstr "9" +msgstr "F9" #: kuitmarkup.cpp:369 -#, fuzzy, kde-format -#| msgctxt "keyboard-key-name" -#| msgid "F%1" +#, kde-format msgctxt "keyboard-key-name" msgid "F10" -msgstr "F%1" +msgstr "F10" #: kuitmarkup.cpp:370 -#, fuzzy, kde-format -#| msgctxt "keyboard-key-name" -#| msgid "F%1" +#, kde-format msgctxt "keyboard-key-name" msgid "F11" -msgstr "F%1" +msgstr "F11" #: kuitmarkup.cpp:371 -#, fuzzy, kde-format -#| msgctxt "keyboard-key-name" -#| msgid "F%1" +#, kde-format msgctxt "keyboard-key-name" msgid "F12" -msgstr "F%1" +msgstr "F12" #. i18n: The messages with context "tag-format-pattern <tag ...> format" #. are KUIT patterns for formatting the text found inside KUIT tags. @@ -376,201 +361,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:733 -#, 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:738 -#, 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:746 -#, 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:751 -#, 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:759 -#, 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:764 -#, 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:772 -#, 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:777 -#, 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:785 -#, 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:790 -#, 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:797 -#, fuzzy, kde-format -#| msgctxt "@note/plain" -#| msgid "Note: %1" +#, kde-format msgctxt "tag-format-pattern <note> plain" msgid "Note: %1" msgstr "Ghi chú: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:802 -#, 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>Lưu ý</i>: %1" +msgstr "<i>Ghi chú</i>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:808 -#, 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 "Trả lời: %1" +msgstr "%2: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:814 -#, 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:821 -#, fuzzy, kde-format -#| msgctxt "@warning/plain" -#| msgid "WARNING: %1" +#, kde-format msgctxt "tag-format-pattern <warning> plain" msgid "WARNING: %1" msgstr "CẢNH BÁO: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:826 -#, 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>Cảnh báo</b> : %1" +msgstr "<b>Cảnh báo</b>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:832 -#, 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 "Trả lời: %1" +msgstr "%2: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:838 -#, 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:845 -#, 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:850 -#, 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:856 -#, 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" @@ -579,78 +518,58 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:862 -#, 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:869 -#, fuzzy, kde-format -#| msgctxt "@filename/plain" -#| msgid "‘%1’" +#, 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:874 -#, 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>" +msgstr "'<tt>%1</tt>'" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:881 -#, 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:886 -#, 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:893 -#, 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:898 -#, 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:904 -#, 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" @@ -659,11 +578,7 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:910 -#, 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" @@ -672,36 +587,28 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:917 -#, fuzzy, kde-format -#| msgctxt "@resource/plain" -#| msgid "“%1”" +#, 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:922 -#, fuzzy, kde-format -#| msgctxt "@resource/plain" -#| msgid "“%1”" +#, kde-format msgctxt "tag-format-pattern <resource> rich" msgid "“%1”" -msgstr "“%1”" +msgstr "\"%1\"" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:929 -#, fuzzy, kde-format -#| msgctxt "@resource/plain" -#| msgid "“%1”" +#, kde-format msgctxt "tag-format-pattern <icode> plain" msgid "“%1”" -msgstr "“%1”" +msgstr "\"%1\"" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:934 -#, 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>" @@ -714,131 +621,103 @@ "\n" "%1\n" msgstr "" +"\n" +"%1\n" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:946 -#, 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:953 -#, 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:958 -#, 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:965 -#, 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:970 -#, 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:977 -#, 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:982 -#, 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:987 -#, 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:992 -#, 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:999 -#, 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:1004 -#, 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:1011 -#, 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:1016 -#, 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:1022 -#, 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" @@ -847,65 +726,51 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1028 -#, 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" msgid "<a href=\"mailto:%2\";>%1</a>" -msgstr "<a href=\"mailto:%1\";>%2</a>" +msgstr "<a href=\"mailto:%2\";>%1</a>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1035 -#, 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:1040 -#, 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:1047 -#, fuzzy, kde-format -#| msgctxt "@message/plain" -#| msgid "/%1/" +#, kde-format msgctxt "tag-format-pattern <message> plain" msgid "/%1/" -msgstr "/ %1/" +msgstr "/%1/" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1052 -#, 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:1059 -#, 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:1064 #, kde-format msgctxt "tag-format-pattern <nl> rich" msgid "%1<br/>" -msgstr "" +msgstr "%1<br/>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.74.0/po/zh_CN/ki18n5.po new/ki18n-5.75.0/po/zh_CN/ki18n5.po --- old/ki18n-5.74.0/po/zh_CN/ki18n5.po 2020-09-06 12:26:11.000000000 +0200 +++ new/ki18n-5.75.0/po/zh_CN/ki18n5.po 2020-10-04 20:46:23.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-08 02:02+0200\n" -"PO-Revision-Date: 2020-09-05 05:17\n" +"PO-Revision-Date: 2020-09-23 12:18\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"
