Hello community, here is the log from the commit of package kunitconversion for openSUSE:Factory checked in at 2015-02-16 15:05:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kunitconversion (Old) and /work/SRC/openSUSE:Factory/.kunitconversion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kunitconversion" Changes: -------- --- /work/SRC/openSUSE:Factory/kunitconversion/kunitconversion.changes 2015-01-29 12:51:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kunitconversion.new/kunitconversion.changes 2015-02-16 17:32:40.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Feb 8 18:15:18 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.7.0 + * Fixed infinite recursion in Unit::setUnitMultiplier + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.7.0.php + +------------------------------------------------------------------- Old: ---- kunitconversion-5.6.0.tar.xz New: ---- kunitconversion-5.7.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kunitconversion.spec ++++++ --- /var/tmp/diff_new_pack.VPKtev/_old 2015-02-16 17:32:41.000000000 +0100 +++ /var/tmp/diff_new_pack.VPKtev/_new 2015-02-16 17:32:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kunitconversion # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,13 @@ %define lname libKF5UnitConversion5 +%define _tar_path 5.7 Name: kunitconversion -Version: 5.6.0 +Version: %{_tar_path}.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.6.0 +BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{_kf5_version} BuildRequires: kf5-filesystem @@ -35,7 +36,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/5.6/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kunitconversion-5.6.0.tar.xz -> kunitconversion-5.7.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/CMakeLists.txt new/kunitconversion-5.7.0/CMakeLists.txt --- old/kunitconversion-5.6.0/CMakeLists.txt 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/CMakeLists.txt 2015-02-08 16:25:57.000000000 +0100 @@ -2,7 +2,7 @@ project(KUnitConversion) -find_package(ECM 1.6.0 REQUIRED NO_MODULE) +find_package(ECM 1.7.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -18,8 +18,8 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.6.0") # handled by release scripts -set(KF5_DEP_VERSION "5.6.0") # handled by release scripts +set(KF5_VERSION "5.7.0") # handled by release scripts +set(KF5_DEP_VERSION "5.7.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KUNITCONVERSION VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kunitconversion_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5UnitConversionConfigVersion.cmake" @@ -38,7 +38,7 @@ add_subdirectory(autotests) # create a Config.cmake and a ConfigVersion.cmake file and install them -set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5UnitConversion") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5UnitConversion") include(ECMPackageConfigHelpers) @@ -59,7 +59,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kunitconversion_version.h - DESTINATION ${KF5_INCLUDE_INSTALL_DIR} COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/po/lt/kunitconversion5.po new/kunitconversion-5.7.0/po/lt/kunitconversion5.po --- old/kunitconversion-5.6.0/po/lt/kunitconversion5.po 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/po/lt/kunitconversion5.po 2015-02-08 16:25:57.000000000 +0100 @@ -8,8 +8,8 @@ "Project-Id-Version: libkunitconversion\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-27 20:57+0000\n" -"PO-Revision-Date: 2011-08-11 20:24+0300\n" -"Last-Translator: Remigijus Jarmalavičius <remigi...@jarmalavicius.lt>\n" +"PO-Revision-Date: 2015-01-03 17:34+0300\n" +"Last-Translator: Andrius Štikonas <andr...@stikonas.eu>\n" "Language-Team: Lithuanian <kde-i18n...@kde.org>\n" "Language: lt\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Poedit 1.5.5\n" #: acceleration.cpp:29 msgid "Acceleration" @@ -1145,7 +1145,7 @@ #: currency.cpp:66 currency.cpp:70 msgctxt "currency name" msgid "Euro" -msgstr "" +msgstr "Euras" #: currency.cpp:67 msgctxt "EUR Euro - unit synonyms for matching user input" @@ -1171,7 +1171,7 @@ #: currency.cpp:77 currency.cpp:81 msgctxt "currency name" msgid "Austrian Schilling" -msgstr "" +msgstr "Austrijos šilingas" #: currency.cpp:78 msgctxt "ATS Austrian Schilling - unit synonyms for matching user input" @@ -1195,13 +1195,9 @@ msgstr[3] "%1 šilingas" #: currency.cpp:88 currency.cpp:92 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 Belgian franc" -#| msgid_plural "%1 Belgian francs" msgctxt "currency name" msgid "Belgian Franc" -msgstr "%1 Belgijos frankas" +msgstr "Belgijos frankas" #: currency.cpp:89 msgctxt "BEF Belgian Franc - unit synonyms for matching user input" @@ -1277,13 +1273,9 @@ msgstr[3] "" #: currency.cpp:121 currency.cpp:125 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 French franc" -#| msgid_plural "%1 French francs" msgctxt "currency name" msgid "French Franc" -msgstr "%1 Prancūzijos frankas" +msgstr "Prancūzijos frankas" #: currency.cpp:122 msgctxt "FRF French Franc - unit synonyms for matching user input" @@ -1309,7 +1301,7 @@ #: currency.cpp:132 currency.cpp:136 msgctxt "currency name" msgid "German Mark" -msgstr "" +msgstr "Vokietijos markė" #: currency.cpp:133 msgctxt "DEM German Mark - unit synonyms for matching user input" @@ -1333,13 +1325,9 @@ msgstr[3] "%1 markė" #: currency.cpp:143 currency.cpp:147 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 Irish pound" -#| msgid_plural "%1 Irish pounds" msgctxt "currency name" msgid "Irish Pound" -msgstr "%1 Airijos svaras" +msgstr "Airijos svaras" #: currency.cpp:144 msgctxt "IEP Irish Pound - unit synonyms for matching user input" @@ -1363,12 +1351,9 @@ msgstr[3] "%1 Airijos svaras" #: currency.cpp:154 currency.cpp:158 -#, fuzzy -#| msgctxt "amount in units (real)" -#| msgid "%1 Italian lira" msgctxt "currency name" msgid "Italian Lira" -msgstr "%1 Italijos lirų" +msgstr "Italijos lira" #: currency.cpp:155 msgctxt "ITL Italian Lira - unit synonyms for matching user input" @@ -1392,13 +1377,9 @@ msgstr[3] "%1 Italijos lira" #: currency.cpp:165 currency.cpp:169 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 Luxembourgish franc" -#| msgid_plural "%1 Luxembourgish francs" msgctxt "currency name" msgid "Luxembourgish Franc" -msgstr "%1 Liuksmeburgo frankas" +msgstr "Liuksemburgo frankas" #: currency.cpp:166 msgctxt "LUF Luxembourgish Franc - unit synonyms for matching user input" @@ -1474,13 +1455,9 @@ msgstr[3] "" #: currency.cpp:198 currency.cpp:202 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 drachma" -#| msgid_plural "%1 drachmas" msgctxt "currency name" msgid "Greek Drachma" -msgstr "%1 drachma" +msgstr "Graikijos drachma" #: currency.cpp:199 msgctxt "GRD Greek Drachma - unit synonyms for matching user input" @@ -1530,13 +1507,9 @@ msgstr[3] "%1 tolaras" #: currency.cpp:220 currency.cpp:225 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 Cypriot pound" -#| msgid_plural "%1 Cypriot pounds" msgctxt "currency name" msgid "Cypriot Pound" -msgstr "%1 Kipro svaras" +msgstr "Kipro svaras" #: currency.cpp:222 msgctxt "CYP Cypriot Pound - unit synonyms for matching user input" @@ -1560,9 +1533,6 @@ msgstr[3] "%1 Kipro svaras" #: currency.cpp:232 currency.cpp:236 -#, fuzzy -#| msgctxt "MTL Maltese Lira - unit synonyms for matching user input" -#| msgid "Maltese lira" msgctxt "currency name" msgid "Maltese Lira" msgstr "Maltos lira" @@ -1615,17 +1585,11 @@ msgstr[3] "" #: currency.cpp:257 currency.cpp:261 -#, fuzzy -#| msgctxt "amount in units (real)" -#| msgid "%1 United States dollars" msgctxt "currency name" msgid "United States Dollar" -msgstr "%1 Jungtinių Valstijų dolerių" +msgstr "Jungtinių Valstijų doleris" #: currency.cpp:258 -#, fuzzy -#| msgctxt "USD United States Dollars - unit synonyms for matching user input" -#| msgid "dollar;dollars" msgctxt "USD United States Dollar - unit synonyms for matching user input" msgid "dollar;dollars" msgstr "doleris;doleriai;dolerių" @@ -1725,13 +1689,9 @@ msgstr[3] "" #: currency.cpp:303 currency.cpp:307 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 Danish krone" -#| msgid_plural "%1 Danish kroner" msgctxt "currency name" msgid "Danish Krone" -msgstr "%1 Danijos krona" +msgstr "Danijos krona" #: currency.cpp:304 msgctxt "DKK Danish Krone - unit synonyms for matching user input" @@ -1757,7 +1717,7 @@ #: currency.cpp:314 currency.cpp:318 msgctxt "currency name" msgid "Estonian Kroon" -msgstr "" +msgstr "Estijos krona" #: currency.cpp:315 msgctxt "EEK Estonian Kroon - unit synonyms for matching user input" @@ -1781,39 +1741,35 @@ msgstr[3] "%1 krona" #: currency.cpp:325 currency.cpp:331 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 Irish pound" -#| msgid_plural "%1 Irish pounds" msgctxt "currency name" msgid "British Pound" -msgstr "%1 Airijos svaras" +msgstr "Didžiosios Britanijos svaras" #: currency.cpp:327 msgctxt "GBP British Pound - unit synonyms for matching user input" msgid "pound;pounds;pound sterling;pounds sterling" -msgstr "" +msgstr "svaras;svarai;svarų;svaras sterlingų,svarai sterlingų;svarų sterlingų" #: currency.cpp:333 #, kde-format msgctxt "amount in units (real)" msgid "%1 pounds sterling" -msgstr "" +msgstr "%1 svarų sterlingų" #: currency.cpp:334 #, kde-format msgctxt "amount in units (integer)" msgid "%1 pound sterling" msgid_plural "%1 pounds sterling" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%1 svaras sterlingų" +msgstr[1] "%1 svarai sterlingų" +msgstr[2] "%1 svarų sterlingų" +msgstr[3] "%1 svaras sterlingų" #: currency.cpp:338 currency.cpp:342 msgctxt "currency name" msgid "Hungarian Forint" -msgstr "" +msgstr "Vengrijos forintas" #: currency.cpp:339 msgctxt "HUF hungarian Forint - unit synonyms for matching user input" @@ -1824,22 +1780,22 @@ #, kde-format msgctxt "amount in units (real)" msgid "%1 forint" -msgstr "" +msgstr "%1 forintų" #: currency.cpp:345 #, kde-format msgctxt "amount in units (integer)" msgid "%1 forint" msgid_plural "%1 forint" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%1 forintas" +msgstr[1] "%1 forintai" +msgstr[2] "%1 forintų" +msgstr[3] "%1 forintas" #: currency.cpp:349 currency.cpp:353 msgctxt "currency name" msgid "Lithuanian Litas" -msgstr "" +msgstr "Lietuvos litas" #: currency.cpp:350 msgctxt "LTL Lithuanian Litas - unit synonyms for matching user input" @@ -1865,7 +1821,7 @@ #: currency.cpp:360 currency.cpp:364 msgctxt "currency name" msgid "Latvian Lats" -msgstr "" +msgstr "Latvijos latas" #: currency.cpp:361 msgctxt "LVL Latvian Lats - unit synonyms for matching user input" @@ -1891,7 +1847,7 @@ #: currency.cpp:371 currency.cpp:375 msgctxt "currency name" msgid "Polish Zloty" -msgstr "" +msgstr "Lenkijos zlotas" #: currency.cpp:372 msgctxt "PLN Polish Zloty - unit synonyms for matching user input" @@ -1943,7 +1899,7 @@ #: currency.cpp:393 currency.cpp:397 msgctxt "currency name" msgid "Swedish Krona" -msgstr "" +msgstr "Švedijos krona" #: currency.cpp:394 msgctxt "SEK Swedish Krona - unit synonyms for matching user input" @@ -1967,17 +1923,11 @@ msgstr[3] "" #: currency.cpp:404 currency.cpp:408 -#, fuzzy -#| msgctxt "amount in units (real)" -#| msgid "%1 Swiss francs" msgctxt "currency name" msgid "Swiss Franc" -msgstr "%1 Šveicarijos frankų" +msgstr "Šveicarijos frankas" #: currency.cpp:405 -#, fuzzy -#| msgctxt "BEF Belgian Franc - unit synonyms for matching user input" -#| msgid "franc;francs" msgctxt "CHF Swiss Franc - unit synonyms for matching user input" msgid "franc;francs" msgstr "frankas;frankai;frankų" @@ -1999,13 +1949,9 @@ msgstr[3] "%1 Šveicarijos frankas" #: currency.cpp:415 currency.cpp:420 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 Norwegian krone" -#| msgid_plural "%1 Norwegian kroner" msgctxt "currency name" msgid "Norwegian Krone" -msgstr "%1 Norvegijos krona" +msgstr "Norvegijos krona" #: currency.cpp:417 msgctxt "Norwegian Krone - unit synonyms for matching user input" @@ -2057,12 +2003,9 @@ #: currency.cpp:438 currency.cpp:443 msgctxt "currency name" msgid "Russian Ruble" -msgstr "" +msgstr "Rusijos rublis" #: currency.cpp:440 -#, fuzzy -#| msgctxt "RUB Russsian Ruble - unit synonyms for matching user input" -#| msgid "ruble;rubles;rouble;roubles" msgctxt "RUB Russian Ruble - unit synonyms for matching user input" msgid "ruble;rubles;rouble;roubles" msgstr "rublis;rubliai;rublių" @@ -2084,12 +2027,9 @@ msgstr[3] "%1 rublis" #: currency.cpp:450 currency.cpp:454 -#, fuzzy -#| msgctxt "amount in units (real)" -#| msgid "%1 Turkish lira" msgctxt "currency name" msgid "Turkish Lira" -msgstr "%1 Turkijos lirų" +msgstr "Turkijos lira" #: currency.cpp:451 msgctxt "TRY Turkish Lira - unit synonyms for matching user input" @@ -2113,13 +2053,9 @@ msgstr[3] "%1 Turkijos lira" #: currency.cpp:461 currency.cpp:466 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 Australian dollar" -#| msgid_plural "%1 Australian dollars" msgctxt "currency name" msgid "Australian Dollar" -msgstr "%1 Australijos doleris" +msgstr "Australijos doleris" #: currency.cpp:463 msgctxt "AUD Australian Dollar - unit synonyms for matching user input" @@ -2169,13 +2105,9 @@ msgstr[3] "" #: currency.cpp:484 currency.cpp:489 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 Canadian dollar" -#| msgid_plural "%1 Canadian dollars" msgctxt "currency name" msgid "Canadian Dollar" -msgstr "%1 Kanados doleris" +msgstr "Kanados doleris" #: currency.cpp:486 msgctxt "Canadian Dollar - unit synonyms for matching user input" @@ -2225,13 +2157,9 @@ msgstr[3] "" #: currency.cpp:507 currency.cpp:512 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 Hong Kong dollar" -#| msgid_plural "%1 Hong Kong dollars" msgctxt "currency name" msgid "Hong Kong Dollar" -msgstr "%1 Honkongo doleris" +msgstr "Honkongo doleris" #: currency.cpp:509 msgctxt "Hong Kong Dollar - unit synonyms for matching user input" @@ -2257,7 +2185,7 @@ #: currency.cpp:519 currency.cpp:523 msgctxt "currency name" msgid "Indonesian Rupiah" -msgstr "" +msgstr "Indonezijos rupija" #: currency.cpp:520 msgctxt "IDR Indonesian Rupiah - unit synonyms for matching user input" @@ -2283,7 +2211,7 @@ #: currency.cpp:530 currency.cpp:534 msgctxt "currency name" msgid "Indian Rupee" -msgstr "" +msgstr "Indijos rupija" #: currency.cpp:531 msgctxt "INR Indian Rupee - unit synonyms for matching user input" @@ -2385,13 +2313,9 @@ msgstr[3] "" #: currency.cpp:575 currency.cpp:580 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 New Zealand dollar" -#| msgid_plural "%1 New Zealand dollars" msgctxt "currency name" msgid "New Zealand Dollar" -msgstr "%1 Naujosios Zelandijos doleris" +msgstr "Naujosios Zelandijos doleris" #: currency.cpp:577 msgctxt "NZD New Zealand Dollar - unit synonyms for matching user input" @@ -2443,13 +2367,9 @@ msgstr[3] "" #: currency.cpp:599 currency.cpp:604 -#, fuzzy -#| msgctxt "amount in units (integer)" -#| msgid "%1 Singapore dollar" -#| msgid_plural "%1 Singapore dollars" msgctxt "currency name" msgid "Singapore Dollar" -msgstr "%1 Singapūro doleris" +msgstr "Singapūro doleris" #: currency.cpp:601 msgctxt "SGD Singapore Dollar - unit synonyms for matching user input" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/po/nb/kunitconversion5.po new/kunitconversion-5.7.0/po/nb/kunitconversion5.po --- old/kunitconversion-5.6.0/po/nb/kunitconversion5.po 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/po/nb/kunitconversion5.po 2015-02-08 16:25:57.000000000 +0100 @@ -1,4 +1,4 @@ -# Translation of libkunitconversion to Norwegian Bokmål +# Translation of kunitconversion5 to Norwegian Bokmål # # Bjørn Steensrud <bjor...@skogkatt.homelinux.org>, 2010, 2011, 2014. msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/po/nn/kunitconversion5.po new/kunitconversion-5.7.0/po/nn/kunitconversion5.po --- old/kunitconversion-5.6.0/po/nn/kunitconversion5.po 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/po/nn/kunitconversion5.po 2015-02-08 16:25:57.000000000 +0100 @@ -1,4 +1,4 @@ -# Translation of libkunitconversion to Norwegian Nynorsk +# Translation of kunitconversion5 to Norwegian Nynorsk # # Eirik U. Birkeland <eir...@gmail.com>, 2009, 2010. # Karl Ove Hufthammer <k...@huftis.org>, 2009. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/po/pt_BR/kunitconversion5.po new/kunitconversion-5.7.0/po/pt_BR/kunitconversion5.po --- old/kunitconversion-5.6.0/po/pt_BR/kunitconversion5.po 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/po/pt_BR/kunitconversion5.po 2015-02-08 16:25:57.000000000 +0100 @@ -1,14 +1,14 @@ -# Translation of libkunitconversion5.po to Brazilian Portuguese -# Copyright (C) 2014 This_file_is_part_of_KDE +# Translation of kunitconversion5.po to Brazilian Portuguese +# Copyright (C) 2014-2015 This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# André Marcelo Alvarenga <alvare...@kde.org>, 2014. +# André Marcelo Alvarenga <alvare...@kde.org>, 2014, 2015. msgid "" msgstr "" -"Project-Id-Version: libkunitconversion5\n" +"Project-Id-Version: kunitconversion5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-27 20:57+0000\n" -"PO-Revision-Date: 2014-03-01 15:31-0300\n" +"PO-Revision-Date: 2015-01-04 22:39-0200\n" "Last-Translator: André Marcelo Alvarenga <alvare...@kde.org>\n" "Language-Team: Brazilian Portuguese <kde-i18n-pt...@kde.org>\n" "Language: pt_BR\n" @@ -9119,7 +9119,7 @@ msgid "%1 year" msgid_plural "%1 years" msgstr[0] "%1 ano" -msgstr[1] "1%1 anos" +msgstr[1] "%1 anos" #: velocity.cpp:56 msgid "Speed" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/po/se/kunitconversion5.po new/kunitconversion-5.7.0/po/se/kunitconversion5.po --- old/kunitconversion-5.6.0/po/se/kunitconversion5.po 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/po/se/kunitconversion5.po 2015-02-08 16:25:57.000000000 +0100 @@ -1,4 +1,4 @@ -# Translation of libkunitconversion to Northern Sami +# Translation of kunitconversion5 to Northern Sami # # Børre Gaup <boe...@skolelinux.no>, 2010, 2011. msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/src/CMakeLists.txt new/kunitconversion-5.7.0/src/CMakeLists.txt --- old/kunitconversion-5.6.0/src/CMakeLists.txt 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/src/CMakeLists.txt 2015-02-08 16:25:57.000000000 +0100 @@ -31,7 +31,7 @@ generate_export_header(KF5UnitConversion BASE_NAME KUnitConversion EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kunitconversion/kunitconversion_export.h) add_library(KF5::UnitConversion ALIAS KF5UnitConversion) target_include_directories(KF5UnitConversion PUBLIC "$<BUILD_INTERFACE:${KUnitConversion_BINARY_DIR};${CMAKE_CURRENT_BINARY_DIR}>") -target_include_directories(KF5UnitConversion INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KUnitConversion>") +target_include_directories(KF5UnitConversion INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KUnitConversion>") target_link_libraries(KF5UnitConversion PUBLIC Qt5::Core PRIVATE Qt5::Xml @@ -54,19 +54,19 @@ PREFIX KUnitConversion REQUIRED_HEADERS KUnitConversion_namespaced_HEADERS ) -install(FILES ${KUnitConversion_CamelCase_HEADERS} DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KUnitConversion/KUnitConversion COMPONENT Devel) +install(FILES ${KUnitConversion_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KUnitConversion/KUnitConversion COMPONENT Devel) install(TARGETS KF5UnitConversion EXPORT KF5UnitConversionTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kunitconversion/kunitconversion_export.h ${KUnitConversion_namespaced_HEADERS} - DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KUnitConversion/kunitconversion COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KUnitConversion/kunitconversion COMPONENT Devel ) install(FILES ${KUnitConversion_HEADERS} - DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KUnitConversion COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KUnitConversion COMPONENT Devel ) include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KUnitConversion LIB_NAME KF5UnitConversion DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KF5_INCLUDE_INSTALL_DIR}/KUnitConversion) +ecm_generate_pri_file(BASE_NAME KUnitConversion LIB_NAME KF5UnitConversion DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KUnitConversion) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/src/angle.cpp new/kunitconversion-5.7.0/src/angle.cpp --- old/kunitconversion-5.6.0/src/angle.cpp 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/src/angle.cpp 2015-02-08 16:25:57.000000000 +0100 @@ -39,16 +39,16 @@ symbol, description, matchString, symbolString, realString, integerString) - {}; + {} qreal toDefault(qreal value) const { return (value / (2 * M_PI)) * 360.0; - }; + } qreal fromDefault(qreal value) const { return (value / 360.0) * (2 * M_PI); - }; + } }; Angle::Angle() : CustomCategory(AngleCategory, i18n("Angle"), i18n("Angle")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/src/converter.cpp new/kunitconversion-5.7.0/src/converter.cpp --- old/kunitconversion-5.6.0/src/converter.cpp 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/src/converter.cpp 2015-02-08 16:25:57.000000000 +0100 @@ -65,11 +65,11 @@ m_categories[ForceCategory] = Force(); m_categories[AngleCategory] = Angle(); m_categories[FrequencyCategory] = Frequency(); - }; + } virtual ~ConverterPrivate() { - }; + } ConverterPrivate *clone() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/src/currency.cpp new/kunitconversion-5.7.0/src/currency.cpp --- old/kunitconversion-5.6.0/src/currency.cpp 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/src/currency.cpp 2015-02-08 16:25:57.000000000 +0100 @@ -48,7 +48,7 @@ { m_cache = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/libkunitconversion/currency.xml"); - }; + } virtual Value convert(const Value &value, const Unit &toUnit); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/src/energy.cpp new/kunitconversion-5.7.0/src/energy.cpp --- old/kunitconversion-5.6.0/src/energy.cpp 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/src/energy.cpp 2015-02-08 16:25:57.000000000 +0100 @@ -37,17 +37,17 @@ symbol, description, matchString, symbolString, realString, integerString) - {}; + {} qreal toDefault(qreal value) const { return (2.99792458e+08 * 6.62606896e-34) / (value * 1e-09); - }; + } qreal fromDefault(qreal value) const { return ((2.99792458e+08 * 6.62606896e-34) / value) / 1e-09; - }; + } }; Energy::Energy() : CustomCategory(EnergyCategory, i18n("Energy"), i18n("Energy")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/src/fuel_efficiency.cpp new/kunitconversion-5.7.0/src/fuel_efficiency.cpp --- old/kunitconversion-5.6.0/src/fuel_efficiency.cpp 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/src/fuel_efficiency.cpp 2015-02-08 16:25:57.000000000 +0100 @@ -37,17 +37,17 @@ symbol, description, matchString, symbolString, realString, integerString) - {}; + {} qreal toDefault(qreal value) const { return unitMultiplier() / value; - }; + } qreal fromDefault(qreal value) const { return unitMultiplier() / value; - }; + } }; FuelEfficiency::FuelEfficiency() : CustomCategory(FuelEfficiencyCategory, i18n("Fuel Efficiency"), i18n("Fuel Efficiency")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/src/temperature.cpp new/kunitconversion-5.7.0/src/temperature.cpp --- old/kunitconversion-5.6.0/src/temperature.cpp 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/src/temperature.cpp 2015-02-08 16:25:57.000000000 +0100 @@ -37,17 +37,17 @@ symbol, description, matchString, symbolString, realString, integerString) - {}; + {} qreal toDefault(qreal value) const { return value + 273.15; - }; + } qreal fromDefault(qreal value) const { return value - 273.15; - }; + } }; class FahrenheitUnitPrivate : public UnitPrivate @@ -61,17 +61,17 @@ symbol, description, matchString, symbolString, realString, integerString) - {}; + {} qreal toDefault(qreal value) const { return (value + 459.67) * 5.0 / 9.0; - }; + } qreal fromDefault(qreal value) const { return (value * 9.0 / 5.0) - 459.67; - }; + } }; class DelisleUnitPrivate : public UnitPrivate @@ -85,17 +85,17 @@ symbol, description, matchString, symbolString, realString, integerString) - {}; + {} qreal toDefault(qreal value) const { return 373.15 - (value * 2.0 / 3.0); - }; + } qreal fromDefault(qreal value) const { return (373.15 - value) * 3.0 / 2.0; - }; + } }; class NewtonUnitPrivate : public UnitPrivate @@ -109,17 +109,17 @@ symbol, description, matchString, symbolString, realString, integerString) - {}; + {} qreal toDefault(qreal value) const { return (value * 100.0 / 33.0) + 273.15; - }; + } qreal fromDefault(qreal value) const { return (value - 273.15) * 33.0 / 100.0; - }; + } }; class ReaumurUnitPrivate : public UnitPrivate @@ -133,17 +133,17 @@ symbol, description, matchString, symbolString, realString, integerString) - {}; + {} qreal toDefault(qreal value) const { return (value * 5.0 / 4.0) + 273.15; - }; + } qreal fromDefault(qreal value) const { return (value - 273.15) * 4.0 / 5.0; - }; + } }; class RomerUnitPrivate : public UnitPrivate @@ -157,17 +157,17 @@ symbol, description, matchString, symbolString, realString, integerString) - {}; + {} qreal toDefault(qreal value) const { return (value - 7.5) * 40.0 / 21.0 + 273.15; - }; + } qreal fromDefault(qreal value) const { return (value - 273.15) * 21.0 / 40.0 + 7.5; - }; + } }; Temperature::Temperature() : CustomCategory(TemperatureCategory, i18n("Temperature"), i18n("Temperature")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/src/unit.cpp new/kunitconversion-5.7.0/src/unit.cpp --- old/kunitconversion-5.6.0/src/unit.cpp 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/src/unit.cpp 2015-02-08 16:25:57.000000000 +0100 @@ -178,7 +178,7 @@ void Unit::setUnitMultiplier(qreal multiplier) { if (d) - setUnitMultiplier(multiplier); + d->setUnitMultiplier(multiplier); } qreal Unit::toDefault(qreal value) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/src/unit_p.h new/kunitconversion-5.7.0/src/unit_p.h --- old/kunitconversion-5.6.0/src/unit_p.h 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/src/unit_p.h 2015-02-08 16:25:57.000000000 +0100 @@ -67,7 +67,7 @@ { public: CustomUnit(UnitPrivate *dd) : Unit(dd) - {}; + {} CustomUnit(CategoryId categoryId, UnitId id, qreal multiplier, const QString &symbol, const QString &description, @@ -77,10 +77,10 @@ symbol, description, matchString, symbolString, realString, integerString)) - {}; + {} virtual ~CustomUnit() - {}; + {} }; } // KUnitConversion namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/src/unitcategory.cpp new/kunitconversion-5.7.0/src/unitcategory.cpp --- old/kunitconversion-5.6.0/src/unitcategory.cpp 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/src/unitcategory.cpp 2015-02-08 16:25:57.000000000 +0100 @@ -167,8 +167,7 @@ Value UnitCategory::convert(const Value &value, const Unit &toUnit) { if (d && !toUnit.isNull()) { - qreal v = toUnit.fromDefault(value.unit().toDefault(value.number())); - return Value(v, toUnit); + return d->convert(value, toUnit); } return Value(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/src/unitcategory_p.h new/kunitconversion-5.7.0/src/unitcategory_p.h --- old/kunitconversion-5.6.0/src/unitcategory_p.h 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/src/unitcategory_p.h 2015-02-08 16:25:57.000000000 +0100 @@ -58,14 +58,14 @@ { public: CustomCategory(UnitCategoryPrivate *dd) : UnitCategory(dd) - {}; + {} CustomCategory(CategoryId id, const QString &name, const QString &description) : UnitCategory(new UnitCategoryPrivate(id, name, description)) - {}; + {} virtual ~CustomCategory() - {}; + {} }; } // KUnitConversion namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.6.0/src/velocity.cpp new/kunitconversion-5.7.0/src/velocity.cpp --- old/kunitconversion-5.6.0/src/velocity.cpp 2015-01-03 13:15:18.000000000 +0100 +++ new/kunitconversion-5.7.0/src/velocity.cpp 2015-02-08 16:25:57.000000000 +0100 @@ -40,17 +40,17 @@ symbol, description, matchString, symbolString, realString, integerString) - {}; + {} qreal toDefault(qreal value) const { return 0.836 * pow(value, 3.0 / 2.0); - }; + } qreal fromDefault(qreal value) const { return pow(value / 0.836, 2.0 / 3.0); - }; + } }; Velocity::Velocity() : CustomCategory(VelocityCategory, i18n("Speed"), i18n("Speed")) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
